From cd076543b6e3ef281d3df8cbbf26fc02b4ab52bf Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Tue, 9 Jul 2024 19:11:51 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=80=9A=E7=9F=A5=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=97=B6=EF=BC=8C=E8=AE=A1=E7=AE=97=E6=B2=A1?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=83=A8=E9=97=A8=E7=B1=BB=E5=9E=8B=E4=B8=AD?= =?UTF-8?q?=E5=90=84=E4=BD=8D=E7=89=A9=E6=96=99=E7=9A=84=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=95=B0=E7=9A=84=E6=80=BB=E5=92=8C=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E6=94=BE=E5=85=A5=E4=B8=BB=E8=A1=A8=E7=9A=84=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=B7=B2=E5=88=B0=E8=B4=A7=E6=95=B0=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/service/impl/PurchaseOrderServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java index c2c3205c..1b397589 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java @@ -387,6 +387,10 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService //WarehouseStorageType 仓库入库类型(0采购入库、1供应商补货、2委内入库、3公司退货、4委外入库、5生产入库), //setWarehouseOrderType仓库订单类型（0采购订单、1生产订单、2退换货订单、3委外订单), //WarehouseDeptType 仓库入库部门类型(0仓库，1采购 ), + //通知到货数1 + Integer notifyArrivedNum = 0; + Integer notifyArrivedNum1 = 0; + //通知到货数2 if(list1.size() > 0) { //仓库入库单，物料入库列表信息读取，放入生成的入库订单号 String warehouseStorageCode = redisCache.generateBillNo("RK"); @@ -395,6 +399,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService warehouseStorageOrderDetail.setWarehouseStorageType("0"); warehouseStorageOrderDetail.setMaterialDeptType("0"); warehouseStorageOrderDetail.setWarehouseDeptType("0"); + notifyArrivedNum = notifyArrivedNum + warehouseStorageOrderDetail.getNotifyArriveNum(); storageOrderDetailMapper.insertWarehouseStorageOrderDetail(warehouseStorageOrderDetail); } warehouseStorageOrder.setWarehouseStorageCode(warehouseStorageCode); @@ -404,8 +409,10 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService warehouseStorageOrder.setWarehouseStorageType("0"); warehouseStorageOrder.setWarehouseOrderType("0"); warehouseStorageOrder.setWarehouseDeptType("0"); + warehouseStorageOrder.setNotifyArrivedNum(notifyArrivedNum); warehouseStorageOrder.setCreateTime(DateUtils.getNowDate()); warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName()); + notifyArrivedNum = notifyArrivedNum + warehouseStorageOrder.getNotifyArrivedNum(); result = warehouseStorageOrderMapper.insertWarehouseStorageOrder(warehouseStorageOrder); } if(list2.size() > 0) { @@ -416,6 +423,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService warehouseStorageOrderDetail.setWarehouseStorageType("0"); warehouseStorageOrderDetail.setMaterialDeptType("1"); warehouseStorageOrderDetail.setWarehouseDeptType("1"); + notifyArrivedNum1 = notifyArrivedNum + warehouseStorageOrderDetail.getNotifyArriveNum(); storageOrderDetailMapper.insertWarehouseStorageOrderDetail(warehouseStorageOrderDetail); } //入库代表为仓库部分的入库单 @@ -430,6 +438,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService warehouseStorageOrder.setWarehouseStorageType("0"); warehouseStorageOrder.setWarehouseOrderType("0"); warehouseStorageOrder.setWarehouseDeptType("1"); + warehouseStorageOrder.setNotifyArrivedNum(notifyArrivedNum1); warehouseStorageOrder.setCreateTime(DateUtils.getNowDate()); warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName()); warehouseStorageOrder.setWarehouseStorageOrderDetailList(list2);