销售出库问题处理

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -786,7 +786,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
                     //生成待出库
                     createStockWait(productionOrder1);
 
-                    //创建生产报工
+                    //创建完工入库
                     createOrEditProdCompletion(productionOrder1);
 
                     productionOrder1.setProduceStatus(1);
@@ -800,7 +800,10 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
 
     private void createOrEditProdCompletion(ProductionOrder productionOrder) {
         //添加一条完工入库类型的待入库数据
-        StockWait stockWait = stockWaitService.getOne(q -> q.eq(StockWait::getProdOrderId, productionOrder.getId()));
+        StockWait stockWait = stockWaitService.getOne(q -> q
+                .eq(StockWait::getProdOrderId, productionOrder.getId())
+                .eq(StockWait::getBusinessType, JournalType.COMPLETION_IN.getDetailType())
+        );
         if (ObjectUtil.isEmpty(stockWait)) {
             stockWait = new StockWait();
         }
@@ -820,7 +823,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         stockWaitDetailsService.remove(q -> q.eq(StockWaitDetails::getStockWaitId, finalStockWait.getId()).notIn(StockWaitDetails::getProdTaskId, taskIds));
         for (ProductionOrderDetail prodTask : prodTaskList) {
 
-            StockWaitDetails stockWaitDetails = stockWaitDetailsService.getOne(q -> q.eq(StockWaitDetails::getProdTaskId, prodTask));
+            StockWaitDetails stockWaitDetails = stockWaitDetailsService.getOne(q -> q.eq(StockWaitDetails::getProdTaskId, prodTask.getId()));
             if (ObjectUtil.isEmpty(stockWaitDetails)) {
                 stockWaitDetails = new StockWaitDetails();
                 stockWaitDetails.setReceiptQuantity(BigDecimal.ZERO);

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -3113,14 +3113,14 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             outboundRecords.setProdTaskId(taskInfo.getProdTaskId());
         }
 
-        //修改订单出库状态
-        this.update(q -> q
-                .eq(Contract::getId, contractId)
-                .set(Contract::getOutboundStatus, 1)
-                .set(Contract::getOutboundTime, new Date())
-                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-                .set(BasePo::getUpdateTime, new Date())
-        );
+//        //修改订单出库状态
+//        this.update(q -> q
+//                .eq(Contract::getId, contractId)
+//                .set(Contract::getOutboundStatus, 1)
+//                .set(Contract::getOutboundTime, new Date())
+//                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+//                .set(BasePo::getUpdateTime, new Date())
+//        );
 
 //        //修改生产订单出库状态为出库中
 //        stockWaitDetailsMapper.updateOrderStatusByContractId(contractId, 5);