问题处理

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

@@ -316,7 +316,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
     public List<ProductionOrderDetailVo> detailByIds(List<Long> taskIds) {
         Assert.notEmpty(taskIds, "任务id列表不能为空");
 
-        List<ProductionOrderDetailVo> voList = baseMapper.getPage(getWrapper().in("pod", ProductionOrderDetail::getId, taskIds));
+        List<ProductionOrderDetailVo> voList = baseMapper.getPage(getWrapper().in("pod", ProductionOrderDetail::getId, taskIds).groupBy("pod.id"));
 
         //赋值订单信息
         produceOrderService.attributeAssign(voList, ProductionOrderDetailVo::getProduceOrderId, (detail, order) -> {

hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -45,7 +45,7 @@
         FROM production_order_detail pod
                  LEFT JOIN production_order po ON pod.produce_order_id = po.id
                  LEFT JOIN contract c ON pod.contract_id = c.id
-                 LEFT JOIN (SELECT sd.prod_order_id,
+                 LEFT JOIN (SELECT sd.contract_id,
                                    CASE
                                        WHEN SUM(CASE WHEN sd.`status` IN (15, 30) OR ep.arrival_status != 20 OR sw.`status` != 2 THEN 1 ELSE 0 END) >
                                             0 THEN 1
@@ -55,7 +55,7 @@
                                      LEFT JOIN ehsd_purchase ep ON epp.purchase_id = ep.id
                                 AND ep.`status` IN (10, 30, 60)
                                      LEFT JOIN stock_wait sw ON sw.purchase_id = ep.id
-                            GROUP BY sd.prod_order_id) t2 ON t2.prod_order_id = pod.produce_order_id
+                            GROUP BY sd.contract_id) t2 ON t2.contract_id = pod.contract_id
     </sql>
 
     <select id="getPage" resultType="com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo">

hx-sale/src/main/java/com/fjhx/sale/flow/ContractReviewFlow.java

@@ -53,9 +53,12 @@ public class ContractReviewFlow extends FlowDelegate {
                 .set(ContractProduct::getReviewFlowId, flowId)
         );
 
+        Contract contract = contractService.getById(dto.getContractId());
         //赋值产品信息
         ProductInfo productInfo = productInfoService.getById(dto.getProductId());
+
         submitData.put("productCode", productInfo.getCustomCode());
+        submitData.put("contractCode", contract.getCode());
 
         return dto.getId();
     }