问题处理

hx-jxst/src/main/java/com/fjhx/jxst/flow/SalesContractFlow.java

@@ -70,6 +70,7 @@ public class SalesContractFlow extends FlowDelegate {
             workOrder.setQuantity(salesContractDetails.getQuantity());
             workOrder.setIsCustomized(salesContractDetails.getIsCustomized());
             workOrder.setProductionQuantity(workOrder.getQuantity());
+            workOrder.setContractDetailsId(salesContractDetails.getId());
 
             //非定制工单查询库存如果存在库存需要人工干预是否需要生产
             BigDecimal availableStockQuantity = stockService.getAvailableStockQuantity(salesContractDetails.getProductId());

hx-mes/src/main/java/com/fjhx/mes/entity/work/po/WorkOrder.java

@@ -77,4 +77,9 @@ public class WorkOrder extends BasePo {
      */
     private BigDecimal productionQuantity;
 
+    /**
+     * 合同明细id
+     */
+    private Long contractDetailsId;
+
 }

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

@@ -64,9 +64,8 @@
                     pi.`name` AS productName,
                     ptd.product_sn,
                     pt.due_date,
-                    CASE
-                        wo.is_customized
-                        WHEN 0 THEN
+                    IF(
+                        wo.is_customized=0,
                             (
                                 SELECT
                                     GROUP_CONCAT( ppr.`name` SEPARATOR '->' )
@@ -76,13 +75,13 @@
                                         LEFT JOIN applicable_products apr ON apr.technology_id = tec.id
                                 WHERE
                                     apr.product_id = wo.product_id
-                            ) ELSE ( SELECT GROUP_CONCAT( wopp.`name` SEPARATOR '->' ) FROM work_order_production_processes wopp WHERE wopp.work_order_id = wo.id )
-                        END AS productionProcessesNames,
-                    CASE
-                        wo.is_customized
-                        WHEN 0 THEN
-                            ( SELECT ppr.`name` FROM production_processes ppr WHERE ppr.id = ptd.production_processes_id ) ELSE ( SELECT wopp.`name` FROM work_order_production_processes wopp WHERE wopp.id = ptd.production_processes_id )
-                        END AS productionProcessesName,
+                            ) ,
+                        ( SELECT GROUP_CONCAT( wopp.`name` SEPARATOR '->' ) FROM work_order_production_processes wopp WHERE wopp.work_order_id = wo.id )
+                      ) AS productionProcessesNames,
+                    IF(
+                        wo.is_customized=0,
+                            ( SELECT ppr.`name` FROM production_processes ppr WHERE ppr.id = ptd.production_processes_id ) , ( SELECT wopp.`name` FROM work_order_production_processes wopp WHERE wopp.id = ptd.production_processes_id )
+                        ) AS productionProcessesName,
                     su.nick_name AS personLiableName,
                     ptd.finish_status,
                     ptd.finish_time