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