添加客户名称

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

@@ -117,4 +117,13 @@ public class ProductionTaskDetailVo extends ProductionTaskDetail {
      * 工单是否定制
      */
     private String isCustomized;
+
+    /**
+     * 客户id
+     */
+    private Long customerId;
+    /**
+     * 客户名称
+     */
+    private String customerName;
 }

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.enums.PushBusinessTypeEnum;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.customer.entity.customer.po.Customer;
+import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
@@ -82,6 +84,8 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
     private ApplicableProductsService applicableProductsService;
     @Autowired
     private TechnologyService technologyService;
+    @Autowired
+    private CustomerService customerService;
 
     @Override
     public Page<ProductionTaskDetailVo> getPage(ProductionTaskDetailSelectDto dto) {
@@ -167,6 +171,10 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
             }
         }
 
+        //赋值客户名称
+        customerService.attributeAssign(records, ProductionTaskDetailVo::getCustomerId, (item, customer) -> {
+            item.setCustomerName(customer.getName());
+        });
         return page;
     }
 

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

@@ -19,7 +19,8 @@
             ptd.circulation_user_id,
             ptd.circulation_status,
             ptd.previous_processes_id,
-            scd.product_remark
+            scd.product_remark,
+            sc.customer_id
         from production_task_detail ptd
             left JOIN production_task_processes_detail ptpd ON ptpd.production_task_id = ptd.production_task_id
             AND ptpd.production_processes_id = ptd.production_processes_id
@@ -28,6 +29,8 @@
             LEFT JOIN work_order wo ON pp.work_order_id = wo.id
             LEFT JOIN bytesailing_jxst.sales_contract_details scd ON wo.contract_details_id = scd.id
             AND scd.del_flag =0
+            LEFT JOIN bytesailing_jxst.sales_contract sc ON scd.sales_contract_id = sc.id
+            AND sc.del_flag = 0
             ${ew.customSqlSegment}
     </select>
     <select id="getWorkOrderByProductionTask" resultType="com.fjhx.mes.entity.work.vo.WorkOrderVo">

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitDetailsVo.java

@@ -81,4 +81,14 @@ public class StockWaitDetailsVo extends StockWaitDetails {
      */
     private String productSn;
 
+    /**
+     * 客户id
+     */
+    private Long customerId;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
 }

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.wms.entity.stock.dto.StockWaitDetailsDto;
@@ -42,6 +43,8 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
     private ProductInfoService productInfoService;
     @Autowired
     private StockWaitService stockWaitService;
+    @Autowired
+    private CustomerService customerService;
 
     @Override
     public Page<StockWaitDetailsVo> getPage(StockWaitDetailsSelectDto dto) {
@@ -76,6 +79,12 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
             item.setProductDefinition(productInfo.getDefinition());
             item.setProductCustomCode(productInfo.getCustomCode());
         });
+
+        //赋值客户名称
+        customerService.attributeAssign(records, StockWaitDetailsVo::getCustomerId, (item, customer) -> {
+            item.setCustomerName(customer.getName());
+        });
+
         return page;
     }
 

hx-wms/src/main/resources/mapper/stock/StockWaitDetailsMapper.xml

@@ -17,7 +17,14 @@
             swd.update_user,
             swd.update_time,
             swd.victoriatourist_json,
-            if(sw.business_type =2,(SELECT ptd.product_sn from bytesailing_mes.production_task_detail ptd where ptd.id=sw.business_id),'') as productSn
+            if(sw.business_type =2,(SELECT ptd.product_sn from bytesailing_mes.production_task_detail ptd where ptd.id=sw.business_id),'') as productSn,
+            IF( sw.business_type = 2,( SELECT sc.customer_id FROM bytesailing_jxst.sales_contract sc
+                LEFT JOIN bytesailing_mes.work_order wo ON wo.source_id = sc.id AND wo.del_flag = 0
+                LEFT JOIN bytesailing_mes.production_plan pp ON pp.work_order_id = wo.id AND pp.del_flag = 0
+                LEFT JOIN bytesailing_mes.production_task pt ON pt.production_plan_id = pp.id AND pt.del_flag = 0
+                LEFT JOIN bytesailing_mes.production_task_detail ptd ON ptd.production_task_id = pt.id AND ptd.del_flag = 0
+            WHERE
+                sc.del_flag = 0 and ptd.id = sw.business_id ), '' ) AS customerId
         FROM
             stock_wait_details swd
                 JOIN stock_wait sw ON swd.stock_wait_id = sw.id