[fix]

仓库管理
修改根据生产领料详情生成出库单详情相关信息service方法；
修改生产入库进行入库service方法，更新生产订单入库数；

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java

@@ -792,19 +792,6 @@ 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());
             //标明来源是生产订单
@@ -820,6 +807,8 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
             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()));
@@ -839,7 +828,6 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
             }
         }
     }
-    }
 
     private List<SysMakeorderPickDetail> getSysMakeorderPickDetails(SysMakeorderPickVo tempSysMakeorderPickVo) {
         SysMakeorderPickDetail tempMakeorderPickDetail = new SysMakeorderPickDetail();

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("更新生产订单数据失败");