问题处理

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionOrder.java

@@ -74,7 +74,7 @@ public class ProductionOrder extends BasePo {
     /**
      * 开工状态 10确认中 20不同意 30同意
      */
-    private Long beginWorkStatus;
+    private Integer beginWorkStatus;
 
     /**
      * 开工确认Id

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionBeginConfirmVo.java

@@ -16,6 +16,8 @@ import java.util.List;
 @Setter
 public class ProductionBeginConfirmVo extends ProductionBeginConfirm {
 
+    private String orderCode;
+
     List<ProductionBeginConfirm> historyList;
 
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderDetailVo.java

@@ -219,7 +219,7 @@ public class ProductionOrderDetailVo extends ProductionOrderDetail {
     /**
      * 是否同意开工
      */
-    private Integer isAgreeWork;
+    private Integer beginWorkStatus;
     /**
      * 开工申请状态
      */

hx-mes/src/main/java/com/fjhx/mes/flow/ProdBeginConfirmFlow.java

@@ -56,6 +56,14 @@ public class ProdBeginConfirmFlow extends FlowDelegate {
     public void defaultMethod(Long flowId, Long businessId, NodeTypeEnum handleNodeType, FlowStatusEnum flowStatus, JSONObject submitData) {
         ProductionBeginConfirmDto dto = submitData.toJavaObject(ProductionBeginConfirmDto.class);
         productionBeginConfirmService.updateById(dto);
+
+        ProductionBeginConfirm byId = productionBeginConfirmService.getById(businessId);
+        ProductionOrder orderById = produceOrderService.getById(byId.getProdOrderId());
+        Assert.notEmpty(orderById, "查询不到生产信息！");
+
+        //回填单号
+        submitData.put("orderCode", orderById.getCode());
+
         super.defaultMethod(flowId, businessId, handleNodeType, flowStatus, submitData);
     }
 

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

@@ -530,7 +530,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         ProductionOrder orderById = produceOrderService.getById(taskById.getProduceOrderId());
         Assert.notEmpty(orderById, "查询不到订单信息");
         if (ObjectUtil.notEqual(orderById.getBeginWorkStatus(), 30)) {
-            throw new ServiceException("订单开工确认未通过，禁止排程！");
+            throw new ServiceException("订单开工确认未通过!");
         }
     }
 

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

@@ -63,6 +63,14 @@ public class ProductionBeginConfirmServiceImpl extends ServiceImpl<ProductionBeg
     public ProductionBeginConfirmVo detail(Long id) {
         ProductionBeginConfirmVo result = BeanUtil.copyProperties(this.getById(id), ProductionBeginConfirmVo.class);
         Assert.notEmpty(result, "无法查询到开工确认信息！");
+
+
+        ProductionOrder orderById = produceOrderService.getById(result.getProdOrderId());
+        Assert.notEmpty(orderById, "查询不到生产信息！");
+
+        //回填单号
+        result.setOrderCode(orderById.getCode());
+
         result.setHistoryList(getHistoryList(result.getProdOrderId()).stream().filter(item -> !item.getId().equals(id)).collect(Collectors.toList()));
         return result;
     }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -325,7 +325,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         //操作MRP数据
         for (StockWaitDetails waitDetails : stockWaitDetailsDtoList) {
             //如果是生产领料||采购退货
-            if (Objects.equals(JournalType.PROD_OUT, journalType) || Objects.equals(JournalType.PURCHASE_IN, journalType)) {
+            if (Objects.equals(JournalType.PROD_OUT, journalType) || Objects.equals(JournalType.PURCHASE_RETURN_OUT, journalType)) {
                 //减少MRP库存
                 contractMrpInfoService.update(q -> q
                         .eq(ContractMrpInfo::getContractId, stockWait.getContractId())
@@ -348,7 +348,6 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
                 );
             }
         }
-
     }
 
     @Override