From 0b9e8bd3c873b29878768027fd1629ccd8d16494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 29 Nov 2024 14:13:59 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E8=AF=A6=E6=83=85=E7=94=9F=E6=88=90=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= =?UTF-8?q?service=E6=96=B9=E6=B3=95=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E8=BF=9B=E8=A1=8C=E5=85=A5?= =?UTF-8?q?=E5=BA=93service=E6=96=B9=E6=B3=95=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=85=A5=E5=BA=93=E6=95=B0?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WarehouseOutOrderServiceImpl.java | 76 ++++++++----------- .../WarehouseStorageOrderServiceImpl.java | 7 +- 2 files changed, 37 insertions(+), 46 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java index 97bd2485..4c24eb1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java @@ -792,52 +792,40 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService warehouseOutOrderDetail.setRelatedOrderCode(tempSysMakeorderPickVo.getMakeNo()); //物料相关信息 warehouseOutOrderDetail.setMaterialNo(sysMakeorderPickDetail.getMaterialNo()); - //根据出库单号和关联单号以及物料号查找出库单详情数据 - WarehouseOutOrderDetail tempWarehouseOutOrderDetail = outOrderDetailMapper.selectOutOrderDetailListByThreeCode(warehouseOutOrderDetail); - if (tempWarehouseOutOrderDetail != null){ - warehouseOutOrderDetail.setOutOrderDetailId(tempWarehouseOutOrderDetail.getOutOrderDetailId()); - Integer applyOutOrderSum = (int) (sysMakeorderPickDetail.getPickNum()+tempWarehouseOutOrderDetail.getApplyOutOrderSum()); - Integer makeNum = (int) (sysMakeorderPickDetail.getPickNum() + tempWarehouseOutOrderDetail.getMakeNum()); - warehouseOutOrderDetail.setApplyOutOrderSum(applyOutOrderSum); - warehouseOutOrderDetail.setMakeNum(makeNum); - int updateWarehouseOutOrderDetailResult = outOrderDetailMapper.updateWarehouseOutOrderDetail(warehouseOutOrderDetail); - if (updateWarehouseOutOrderDetailResult <= 0){ - throw new BusinessException("更新出库单详情失败"); - } - }else { - warehouseOutOrderDetail.setWarehouseOutStatus("4"); - warehouseOutOrderDetail.setMakeNo(tempSysMakeorderPickVo.getMakeNo()); - //标明来源是生产订单 - warehouseOutOrderDetail.setWarehouseOrderType("1"); - warehouseOutOrderDetail.setWarehouseOutType("1"); - warehouseOutOrderDetail.setMaterialSum(tempSysMakeorderPickVo.getMaterialSum()); - warehouseOutOrderDetail.setEnterpriseSum(tempSysMakeorderPickVo.getEnterpriseSum()); - - warehouseOutOrderDetail.setCreateBy(ShiroUtils.getLoginName()); - warehouseOutOrderDetail.setCreateTime(new Date()); - warehouseOutOrderDetail.setApplyName(sysMakeorderPickVo.getApplyUser()); - warehouseOutOrderDetail.setMaterialName(sysMakeorderPickDetail.getMaterialName()); - warehouseOutOrderDetail.setMaterialDescribe(sysMakeorderPickDetail.getDescribe()); - warehouseOutOrderDetail.setMaterialUnit(sysMakeorderPickDetail.getUnit()); - warehouseOutOrderDetail.setMaterialBrand(sysMakeorderPickDetail.getBrand()); - warehouseOutOrderDetail.setMaterialProcessMethod(sysMakeorderPickDetail.getProcessMethod()); - //订单数量为本次领料数量 - warehouseOutOrderDetail.setMakeNum(Math.toIntExact(sysMakeorderPickDetail.getPickNum())); - //添加申请出库数量 - warehouseOutOrderDetail.setApplyOutOrderSum(Math.toIntExact(sysMakeorderPickDetail.getPickNum())); - - if (StringUtils.isNotEmpty(sysMakeorderPickDetail.getDescribe())) { - String[] splitDescribe = sysMakeorderPickDetail.getDescribe().split(","); - if (splitDescribe.length >= 2) { - warehouseOutOrderDetail.setMaterialModel(splitDescribe[0]); - warehouseOutOrderDetail.setMaterialSpecification(splitDescribe[1]); - } - } - int insertOutOrderDetailResult = outOrderDetailMapper.insertWarehouseOutOrderDetail(warehouseOutOrderDetail); - if (insertOutOrderDetailResult <= 0){ - throw new BusinessException("新增出库单详情数据失败"); + warehouseOutOrderDetail.setWarehouseOutStatus("4"); + warehouseOutOrderDetail.setMakeNo(tempSysMakeorderPickVo.getMakeNo()); + //标明来源是生产订单 + warehouseOutOrderDetail.setWarehouseOrderType("1"); + warehouseOutOrderDetail.setWarehouseOutType("1"); + warehouseOutOrderDetail.setMaterialSum(tempSysMakeorderPickVo.getMaterialSum()); + warehouseOutOrderDetail.setEnterpriseSum(tempSysMakeorderPickVo.getEnterpriseSum()); + + warehouseOutOrderDetail.setCreateBy(ShiroUtils.getLoginName()); + warehouseOutOrderDetail.setCreateTime(new Date()); + warehouseOutOrderDetail.setApplyName(sysMakeorderPickVo.getApplyUser()); + warehouseOutOrderDetail.setMaterialName(sysMakeorderPickDetail.getMaterialName()); + warehouseOutOrderDetail.setMaterialDescribe(sysMakeorderPickDetail.getDescribe()); + warehouseOutOrderDetail.setMaterialUnit(sysMakeorderPickDetail.getUnit()); + warehouseOutOrderDetail.setMaterialBrand(sysMakeorderPickDetail.getBrand()); + warehouseOutOrderDetail.setMaterialModel(sysMakeorderPickDetail.getMaterialModel()); + warehouseOutOrderDetail.setMaterialType(sysMakeorderPickDetail.getMaterialType()); + warehouseOutOrderDetail.setMaterialProcessMethod(sysMakeorderPickDetail.getProcessMethod()); + //订单数量为本次领料数量 + warehouseOutOrderDetail.setMakeNum(Math.toIntExact(sysMakeorderPickDetail.getPickNum())); + //添加申请出库数量 + warehouseOutOrderDetail.setApplyOutOrderSum(Math.toIntExact(sysMakeorderPickDetail.getPickNum())); + + if (StringUtils.isNotEmpty(sysMakeorderPickDetail.getDescribe())) { + String[] splitDescribe = sysMakeorderPickDetail.getDescribe().split(","); + if (splitDescribe.length >= 2) { + warehouseOutOrderDetail.setMaterialModel(splitDescribe[0]); + warehouseOutOrderDetail.setMaterialSpecification(splitDescribe[1]); } } + int insertOutOrderDetailResult = outOrderDetailMapper.insertWarehouseOutOrderDetail(warehouseOutOrderDetail); + if (insertOutOrderDetailResult <= 0){ + throw new BusinessException("新增出库单详情数据失败"); + } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index 3f6b178f..72cdb0b2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -1379,8 +1379,11 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS //更新生产订单的数据 SysMakeOrder tempSysMakeOrder = sysMakeOrderMapper.selectMakeOrderByMakeNo(warehouseStorageOrder.getRelatedOrderCode()); - tempSysMakeOrder.setEceiptNum(storageSum); - //设置生产状态为全部完成 + //入库数 + int orderEceiptNum = Optional.ofNullable(tempSysMakeOrder.getEceiptNum()) + .orElse(0); + orderEceiptNum = orderEceiptNum + storageSum; + tempSysMakeOrder.setEceiptNum(orderEceiptNum); int updateMakeOrderResult = sysMakeOrderService.updateByMakeNo(tempSysMakeOrder); if (updateMakeOrderResult <= 0){ throw new BusinessException("更新生产订单数据失败");