open_platform/ss-common-sales
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

销售订单管理修改

Browse Source
This commit is contained in:
fanzongzhe
2024-07-29 15:20:18 +08:00
parent 78d68f354b
commit 37799c9eda
6 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/yxt/sales/apiadmin/SmsSalesBillRest.java
View File

@@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo;
import com.yxt.sales.biz.smssalesbill.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -74,11 +75,23 @@ public class SmsSalesBillRest {
return rb.success().setData(sid);
}
@ApiOperation("提交")
@PostMapping("/submit")
public ResultBean submit(@RequestBody SmsSalesBillDto dto){
ResultBean rb = ResultBean.fireFail();
String sid = smsSalesBillService.submit(dto);
return rb.success().setData(sid);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否不是未审核的
int count = smsSalesBillService.selectBySid(StringUtils.join(sids, ","));
if (count > 0) {
return rb.setMsg("删除的数据中包含已经提交的数据，删除失败");
}
smsSalesBillService.delBySids(sids);
smsSalesBillService.delLinkData(sids);
return rb.success();

2
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.java
View File

@@ -67,4 +67,6 @@ public interface SmsSalesBillMapper extends BaseMapper<SmsSalesBill> {
IPage<OrderReviewVo> reviewListPage(IPage<SmsSalesBill> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesBill> qw);
List<ReviewDiscount> selReviewDiscountByBillSid(@Param("sid") String sid);
int selectBySid(String join);
}

19
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillMapper.xml
View File

@@ -22,7 +22,18 @@
IFNULL( p.deliveryProvince, '' ),
IFNULL( p.deliveryCity, '' ),
IFNULL( p.deliveryCounty, '' ),
IFNULL( p.deliveryAddress, '' )) AS deliveryAddress
IFNULL( p.deliveryAddress, '' )) AS deliveryAddress,
CASE
s.state
WHEN '0' THEN
'未审核'
WHEN '1' THEN
'已审核'
WHEN '2' THEN
'审核未通过'
WHEN '3' THEN
'审核中'
END AS state
FROM
sms_sales_bill AS s
LEFT JOIN sms_sales_bill_logistics AS l ON s.sid = l.billSid
@@ -109,4 +120,10 @@
WHERE
d.billSid = #{sid}
</select>
<select id="selectBySid" resultType="java.lang.Integer">
SELECT COUNT(*)
FROM sms_sales_bill
WHERE state != '0'
and find_in_set(sid, #{list})
</select>
</mapper>

3
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillQuery.java
View File

@@ -72,6 +72,7 @@ public class SmsSalesBillQuery implements Query {
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("单据审核状态")
private String state; // 单据审核状态
}

34
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java
View File

@@ -133,6 +133,9 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
if (StringUtils.isNotBlank(query.getCreateOrgSid())) {
qw.eq("s.createOrgSid", query.getCreateOrgSid());
}
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("s.state", query.getState());
}
String createStartTime = query.getStartDate();
String createEndTime = query.getEndDate();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -203,7 +206,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
BeanUtil.copyProperties(dto, smsSalesBill, "id", "sid");
String applyCode = getApplyCode();
smsSalesBill.setBillNo(applyCode);
smsSalesBill.setState(3);
smsSalesBill.setState(0);
baseMapper.insert(smsSalesBill);
OmsFlowNode omsFlowNode = new OmsFlowNode();
omsFlowNode.setBillSid(sid);
@@ -322,7 +325,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
}
SmsSalesBillAmount amount = smsSalesBillAmountService.selByBillSid(sid);
if (null != amount) {
BeanUtil.copyProperties(amount, vo, "id", "sid", "createBySid", "createTime");
BeanUtil.copyProperties(amount, vo, "id", "sid", "createBySid", "createTime","remarks");
}
List<SmsSalesBillDetail> goods = smsSalesBillDetailService.selByBillSid(sid);
@@ -345,15 +348,15 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
}
SmsSalesBillInvoice invoice = smsSalesBillInvoiceService.selByBillSid(sid);
if (null != invoice) {
BeanUtil.copyProperties(invoice, vo, "id", "sid", "createBySid", "createTime");
BeanUtil.copyProperties(invoice, vo, "id", "sid", "createBySid", "createTime","remarks");
}
SmsSalesBillLogistics logistics = smsSalesBillLogisticsService.selByBillSid(sid);
if (null != logistics) {
BeanUtil.copyProperties(logistics, vo, "id", "sid", "createBySid", "createTime");
BeanUtil.copyProperties(logistics, vo, "id", "sid", "createBySid", "createTime","remarks");
}
SmsSalesBillshipper billshipper = smsSalesBillshipperService.selByBillSid(sid);
if (null != billshipper) {
BeanUtil.copyProperties(billshipper, vo, "id", "sid", "createBySid", "createTime");
BeanUtil.copyProperties(billshipper, vo, "id", "sid", "createBySid", "createTime","remarks");
}
List<FileQueryUrl> fileQueryUrls = new ArrayList<>();
List<SmsAppendixDetailsVo> smsAppendixDetailsVos = smsAppendixService.selByLinkSid(sid);
@@ -407,6 +410,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
if (StringUtils.isNotBlank(query.getCreateOrgSid())) {
qw.eq("s.createOrgSid", query.getCreateOrgSid());
}
qw.eq("s.state",3);
IPage<SmsSalesBill> page = PagerUtil.queryToPage(pq);
IPage<OrderReviewVo> pagging = baseMapper.reviewListPage(page, qw);
PagerVo<OrderReviewVo> p = PagerUtil.pageToVo(pagging, null);
@@ -596,4 +600,24 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
}
return rb.success();
}
public int selectBySid(String join) {
return baseMapper.selectBySid(join);
}
public String submit(SmsSalesBillDto dto) {
String sid = saveOrUpdateDto(dto);
SmsSalesBill smsSalesBill = fetchBySid(sid);
if (null != smsSalesBill) {
smsSalesBill.setState(3);
baseMapper.updateById(smsSalesBill);
OmsFlowNode omsFlowNode = new OmsFlowNode();
omsFlowNode.setBillSid(sid);
omsFlowNode.setCreateBySid(dto.getCreateBySid());
omsFlowNode.setCreateByName(dto.getCreateByName());
omsFlowNode.setRemarks("提交销售订单");
omsFlowNodeService.insert(omsFlowNode);
}
return sid;
}
}

3
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillVo.java
View File

@@ -78,6 +78,7 @@ public class SmsSalesBillVo implements Vo {
private String deliveryAddress; // 省/市/县/详细地址
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("单据审核状态")
private String state; // 单据审核状态
}