From f45373ddee8f08c7b6d50401ba6fdbe16ab8df71 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 17 Jul 2024 17:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E6=9C=9F=E5=88=B0?= =?UTF-8?q?=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=8D=95=E3=80=81=E4=BF=AE=E6=94=B9=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PmsPurchaseBillService.java | 15 ++- .../feign/wms/wmsansbill/WmsAnsBillDto.java | 8 ++ .../feign/wms/wmsansbill/WmsAnsBillFeign.java | 7 +- .../apiadmin/inventroy/WmsAnsBillRest.java | 5 + .../inventroy/WmsReceiptBillRest.java | 15 +++ .../biz/inventory/wmsansbill/WmsAnsBill.java | 9 ++ .../inventory/wmsansbill/WmsAnsBillDto.java | 8 ++ .../wmsansbill/WmsAnsBillMapper.java | 2 + .../inventory/wmsansbill/WmsAnsBillMapper.xml | 9 +- .../wmsansbill/WmsAnsBillService.java | 13 +- .../inventory/wmsansbill/WmsAnsBillVo.java | 8 ++ .../inventory/wmsinventory/WmsInventory.java | 3 +- .../WmsInventoryRecordDto.java | 3 +- .../wmsreceiptbill/WmsReceiptBill.java | 7 + .../wmsreceiptbill/WmsReceiptBillDto2.java | 6 + .../wmsreceiptbill/WmsReceiptBillInitVo.java | 2 + .../wmsreceiptbill/WmsReceiptBillMapper.java | 3 + .../wmsreceiptbill/WmsReceiptBillMapper.xml | 18 ++- .../wmsreceiptbill/WmsReceiptBillPageVo.java | 6 +- .../wmsreceiptbill/WmsReceiptBillService.java | 73 ++++++++++ .../wmsreceiptbill/WmsReceiptBillVo.java | 4 + .../wmsreceiptbilldetail/ShelfListVo.java | 26 ++++ .../WmsReceiptBillDetail.java | 8 +- .../WmsReceiptBillDetailDto2.java | 1 - .../WmsReceiptBillDetailMapper.java | 2 + .../WmsReceiptBillDetailMapper.xml | 8 +- .../WmsReceiptBillDetailService.java | 4 + .../inventory/wmsshelfbill/ShelfInitVo.java | 2 + .../inventory/wmsshelfbill/WmsShelfBill.java | 2 + .../wmsshelfbill/WmsShelfBillDto.java | 2 + .../wmsshelfbill/WmsShelfBillService.java | 127 +++++++++++++++++- 31 files changed, 387 insertions(+), 19 deletions(-) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/ShelfListVo.java diff --git 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 index 1649cd1514..dee0957019 100644 --- 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 @@ -265,7 +265,7 @@ public class PmsPurchaseBillService extends MybatisBaseService pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(record.getSid()); for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) { - BigDecimal returnedCount = pmsPurchasebackDetailService.checkReturnedCount(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid(),record.getSid()); + BigDecimal returnedCount = pmsPurchasebackDetailService.checkReturnedCount(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid(), record.getSid()); pmsPurchaseBillDetailDetailsVo.setReturnedCount(returnedCount); } record.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos); @@ -516,6 +516,16 @@ public class PmsPurchaseBillService extends MybatisBaseService wmsAnsBillDetailList = new ArrayList<>(); } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillFeign.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillFeign.java index 037180b4bd..8f573f5213 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillFeign.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillFeign.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; @Api(tags = "预期到货通知单") @FeignClient( @@ -18,4 +19,8 @@ public interface WmsAnsBillFeign { @PostMapping("saveOrUpdate") @ApiOperation("新增修改保存") ResultBean saveOrUpdate(@RequestBody WmsAnsBillDto dto); -} \ No newline at end of file + + @PostMapping("updateManufactorBillNo") + @ApiOperation("修改预期到货通知单的厂家订单号") + ResultBean updateManufactorBillNo(@RequestParam("sid") String sid, @RequestParam("manufacturersOrderNumber")String manufacturersOrderNumber); +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAnsBillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAnsBillRest.java index 45a3f8cfb3..abc4452474 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAnsBillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAnsBillRest.java @@ -51,5 +51,10 @@ public class WmsAnsBillRest { return wmsAnsBillService.details(sid); } + @PostMapping("updateManufactorBillNo") + @ApiOperation("修改预期到货通知单的厂家订单号") + ResultBean updateManufactorBillNo(@RequestParam("sid") String sid, @RequestParam("manufacturersOrderNumber")String manufacturersOrderNumber) { + return wmsAnsBillService.updateManufactorBillNo(sid,manufacturersOrderNumber); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java index c4f44a002e..aff5e4e142 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java @@ -6,12 +6,15 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillQuery; import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillVo; import com.yxt.wms.biz.inventory.wmsreceiptbill.*; +import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.ShelfListVo; import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.WmsReceiptBillDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -39,6 +42,18 @@ public class WmsReceiptBillRest { return wmsReceiptBillService.saveOrUpdateBill2(dto); } + @ApiOperation("收货单终止") + @PostMapping("/billToEndBySids") + ResultBean billToEndBySids(@RequestBody String[] sids) { + return wmsReceiptBillService.billToEndBySids(sids); + } + + @ApiOperation("查看上架单列表") + @GetMapping("/getUpShlefListBySid/{sid}") + ResultBean> getUpShlefListBySid(@PathVariable("sid") String sid) { + return wmsReceiptBillService.getUpShlefListBySid(sid); + } + @ApiOperation("通知单收货单初始化") @GetMapping("/getInitDetails") ResultBean getInitDetails(@RequestParam("sourceSid") String sourceSid) { 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 7ab8d2b948..4e57cc899a 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 @@ -52,4 +52,13 @@ public class WmsAnsBill extends BaseEntity { private String deptSid; @ApiModelProperty("申请部门") private String deptName; + + @ApiModelProperty("采购单sid") + private String sourceBillSid; + @ApiModelProperty("厂家订单号") + private String manufactorBillNo; + @ApiModelProperty("厂家订单类型") + private String manufactorBillTypeValue; + @ApiModelProperty("厂家订单类型key") + private String manufactorBillTypeKey; } 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 182660cee7..dbe7f01027 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 @@ -55,5 +55,13 @@ public class WmsAnsBillDto { private String deptSid; @ApiModelProperty("申请部门") private String deptName; + @ApiModelProperty("采购单sid") + private String sourceBillSid; + @ApiModelProperty("厂家订单号") + private String manufactorBillNo; + @ApiModelProperty("厂家订单类型") + private String manufactorBillTypeValue; + @ApiModelProperty("厂家订单类型key") + private String manufactorBillTypeKey; private List wmsAnsBillDetailList = new ArrayList<>(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.java index 4f2467eebe..d4c286fda6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.java @@ -23,4 +23,6 @@ public interface WmsAnsBillMapper extends BaseMapper { WmsAnsDetailsVo details(String sid); String selectNum(String bill); + + WmsAnsBill selBySouceSid(@Param("sid") String sid); } 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 5e1c1b462b..6a53fc1d16 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 @@ -11,6 +11,10 @@ + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java index 9190784e4f..d020048144 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java @@ -40,6 +40,7 @@ public class WmsAnsBillService extends MybatisBaseService saveOrUpdateBill(WmsAnsBillDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); @@ -179,7 +180,7 @@ public class WmsAnsBillService extends MybatisBaseService 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 927541b97b..94791e396a 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 @@ -53,6 +53,8 @@ public class WmsReceiptBillInitVo { private String deptSid; @ApiModelProperty("申请部门") private String deptName; + @ApiModelProperty("收货人是否与上架人一致(1是，2否)") + private Integer isUpShelf; @ApiModelProperty("商品列表") private List list = new ArrayList<>(); @ApiModelProperty("批次列表") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java index 90c93c6b98..7ab29c54d9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.ShelfListVo; import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.WmsReceiptBillDetail; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -26,4 +27,6 @@ public interface WmsReceiptBillMapper extends BaseMapper { String selGoodsCountBySpuSidAndSouceSid(@Param("goodsSpuSid") String goodsSpuSid, @Param("sourceBillSid") String sourceBillSid); List selGoodsListCountBySpuSidAndSouceSid(@Param("goodsSpuSid")String goodsSpuSid, @Param("sourceBillSid")String sourceBillSid); + + List getUpShlefListBySid(@Param("sid") String sid); } 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 518cd3eaba..e73ac5b30e 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 @@ -12,7 +12,12 @@ DATE_FORMAT(wrb.deliveryDate, '%Y-%m-%d') as deliveryDate, case wrb.billState when '0' then '新建' - when '1' then '已完成' end as billState + when '1' then '已完成' end as billState, + case wrb.distributeType + when '0' then '未分配' + when '1' then '已分配' + when '2' then '部分分配' end as distributeType, + (SELECT IFNULL(COUNT(*),0) FROM wms_shelf_bill as sb WHERE sb.sourceBillSid = wrb.sid) as upShlefNum from wms_receipt_bill wrb LEFT JOIN anrui_portal.sys_organization as s ON wrb.deptSid = s.sid @@ -32,6 +37,7 @@ wrb.busTypeValue, wrb.supplierSid, wrb.supplierName, + wrb.isUpShelf, DATE_FORMAT(wrb.deliveryDate,'%Y-%m-%d') as deliveryDate, DATE_FORMAT(wrb.createTime,'%Y-%m-%d') as createTime, case wrb.billState @@ -69,4 +75,14 @@ LEFT JOIN wms_receipt_bill AS b ON d.billSid = b.sid WHERE d.goodSpuSid = #{goodsSpuSid} AND b.sourceBillSid = #{sourceBillSid} + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillPageVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillPageVo.java index 36a2b32e0f..2be4fdf1b4 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillPageVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillPageVo.java @@ -35,6 +35,10 @@ public class WmsReceiptBillPageVo { private String deliveryDate; //单据状态：新建/已完成 - @ApiModelProperty("单据状态：待收货/部分收货/已收货(默认)") + @ApiModelProperty("单据状态：新建/完成") private String billState; + @ApiModelProperty("分配状态：已分配/部分分配/未分配") + private String distributeType; + @ApiModelProperty("上架单数量") + private String upShlefNum; } 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 3b1ea42c55..35e9ae410d 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 @@ -22,10 +22,17 @@ import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailB import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2; import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchMapper; import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService; +import com.yxt.wms.biz.inventory.wmsshelfbill.ShelfInitVo; +import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBillDto; +import com.yxt.wms.biz.inventory.wmsshelfbill.WmsShelfBillService; +import com.yxt.wms.biz.inventory.wmsshelfbilldetail.ShelfInitListVo; +import com.yxt.wms.biz.inventory.wmsshelfbilldetail.WmsShelfBillDetailDto; +import com.yxt.wms.biz.inventory.wmsshelfbilldetail.WmsShelfBillDetailService; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; +import com.yxt.wms.feign.portal.sysuser.SysUserVo; import com.yxt.wms.utils.BillNo; import com.yxt.wms.utils.Rule; import org.springframework.beans.factory.annotation.Autowired; @@ -59,6 +66,10 @@ public class WmsReceiptBillService extends MybatisBaseService listPage(PagerQuery pq) { WmsReceiptBillQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -394,6 +405,52 @@ public class WmsReceiptBillService extends MybatisBaseService stringList = wmsShelfBillDetailService.selectReceiptSidList(); + stringList.removeAll(Collections.singleton(null)); + //获取收货单据 + shelfBillDto.setCreateTime(DateUtil.today());//单据日期 + shelfBillDto.setSourceBillNo(wmsReceiptBill.getBillNo());//来源单编号 + shelfBillDto.setSourceBillSid(wmsReceiptBill.getSid());//来源单sid + shelfBillDto.setBillState("新建"); + if (StringUtils.isNotBlank(wmsReceiptBill.getManufactorBillNo())) { + shelfBillDto.setManufactorBillNo(wmsReceiptBill.getManufactorBillNo()); + } + List detailDtos = new ArrayList<>(); + //获取收货单据的明细 + List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList); + wmsReceiptBillDetailsList.removeAll(Collections.singleton(null)); + if (!wmsReceiptBillDetailsList.isEmpty()) { + for (int i = 0; i < wmsReceiptBillDetailsList.size(); i++) { + WmsReceiptBillDetail v = wmsReceiptBillDetailsList.get(i); +// WmsReceiptBillDetailBatch wmsReceiptBillDetailBatch = wmsReceiptBillDetailBatchService.selectByDetails(v.getSid()); + WmsShelfBillDetailDto shelfInitListVo = new WmsShelfBillDetailDto(); + BeanUtil.copyProperties(v, shelfInitListVo, "sid"); + shelfInitListVo.setReceiptDetailSid(v.getSid()); + shelfInitListVo.setCount(v.getActualInCount().toString()); +// shelfInitListVo.setBatchNumber(wmsReceiptBillDetailBatch.getBatchNumber()); +// shelfInitListVo.setWarehouseSid(v.getWarehouseSid()); +// shelfInitListVo.setWarehouseRackSid(v.getWarehouseRackSid()); +// shelfInitListVo.setWarehouseRackCode(""); + detailDtos.add(shelfInitListVo); + } + } + shelfBillDto.setList(detailDtos); + wmsShelfBillService.saveOrUpdateShelf(shelfBillDto); + wmsReceiptBill.setDistributeType(1); + baseMapper.updateById(wmsReceiptBill); + } } return rb.success().setData(sid); } @@ -409,4 +466,20 @@ public class WmsReceiptBillService extends MybatisBaseService billToEndBySids(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + for (String sid : sids) { + WmsAnsBill ansBill = wmsAnsBillService.fetchBySid(sid); + ansBill.setBillState(3); + wmsAnsBillService.updateById(ansBill); + } + return rb.success(); + } + + public ResultBean> getUpShlefListBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List list = baseMapper.getUpShlefListBySid(sid); + return rb.success().setData(list); + } } diff --git 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 index 46ce55ff5b..cf5e00955f 100644 --- 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 @@ -52,5 +52,9 @@ public class WmsReceiptBillVo { private String deptSid; @ApiModelProperty("申请部门") private String deptName; + @ApiModelProperty("厂家订单号") + private String manufactorBillNo; private List list = new ArrayList<>(); + @ApiModelProperty("收货人是否与上架人一致(1是，2否)") + private String isUpShelf; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/ShelfListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/ShelfListVo.java new file mode 100644 index 0000000000..3ec7759b83 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/ShelfListVo.java @@ -0,0 +1,26 @@ +package com.yxt.wms.biz.inventory.wmsreceiptbilldetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/17 16:55 + */ +@Data +public class ShelfListVo { + + @ApiModelProperty("上架单sid") + private String billSid; + @ApiModelProperty("上架单编号") + private String billNo; + @ApiModelProperty("商品名称") + private String createTime; + @ApiModelProperty("制单人") + private String createByName; + @ApiModelProperty("来源单号") + private String sourceBillNo; + @ApiModelProperty("单据状态") + private String billState; +} 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 aeb07e43d9..11b45ad9d7 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 @@ -30,8 +30,8 @@ public class WmsReceiptBillDetail extends BaseEntity { private String goodsSkuOwnSpec; @ApiModelProperty("计量单位") private String unit; - /* @ApiModelProperty("预约数量") - private BigDecimal orderCount;*/ + @ApiModelProperty("预约数量") + private BigDecimal orderCount; @ApiModelProperty("实收数量") private BigDecimal actualInCount; @ApiModelProperty("拒收数量") @@ -58,8 +58,8 @@ public class WmsReceiptBillDetail extends BaseEntity { @ApiModelProperty("打印次数") private Integer printCount; -// @ApiModelProperty("仓库sid") -// private String warehouseSid; + @ApiModelProperty("已上架数量") + private BigDecimal shelfCount; // @ApiModelProperty("仓库名称") // private String warehouseName; // @ApiModelProperty("库位sid") 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 79d6ca10ec..64f61ea2d0 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 @@ -57,7 +57,6 @@ public class WmsReceiptBillDetailDto2 { @ApiModelProperty("预约数量（采购订单数量）") private String orderCount; - //入库价 @ApiModelProperty("单位成本（采购价）") private String cost; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java index c2f610b3d4..ab8aff8917 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.java @@ -22,4 +22,6 @@ public interface WmsReceiptBillDetailMapper extends BaseMapper selByBillSid(@Param("sid") String sid); + + List selectListByBillSid(@Param("sourceBillSid") String sourceBillSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml index 9063b29461..a5a8334aab 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml @@ -29,7 +29,8 @@ wrbd.packageRemark, wrbd.state, wrbd.sid detailsSid, - wrbd.goodsSpuName + wrbd.goodsSpuName, + wrbd.orderCount from wms_receipt_bill_detail wrbd where billSid = #{sid} @@ -54,4 +55,9 @@ select * from wms_receipt_bill_detail where billSid = #{sid} + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java index 04b8369757..8d9ba457da 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java @@ -82,4 +82,8 @@ public class WmsReceiptBillDetailService extends MybatisBaseService selByBillSid(String sid) { return baseMapper.selByBillSid(sid); } + + public List selectListByBillSid(String sourceBillSid) { + return baseMapper.selectListByBillSid(sourceBillSid); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfInitVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfInitVo.java index d4cefe742b..999cdacf90 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfInitVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/ShelfInitVo.java @@ -39,5 +39,7 @@ public class ShelfInitVo { private String deptName; private String upShelfSid; private String upShelfName; + @ApiModelProperty("厂家订单号") + private String manufactorBillNo; private List list = new ArrayList<>(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java index 7eee7d728b..127b9107eb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java @@ -29,5 +29,7 @@ public class WmsShelfBill extends BaseEntity { private String deptName; private String upShelfSid; private String upShelfName; + @ApiModelProperty("厂家订单号") + private String manufactorBillNo; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillDto.java index 6314757288..d9c0bcb6c4 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillDto.java @@ -37,5 +37,7 @@ public class WmsShelfBillDto { private String deptName; private String upShelfSid; private String upShelfName; + @ApiModelProperty("厂家订单号") + private String manufactorBillNo; private List list = new ArrayList<>(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java index 1dd8c2ff83..7ffa831789 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java @@ -17,6 +17,8 @@ import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService; import com.yxt.wms.biz.base.wmswarehouserack.WmsHouseInfoVo; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService; +import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBill; +import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsListDetailsVo; import com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTag; import com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTagService; import com.yxt.wms.biz.inventory.wmsgoodstag.app.*; @@ -180,6 +182,21 @@ public class WmsShelfBillService extends MybatisBaseService vos = wmsReceiptBillDetailService.selectListByBillSid(dto.getSourceBillSid()); + if (!vos.isEmpty()) { + HashSet integers = new HashSet<>(); + for (WmsReceiptBillDetail vo : vos) { + BigDecimal count = BigDecimal.ZERO; + BigDecimal actualCount = BigDecimal.ZERO; + BigDecimal shelfCount = BigDecimal.ZERO; + if (null != vo.getShelfCount()) { + shelfCount = vo.getShelfCount(); + } + if (null != vo.getActualInCount()) { + actualCount = vo.getActualInCount(); + } + count = actualCount.subtract(shelfCount); + if (count.compareTo(BigDecimal.ZERO) <= 0) { + integers.add(2); + } else { + integers.add(1); + } + } + if (integers.size() > 1) { + wmsReceiptBill.setDistributeType(2); + } else { + wmsReceiptBill.setDistributeType(1); + for (Integer integer : integers) { + if (integer == 1) { + wmsReceiptBill.setDistributeType(2); + } + } + } + } + wmsReceiptBillService.updateById(wmsReceiptBill); + } + } else { WmsShelfBill wmsShelfBill = fetchBySid(sid); if (wmsShelfBill == null) { @@ -209,6 +262,21 @@ public class WmsShelfBillService extends MybatisBaseService vos = wmsReceiptBillDetailService.selectListByBillSid(dto.getSourceBillSid()); + if (!vos.isEmpty()) { + HashSet integers = new HashSet<>(); + for (WmsReceiptBillDetail vo : vos) { + BigDecimal count = BigDecimal.ZERO; + BigDecimal actualCount = BigDecimal.ZERO; + BigDecimal shelfCount = BigDecimal.ZERO; + if (null != vo.getShelfCount()) { + shelfCount = vo.getShelfCount(); + } + if (null != vo.getActualInCount()) { + actualCount = vo.getActualInCount(); + } + count = actualCount.subtract(shelfCount); + if (count.compareTo(BigDecimal.ZERO) <= 0) { + integers.add(2); + } else { + integers.add(1); + } + } + if (integers.size() > 1) { + wmsReceiptBill.setDistributeType(2); + } else { + wmsReceiptBill.setDistributeType(1); + for (Integer integer : integers) { + if (integer == 1) { + wmsReceiptBill.setDistributeType(2); + } + } + } + } + wmsReceiptBillService.updateById(wmsReceiptBill); + } } // saveWmsInventory(sid); @@ -392,17 +494,21 @@ public class WmsShelfBillService extends MybatisBaseService stringList = wmsShelfBillDetailService.selectReceiptSidList(); - stringList.removeAll(Collections.singleton(null)); +// List stringList = wmsShelfBillDetailService.selectReceiptSidList(); +// stringList.removeAll(Collections.singleton(null)); //获取收货单据 WmsReceiptBill wmsReceiptBill = wmsReceiptBillService.fetchBySid(sid); shelfInitVo.setCreateTime(DateUtil.today());//单据日期 shelfInitVo.setSourceBillNo(wmsReceiptBill.getBillNo());//来源单编号 shelfInitVo.setSourceBillSid(wmsReceiptBill.getSid());//来源单sid shelfInitVo.setBillState("新建"); + if (StringUtils.isNotBlank(wmsReceiptBill.getManufactorBillNo())) { + shelfInitVo.setManufactorBillNo(wmsReceiptBill.getManufactorBillNo()); + } List list = new ArrayList<>(); //获取收货单据的明细 - List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList); +// List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectByBillSid(sid, stringList); + List wmsReceiptBillDetailsList = wmsReceiptBillDetailService.selectListByBillSid(sid); wmsReceiptBillDetailsList.removeAll(Collections.singleton(null)); if (!wmsReceiptBillDetailsList.isEmpty()) { for (int i = 0; i < wmsReceiptBillDetailsList.size(); i++) { @@ -411,6 +517,16 @@ public class WmsShelfBillService extends MybatisBaseService