问题处理

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

@@ -17,6 +17,11 @@ import com.fjhx.mes.entity.technology.po.TechnologyProcessLine;
 import com.fjhx.mes.mapper.production.ProductionReportingMapper;
 import com.fjhx.mes.service.production.*;
 import com.fjhx.mes.service.technology.TechnologyProcessLineService;
+import com.fjhx.wms.entity.stock.emums.JournalType;
+import com.fjhx.wms.entity.stock.po.StockWait;
+import com.fjhx.wms.entity.stock.po.StockWaitDetails;
+import com.fjhx.wms.service.stock.StockWaitDetailsService;
+import com.fjhx.wms.service.stock.StockWaitService;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -59,6 +64,10 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
     private ProduceOrderService produceOrderService;
     @Autowired
     private ProductionSchedulingService productionSchedulingService;
+    @Autowired
+    private StockWaitService stockWaitService;
+    @Autowired
+    private StockWaitDetailsService stockWaitDetailsService;
 
 
     @Override
@@ -203,7 +212,7 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
                 .eq(TechnologyProcessLine::getTargetProcessesId, 99)
         );
         if (count > 0) {
-            //是最后一道工序添加完工数量
+            //是最后一道工序添加完工数量，生成完工入库
             BigDecimal quantity = productionOrderDetail.getQuantity();
             BigDecimal finishQuantity = productionOrderDetail.getFinishQuantity();
             //计算完工数量
@@ -215,6 +224,23 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
                 productionOrderDetail.setProduceStatus(2);
             }
             produceOrderDetailService.updateById(productionOrderDetail);
+
+            //添加一条完工入库类型的待入库数据
+            StockWait stockWait = new StockWait();
+            stockWait.setType(1);
+            stockWait.setBusinessType(JournalType.COMPLETION_IN.getDetailType());
+            stockWait.setBusinessId(productionOrderDetail.getId());
+            stockWait.setStatus(0);
+            stockWait.setCompanyId(SecurityUtils.getCompanyId());
+            stockWaitService.save(stockWait);
+            StockWaitDetails stockWaitDetails = new StockWaitDetails();
+            stockWaitDetails.setStockWaitId(stockWait.getId());
+            stockWaitDetails.setProductId(productionOrderDetail.getProductId());
+            stockWaitDetails.setQuantity(productionOrderDetail.getQuantity());
+            stockWaitDetails.setReceiptQuantity(BigDecimal.ZERO);
+            stockWaitDetails.setBusinessDetailsId(productionOrderDetail.getId());
+            stockWaitDetails.setProdTaskId(productionOrderDetail.getId());
+            stockWaitDetailsService.save(stockWaitDetails);
         }
         //检查订单下的任务是否完成，更改状态
         Long produceOrderId = productionOrderDetail.getProduceOrderId();

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWaitDetails.java

@@ -60,4 +60,9 @@ public class StockWaitDetails extends BasePo {
      */
     private Long purchaseDetailId;
 
+    /**
+     * 生产任务id
+     */
+    private Long prodTaskId;
+
 }