完善预约到货通知单，划扣认款管理保存bug

11 months ago · 90fd9cfac5
14 changed files with 88 additions and 30 deletions
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
@ -283,7 +283,9 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                        if (StringUtils.isNotBlank(record.getActualMoney())) {
                            applyRecord.setActualMoney(new BigDecimal(record.getActualMoney()));
                        }
-                        applyRecord.setPayState(Integer.parseInt(record.getPayState()));
+                        if (StringUtils.isNotBlank(record.getPayState())) {
+                            applyRecord.setPayState(Integer.parseInt(record.getPayState()));
+                        }
                        loanBuckleApplyRecordService.insert(applyRecord);
                        List<String> historySids = record.getHistorySids();
                        if (!historySids.isEmpty()) {
@ -329,7 +331,9 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                    if (StringUtils.isNotBlank(record.getActualMoney())) {
                        applyRecord.setActualMoney(new BigDecimal(record.getActualMoney()));
                    }
-                    applyRecord.setPayState(Integer.parseInt(record.getPayState()));
+                    if (StringUtils.isNotBlank(record.getPayState())) {
+                        applyRecord.setPayState(Integer.parseInt(record.getPayState()));
+                    }
                    loanBuckleApplyRecordService.insert(applyRecord);
                    List<String> historySids = record.getHistorySids();
                    if (!historySids.isEmpty()) {
@ -398,6 +402,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                    LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord();
                    LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(r.getRepaymentHistorySid());
                    if (null != planDetails) {
+                        record.setRecordSid(r.getRepaymentHistorySid());
                        if (StringUtils.isNotBlank(planDetails.getLoanContractNo())) {
                            record.setLoanContractNo(planDetails.getLoanContractNo());
                        }
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
@ -447,6 +447,8 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                WmsAnsBillDto wmsAnsBillDto = new WmsAnsBillDto();
+                wmsAnsBillDto.setDeptName(pmsPurchaseBill.getDeptName());
+                wmsAnsBillDto.setDeptSid(pmsPurchaseBill.getDeptSid());
                wmsAnsBillDto.setCreateBySid(pmsPurchaseBill.getCreateBySid());
                wmsAnsBillDto.setSourceBillNo(pmsPurchaseBill.getBillNo());
                wmsAnsBillDto.setBusTypeKey("01");
@ -476,9 +478,13 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
                    wmsAnsBillDetailDto.setGoodsSkuCode(pmsPurchaseBillDetailDetailsVo.getGoodsSkuCode());
                    wmsAnsBillDetailDto.setGoodsSkuOwnSpec(pmsPurchaseBillDetailDetailsVo.getGoodsSkuOwnSpec());
                    wmsAnsBillDetailDto.setUnit(pmsPurchaseBillDetailDetailsVo.getUnit());
-                    wmsAnsBillDetailDto.setCost(pmsPurchaseBillDetailDetailsVo.getCost().toString());
+                    if (null != pmsPurchaseBillDetailDetailsVo.getCost()) {
+                        wmsAnsBillDetailDto.setCost(pmsPurchaseBillDetailDetailsVo.getCost().toString());
+                    }
                    wmsAnsBillDetailDto.setOrderCount(pmsPurchaseBillDetailDetailsVo.getCount().toString());
-                    wmsAnsBillDetailDto.setTaxAmount(pmsPurchaseBillDetailDetailsVo.getTaxAmount().toString());
+                    if (null != pmsPurchaseBillDetailDetailsVo.getTaxAmount()) {
+                        wmsAnsBillDetailDto.setTaxAmount(pmsPurchaseBillDetailDetailsVo.getTaxAmount().toString());
+                    }
                    wmsAnsBillDetailDto.setTaxPrice(pmsPurchaseBillDetailDetailsVo.getTaxPrice().toString());
                    wmsAnsBillDetailDto.setAmount(pmsPurchaseBillDetailDetailsVo.getAmount().toString());
                    wmsAnsBillDetailDtos.add(wmsAnsBillDetailDto);
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDto.java
@ -51,6 +51,9 @@ public class WmsAnsBillDto {
    private String useOrgSid;
    @ApiModelProperty("创建组织sid")
    private String createOrgSid;
-
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String deptName;
    private List<WmsAnsBillDetailDto> wmsAnsBillDetailList = new ArrayList<>();
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java
@ -48,4 +48,8 @@ public class WmsAnsBill extends BaseEntity {
    private String useOrgSid;
    @ApiModelProperty("创建组织sid")
    private String createOrgSid;
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String deptName;
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
@ -51,6 +51,9 @@ public class WmsAnsBillDto {
    private String useOrgSid;
    @ApiModelProperty("创建组织sid")
    private String createOrgSid;
-
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String deptName;
    private List<WmsAnsBillDetailDto> wmsAnsBillDetailList = new ArrayList<>();
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml
@ -42,7 +42,9 @@
               wab.supplierSid,
               wab.supplierName,
               DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate,
-               wab.billState,
+               case wab.billState when 0 then '在途' when 1 then '部分收货'
+                                  when 2 then '已收货' when 3 then '已取消'
+                   end as billState,
               wab.reviewStatus
        from wms_ans_bill wab
        where sid = #{sid}
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBill.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBill.java
@ -42,4 +42,8 @@ public class WmsReceiptBill extends BaseEntity {
    private String useOrgSid;
    @ApiModelProperty("创建组织sid")
    private String createOrgSid;
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String deptName;
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillDto2.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillDto2.java
@ -50,6 +50,10 @@ public class WmsReceiptBillDto2 {
    private String useOrgSid;
    @ApiModelProperty("创建组织sid")
    private String createOrgSid;
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String deptName;
    @ApiModelProperty("商品列表")
    private List<WmsReceiptBillDetailDto2> list = new ArrayList<>();
    @ApiModelProperty("批次列表")
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillInitVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillInitVo.java
@ -49,6 +49,10 @@ public class WmsReceiptBillInitVo {
    private String useOrgSid;
    @ApiModelProperty("创建组织sid")
    private String createOrgSid;
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String deptName;
    @ApiModelProperty("商品列表")
    private List<WmsReceiptBillDetailDto2> list = new ArrayList<>();
    @ApiModelProperty("批次列表")
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml
@ -30,10 +30,13 @@
               wrb.supplierSid,
               wrb.supplierName,
               DATE_FORMAT(wrb.deliveryDate,'%Y-%m-%d') as deliveryDate,
+               DATE_FORMAT(wrb.createTime,'%Y-%m-%d') as createTime,
               case wrb.billState
                   when '0' then '新建'
                   when '1' then '已完成' end   as billState,
               wrb.remarks,
+               wrb.deptSid,
+               wrb.deptName,
               wrb.useOrgSid,
               wrb.createOrgSid
        from wms_receipt_bill wrb
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
@ -146,27 +146,22 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
 //                wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
                wmsReceiptBillDetailService.deleteByBillSid(sid);
                for (WmsReceiptBillDetailDto2 detail : list) {
-                    WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail();
-                    BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid");
-                    wmsReceiptBillDetail.setBillSid(sid);
-                    wmsReceiptBillDetailService.insert(wmsReceiptBillDetail);
                    String goodsSpuSid = detail.getGoodSpuSid();
                    String sourceBillSid = dto.getSourceBillSid();
-//                    String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
-                    List<WmsReceiptBillDetail> details = baseMapper.selGoodsListCountBySpuSidAndSouceSid(goodsSpuSid,sourceBillSid);
+                    String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
                    WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(goodsSpuSid, sourceBillSid);
-                    BigDecimal count = new BigDecimal("0");
-                    if (!details.isEmpty()) {
-                        for (WmsReceiptBillDetail receiptBillDetail : details) {
-                          count = count.add(receiptBillDetail.getActualInCount());
-                        }
-                    }
+                    BigDecimal count = new BigDecimal(goodsCount);
                    if (null != goods) {
                        BigDecimal orderCount = new BigDecimal(goods.getOrderCount());
-                        goods.setActualInCount(count);
-                        goods.setWaitInCount(orderCount.subtract(count));
+                        BigDecimal accCount = count.add(new BigDecimal(detail.getActualInCount()));
+                        goods.setActualInCount(accCount);
+                        goods.setWaitInCount(orderCount.subtract(accCount));
                        wmsAnsBillDetailService.updateById(goods);
                    }
+                    WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail();
+                    BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid");
+                    wmsReceiptBillDetail.setBillSid(sid);
+                    wmsReceiptBillDetailService.insert(wmsReceiptBillDetail);
                }
                WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
                List<WmsAnsListDetailsVo> vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid());
@ -177,7 +172,7 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
                        if (StringUtils.isNotBlank(vo.getWaitInCount())) {
                            count = new BigDecimal(vo.getWaitInCount());
                        }
-                        if (count.compareTo(BigDecimal.ZERO) < 0) {
+                        if (count.compareTo(BigDecimal.ZERO) <= 0) {
                            integers.add(2);
                        } else {
                            integers.add(1);
@ -187,6 +182,11 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
                        wmsAnsBill.setBillState(1);
                    } else {
                        wmsAnsBill.setBillState(2);
+                        for (Integer integer : integers) {
+                            if (integer == 1) {
+                                wmsAnsBill.setBillState(1);
+                            }
+                        }
                    }
                }
                wmsAnsBillService.updateById(wmsAnsBill);
@ -210,10 +210,6 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
                wmsReceiptBillDetailService.deleteByBillSid(sid);
 //                wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
                for (WmsReceiptBillDetailDto2 detail : list) {
-                    WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail();
-                    BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid");
-                    wmsReceiptBillDetail.setBillSid(sid);
-                    wmsReceiptBillDetailService.insert(wmsReceiptBillDetail);
                    String goodsSpuSid = detail.getGoodSpuSid();
                    String sourceBillSid = dto.getSourceBillSid();
                    String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
@ -221,10 +217,15 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
                    BigDecimal count = new BigDecimal(goodsCount);
                    if (null != goods) {
                        BigDecimal orderCount = new BigDecimal(goods.getOrderCount());
-                        goods.setActualInCount(count);
-                        goods.setWaitInCount(orderCount.subtract(count));
+                        BigDecimal accCount = count.add(new BigDecimal(detail.getActualInCount()));
+                        goods.setActualInCount(accCount);
+                        goods.setWaitInCount(orderCount.subtract(accCount));
                        wmsAnsBillDetailService.updateById(goods);
                    }
+                    WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail();
+                    BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid");
+                    wmsReceiptBillDetail.setBillSid(sid);
+                    wmsReceiptBillDetailService.insert(wmsReceiptBillDetail);
                }
                WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
                List<WmsAnsListDetailsVo> vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid());
@ -235,7 +236,7 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
                        if (StringUtils.isNotBlank(vo.getWaitInCount())) {
                            count = new BigDecimal(vo.getWaitInCount());
                        }
-                        if (count.compareTo(BigDecimal.ZERO) < 0) {
+                        if (count.compareTo(BigDecimal.ZERO) <= 0) {
                            integers.add(2);
                        } else {
                            integers.add(1);
@ -245,6 +246,11 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
                        wmsAnsBill.setBillState(1);
                    } else {
                        wmsAnsBill.setBillState(2);
+                        for (Integer integer : integers) {
+                            if (integer == 1) {
+                                wmsAnsBill.setBillState(1);
+                            }
+                        }
                    }
                }
                wmsAnsBillService.updateById(wmsAnsBill);
@ -286,6 +292,9 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
                BeanUtil.copyProperties(wmsAnsListDetailsVo, detailsVo);
                detailsVo.setIsQuality(0);
                detailsVo.setQualityState(0);
+                detailsVo.setActualInCount("");
+                detailsVo.setRejectCount("");
+                detailsVo.setRejectReason("");
                lists.add(detailsVo);
            }
            wmsReceiptBillVo.setList(lists);
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillVo.java
@ -48,6 +48,9 @@ public class WmsReceiptBillVo {
    private String useOrgSid;
    @ApiModelProperty("创建组织sid")
    private String createOrgSid;
-
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门")
+    private String deptName;
    private List<WmsReceiptBillDetailVo> list = new ArrayList<>();
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java
@ -47,6 +47,12 @@ public class WmsReceiptBillDetail extends BaseEntity {
    @ApiModelProperty("载具说明")
    private String packageRemark;

+    @ApiModelProperty("税额")
+    private BigDecimal taxAmount;
+    @ApiModelProperty("含税价")
+    private BigDecimal taxPrice;
+    @ApiModelProperty("金额")
+    private BigDecimal amount;
 //    @ApiModelProperty("仓库sid")
 //    private String warehouseSid;
 //    @ApiModelProperty("仓库名称")
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java
@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.math.BigDecimal;
+
 /**
 * @description:
 * @author: dimengzhe