更新查询

mes/src/main/java/com/ximai/mes/pro/controller/ProFeedbackController.java

@@ -78,7 +78,8 @@ public class ProFeedbackController extends BaseController {
                 proFeedback.getOrderCode());
         query.like(StringUtils.isNotEmpty(proFeedback.getOrderSerial()), "wo.order_serial",
                 proFeedback.getOrderSerial());
-
+        query.like(StringUtils.isNotEmpty(proFeedback.getCustomerDrawingNo()), "wo.Customer_Drawing_No",
+                proFeedback.getCustomerDrawingNo());
         query.eq(proFeedback.getLastFeedback() != null , "f.Last_Feedback", proFeedback.getLastFeedback());
 //        query.eq(StringUtils.isNotEmpty(proFeedback.getUserId()), "pww.user_id", proFeedback.getUserId());
         query.eq(StringUtils.isNotEmpty(proFeedback.getWorkunitId()), "tw.workunit_id", proFeedback.getWorkunitId());

mes/src/main/java/com/ximai/mes/pro/domain/ProFeedback.java

@@ -360,6 +360,9 @@ public class ProFeedback extends BaseEntity {
     @ApiModelProperty("订单单号序号")
     @TableField(exist = false)
     private String orderSerial;
+    @ApiModelProperty("产品图号")
+    @TableField(exist = false)
+    private String customerDrawingNo;
     public void initValue(ProWorkorder workorder, ProTaskWorkunit proTaskWorkunit) {
         this.setWorkorderCode(workorder.getWorkorderCode());
         this.setWorkorderName(workorder.getWorkorderName());

mes/src/main/java/com/ximai/mes/pro/domain/productionSolution/ProProductionSolution.java

@@ -210,4 +210,6 @@ public class ProProductionSolution extends BaseEntity {
     private String filePath;
     @ApiModelProperty("主档文件名称")
     private String originalFilename;
+    @ApiModelProperty("产品图号")
+    private String customerDrawingNo;
 }

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

@@ -205,6 +205,9 @@ public class ProTaskWorkunit extends BaseEntity {
     private BigDecimal quantityWait;
 
     private int percent;
+    @ApiModelProperty("客户图号")
+    @TableField(exist = false)
+    private String customerDrawingNo;
 
 
     @ApiModelProperty("订单单号")

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProFeedbackVo.java

 package com.ximai.mes.pro.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ximai.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -290,4 +291,8 @@ public class ProFeedbackVo {
     private String abnormalReason;
     /** 异常原因 备注*/
     private String abnormalRemark;
+
+    @ApiModelProperty("产品图号")
+    @TableField(exist = false)
+    private String customerDrawingNo;
 }

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProWorkorderQuery.java

@@ -233,7 +233,9 @@ public class ProWorkorderQuery extends BaseEntity {
     private String orderSerial;
     @ApiModelProperty("项目号")
     private String customerProjectNo;
-
+    @ApiModelProperty("产品图号")
+    @TableField(exist = false)
+    private String customerDrawingNo;
     @TableField(exist = false)
     private List<Long> workorderIds;
 

mes/src/main/java/com/ximai/mes/pro/domain/vo/task/ProTaskWorkunitQuery.java

@@ -98,6 +98,8 @@ public class ProTaskWorkunitQuery extends BaseEntity {
     @ApiModelProperty("是否委外,1:是，0:否")
     private Integer outsourced;
 
+    @ApiModelProperty("客户图号")
+    private String customerDrawingNo;
 
     private String taskBatch;
 }

mes/src/main/java/com/ximai/mes/pro/dto/ProFeedbackCheckListDto.java

 package com.ximai.mes.pro.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ximai.mes.pro.domain.ProFeedback;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,4 +13,7 @@ public class ProFeedbackCheckListDto extends ProFeedback {
 
     @ApiModelProperty("订单单号序号")
     private String orderSerial;
+    @ApiModelProperty("产品图号")
+    @TableField(exist = false)
+    private String customerDrawingNo;
 }

mes/src/main/java/com/ximai/mes/pro/mapper/proWorkOrder/ProWorkorderMapper.java

@@ -63,7 +63,7 @@ public interface ProWorkorderMapper extends BaseMapper<ProWorkorder> {
     List<ProWorkorder> selectProWorkorderJoinTask(@Param("ew") QueryWrapper<ProWorkorder> query);
 
 
-    @Select(value = "select t1.*,t2.item_type_name,t2.item_type_id from pro_workorder t1 left join md_item t2 on t1.product_id = t2.item_id\n" +
+    @Select(value = "select t1.*,t2.item_type_name,t2.item_type_id,t2.customer_Drawing_No from pro_workorder t1 left join md_item t2 on t1.product_id = t2.item_id\n" +
             "${ew.customSqlSegment}")
     List<ProWorkorder> selectListByQw(@Param("ew") QueryWrapper<ProWorkorder> query);
 

mes/src/main/java/com/ximai/mes/pro/mapper/task/ProTaskWorkunitMapper.java

@@ -147,7 +147,7 @@ public interface ProTaskWorkunitMapper extends BaseMapper<ProTaskWorkunit> {
     @Select(value = "select t.task_id, t.task_code, t.task_name, t.task_batch\n" +
             "\t, t.workstation_id, t.workstation_code, ws.workstation_name\n" +
             "\t, t.process_id, t.process_code, t.process_name\n" +
-            "\t, t.item_id, wo.product_code as item_code, wo.product_name as item_name,wo.customer_project_no,wo.order_code, t.specification, t.unit_of_measure\n" +
+            "\t, t.item_id, wo.product_code as item_code, wo.product_name as item_name,wo.customer_project_no,wo.customer_drawing_no,wo.order_code, t.specification, t.unit_of_measure\n" +
             "\t, ptw.task_workunit_id, ptw.quantity, ptw.create_by, t.quantity_wait, ptw.quantity_produced, ptw.quantity_changed\n" +
             "\t, t.client_id, t.client_code, t.client_name, t.client_nick, t.is_last_process, ptw.schedule_start_date\n" +
             "\t, t.duration, ptw.schedule_end_date, t.color_code, t.request_date\n" +

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

@@ -458,7 +458,8 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
                 proTaskWorkunit.getOrderCode());
         query.like(StringUtils.isNotEmpty(proTaskWorkunit.getOrderSerial()), "wo.order_serial",
                 proTaskWorkunit.getOrderSerial());
-
+        query.like(StringUtils.isNotEmpty(proTaskWorkunit.getCustomerProjectNo()), "wo.customer_drawing_no",
+                proTaskWorkunit.getCustomerProjectNo());
 
 
         query.gt("ptw.quantity",0);

mes/src/main/resources/mapper/pro/proWorkOrder/ProWorkorderMapper.xml

@@ -80,7 +80,8 @@
         select pw.*,
                pc.combination_code,
                pa.arrange_code,
-               md.item_type_name
+               md.item_type_name,
+               md.customer_Drawing_No
         from pro_workorder pw
                  left join pro_combination pc on pw.workorder_id = pc.workorder_id
                  left join pro_arrange pa on pw.workorder_id = pa.workorder_id
@@ -133,6 +134,7 @@
             <if test="customerProjectNo != null and customerProjectNo !=''">and pw.customer_project_no = #{customerProjectNo}</if>
             <if test="orderCode != null and orderCode !=''">and pw.order_code like '%${orderCode}%' </if>
             <if test="orderSerial != null and orderSerial !=''">and pw.order_serial = #{orderSerial}</if>
+            <if test="customerDrawingNo != null and customerDrawingNo !=''">and md.customer_Drawing_No like '%${customerDrawingNo}%'</if>
             <if test="statusArr != null">and pw.status in
                 <foreach item="status" collection="statusArr" open="(" separator="," close=")">
                     #{status}

mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionMapper.xml

@@ -76,7 +76,8 @@
                pps.surpass_state,
                pps.url,
                pps.file_path,
-               pps.original_filename
+               pps.original_filename,
+               mi.customer_Drawing_No
         from pro_production_solution pps
                  left join md_item mi on pps.item_id = mi.item_id
                  left join pro_route pr on pr.route_id = pps.route_id
@@ -105,6 +106,7 @@
             </if>
             <if test="routeId != null ">and pps.route_id = #{routeId}</if>
             <if test="usageId != null ">and pps.usage_id = #{usageId}</if>
+            <if test="customerDrawingNo != null ">and mi.customer_Drawing_No  like '%${customerDrawingNo}%'</if>
         </where>
     </select>