问题处理

hx-jxst/src/main/java/com/fjhx/jxst/entity/after/vo/AfterSalesRecordVo.java

@@ -21,6 +21,10 @@ public class AfterSalesRecordVo extends AfterSalesRecord {
      * 产品名称
      */
     private String productName;
+    /**
+     * 产品规格
+     */
+    private String productSpec;
 
     /**
      * bomInfoId

hx-jxst/src/main/java/com/fjhx/jxst/service/after/impl/AfterSalesRecordServiceImpl.java

@@ -80,6 +80,7 @@ public class AfterSalesRecordServiceImpl extends ServiceImpl<AfterSalesRecordMap
         //赋值产品信息
         productInfoService.attributeAssign(records, AfterSalesRecordVo::getProductId, (item, productInfo) -> {
             item.setProductName(productInfo.getName());
+            item.setProductSpec(productInfo.getSpec());
         });
         return page;
     }

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

@@ -50,4 +50,13 @@ public class ProductionTaskVo extends ProductionTask {
      * 产品规格
      */
     private String productSpec;
+
+    /**
+     * 客户id
+     */
+    private Long customerId;
+    /**
+     * 客户名称
+     */
+    private String customerName;
 }

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

@@ -12,6 +12,7 @@ import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.PushBusinessTypeEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.applicable.po.ApplicableProducts;
@@ -106,6 +107,8 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
     private StockFrozenService stockFrozenService;
     @Autowired
     private CodingRuleService codingRuleService;
+    @Autowired
+    private CustomerService customerService;
 
     @Override
     public Page<ProductionTaskVo> getPage(ProductionTaskSelectDto dto) {
@@ -125,6 +128,11 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
 
         //赋值负责人名字
         UserUtil.assignmentNickName(records, ProductionTask::getPersonLiableId, ProductionTaskVo::setPersonLiableName);
+
+        //赋值客户名称
+        customerService.attributeAssign(records,ProductionTaskVo::getCustomerId,(item, customer) -> {
+            item.setCustomerName(customer.getName());
+        });
         return page;
     }
 

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

@@ -17,11 +17,13 @@
             wo.product_id,
             pi.`name` AS productName,
             pp.`code` AS productionPlanCode,
-            pi.`spec` AS productSpec
+            pi.`spec` AS productSpec,
+            sc.customer_id
         FROM
             production_task pt
                 LEFT JOIN production_plan pp ON pt.production_plan_id = pp.id
                 LEFT JOIN work_order wo ON pp.work_order_id = wo.id
+                LEFT JOIN bytesailing_jxst.sales_contract sc ON wo.source_id = sc.id
                 LEFT JOIN bytesailing_item.product_info pi ON wo.product_id = pi.id
             ${ew.customSqlSegment}
     </select>