更新打印

mes/src/main/java/com/ximai/mes/od/mapper/OdSalesOrderDetailMapper.java

 package com.ximai.mes.od.mapper;
 
 import com.ximai.mes.od.domain.OdSalesOrderDetail;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 
@@ -64,4 +66,6 @@ public interface OdSalesOrderDetailMapper {
     int deleteByOrderId(Long orderId);
 
     int deleteByOrderIds(String[] ids);
+
+    OdSalesOrderDetail getByOrderCodeAndproductId(@Param("orderCode") String orderCode, @Param("productId")Long productId);
 }

mes/src/main/java/com/ximai/mes/pro/domain/task/TaskProWorkorderPrintData.java

@@ -10,4 +10,9 @@ public class TaskProWorkorderPrintData extends ProWorkorder {
     private int size;
     private String date;
     private BigDecimal quantity;
+
+
+    private String poOrderNo;
+
+    private String clientItemNo;
 }

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskWorkunitServiceImpl.java

@@ -14,6 +14,8 @@ import com.ximai.mes.aspect.MethodExtendedProcesses;
 import com.ximai.mes.constant.*;
 import com.ximai.mes.md.mapper.MdWorkunitMapper;
 import com.ximai.mes.md.service.IMdWorkunitService;
+import com.ximai.mes.od.domain.OdSalesOrderDetail;
+import com.ximai.mes.od.mapper.OdSalesOrderDetailMapper;
 import com.ximai.mes.pro.domain.ProFeedback;
 import com.ximai.mes.pro.domain.proWorkOrder.ProWorkorder;
 import com.ximai.mes.pro.domain.task.*;
@@ -100,6 +102,8 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
     @Autowired
     private IProAllocationMaterialService proAllocationMaterialService;
 
+    @Autowired
+    private OdSalesOrderDetailMapper odSalesOrderDetailMapper;
     @Override
     public void updateProTaskWorkunitTimeAndWorkunit(ProTaskWorkunit proTaskWorkunit) {
         proTaskWorkunit.updateAction();
@@ -583,6 +587,13 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
                     taskProWorkorderPrintData.setSize(i++);
                     taskProWorkorderPrintData.setDate(simpleDateFormat.format(new Date()));
                     taskProWorkorderPrintData.setQuantity(taskBatchTasks.get(0).getQuantity());
+                    if(proWorkorder.getOrderCode() != null && proWorkorder.getProductId() != null){
+                        OdSalesOrderDetail odSalesOrderDetail =  odSalesOrderDetailMapper.getByOrderCodeAndproductId(proWorkorder.getOrderCode(),proWorkorder.getProductId());
+                        if(odSalesOrderDetail != null){
+                            taskProWorkorderPrintData.setClientItemNo(odSalesOrderDetail.getClientItemNo());
+                            taskProWorkorderPrintData.setPoOrderNo(odSalesOrderDetail.getPoOrderNo());
+                        }
+                    }
                 }
             }
             return printData;

mes/src/main/resources/mapper/od/OdSalesOrderDetailMapper.xml

@@ -102,6 +102,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectOdSalesOrderDetailVo"/>
         where t1.id = #{id}
     </select>
+    <select id="getByOrderCodeAndproductId" resultType="com.ximai.mes.od.domain.OdSalesOrderDetail">
+        select * from od_sales_order_detail where order_no = #{orderCode} and item_id = #{productId}
+    </select>
 
     <insert id="insertOdSalesOrderDetail" parameterType="OdSalesOrderDetail" useGeneratedKeys="true" keyProperty="id">
         insert into od_sales_order_detail