diff --git 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 index b3b0cf9441..93c748a686 100644 --- 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 historySids = record.getHistorySids(); if (!historySids.isEmpty()) { @@ -329,7 +331,9 @@ public class LoanBuckleApplyService extends MybatisBaseService historySids = record.getHistorySids(); if (!historySids.isEmpty()) { @@ -398,6 +402,7 @@ public class LoanBuckleApplyService extends MybatisBaseService wmsAnsBillDetailList = new ArrayList<>(); } diff --git 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 index 5d205434bf..7ab8d2b948 100644 --- 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; } diff --git 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 index ea85f5165b..182660cee7 100644 --- 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 wmsAnsBillDetailList = new ArrayList<>(); } diff --git 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 index 01d102b6fb..e60378425a 100644 --- 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} diff --git 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 index c0b6c6bda8..9898140b85 100644 --- 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; } diff --git 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 index aa98223962..ceb9998279 100644 --- 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 list = new ArrayList<>(); @ApiModelProperty("批次列表") diff --git 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 index f6448d5567..927541b97b 100644 --- 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 list = new ArrayList<>(); @ApiModelProperty("批次列表") diff --git 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 index 545eed94c9..30bc4b2165 100644 --- 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 diff --git 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 index 650569b608..a750912fdf 100644 --- 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 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 vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid()); @@ -177,7 +172,7 @@ public class WmsReceiptBillService extends MybatisBaseService vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid()); @@ -235,7 +236,7 @@ public class WmsReceiptBillService extends MybatisBaseService list = new ArrayList<>(); } diff --git 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 index 74bc8d146b..8d9bec2a0a 100644 --- 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("仓库名称") diff --git 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 index 36e75f5400..79d6ca10ec 100644 --- 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