更新查询

mes/src/main/java/com/ximai/mes/md/controller/MdWorkunitWorkerController.java

@@ -113,15 +113,16 @@ public class MdWorkunitWorkerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('md:worker:add')")
     @Log(title = "岗位资源", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody MdWorkunitWorker mdWorkunitWorker) {
-        QueryWrapper<MdWorkunitWorker> proWorkorderQueryWrapper = new QueryWrapper<>();
-        proWorkorderQueryWrapper.eq("t1.user_id", mdWorkunitWorker.getUserId());
-        proWorkorderQueryWrapper.eq("t1.workunit_id", mdWorkunitWorker.getWorkunitId());
-        List<MdWorkunitWorker> mdWorkunitWorkers = mdWorkunitWorkerMapper.selectListByQw(proWorkorderQueryWrapper);
-        ExceptionUtil.checkTrueThrowException(CollectionUtil.isNotEmpty(mdWorkunitWorkers), MessageUtils.message("md.workUnit.error.repeat.bind"));
-
-        int rows = mdWorkunitWorkerService.insertObj(mdWorkunitWorker);
-        return toAjax(rows);
+    public AjaxResult add(@RequestBody List<MdWorkunitWorker> mdWorkunitWorkerData) {
+        for (MdWorkunitWorker mdWorkunitWorker : mdWorkunitWorkerData){
+            QueryWrapper<MdWorkunitWorker> proWorkorderQueryWrapper = new QueryWrapper<>();
+            proWorkorderQueryWrapper.eq("t1.user_id", mdWorkunitWorker.getUserId());
+            proWorkorderQueryWrapper.eq("t1.workunit_id", mdWorkunitWorker.getWorkunitId());
+            List<MdWorkunitWorker> mdWorkunitWorkers = mdWorkunitWorkerMapper.selectListByQw(proWorkorderQueryWrapper);
+            ExceptionUtil.checkTrueThrowException(CollectionUtil.isNotEmpty(mdWorkunitWorkers), MessageUtils.message("md.workUnit.error.repeat.bind"));
+            int rows = mdWorkunitWorkerService.insertObj(mdWorkunitWorker);
+        }
+        return toAjax(mdWorkunitWorkerData.size());
     }
 
     /**

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

@@ -73,6 +73,12 @@ public class ProFeedbackController extends BaseController {
         query.eq(StringUtils.isNotEmpty(proFeedback.getItemName()), "it.item_name", proFeedback.getItemName());
         query.eq(StringUtils.isNotEmpty(proFeedback.getWorkorderCode()), "f.workorder_code", proFeedback.getWorkorderCode());
         query.eq(StringUtils.isNotEmpty(proFeedback.getSapItemCode()), "it.sap_item_code", proFeedback.getSapItemCode());
+
+        query.like(StringUtils.isNotEmpty(proFeedback.getOrderCode()), "wo.order_code",
+                proFeedback.getOrderCode());
+        query.like(StringUtils.isNotEmpty(proFeedback.getOrderSerial()), "wo.order_serial",
+                proFeedback.getOrderSerial());
+
         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

@@ -353,7 +353,13 @@ public class ProFeedback extends BaseEntity {
     @ApiModelProperty(  "是否最后一次报工")
     private Boolean lastFeedback;
 
+    @ApiModelProperty("订单单号")
+    @TableField(exist = false)
+    private String orderCode;
 
+    @ApiModelProperty("订单单号序号")
+    @TableField(exist = false)
+    private String orderSerial;
     public void initValue(ProWorkorder workorder, ProTaskWorkunit proTaskWorkunit) {
         this.setWorkorderCode(workorder.getWorkorderCode());
         this.setWorkorderName(workorder.getWorkorderName());

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

@@ -42,6 +42,8 @@ public class ProTaskWorkunitQuery extends BaseEntity {
     @ApiModelProperty("产品物料编码")
     private String itemCode;
 
+    @ApiModelProperty("产品物料编码")
+    private String productCode;
     @ApiModelProperty("产品物料名称")
     private String itemName;
 
@@ -88,6 +90,9 @@ public class ProTaskWorkunitQuery extends BaseEntity {
     private String workorderCode;
     @ApiModelProperty("订单单号")
     private String orderCode;
+
+    @ApiModelProperty("订单单号序号")
+    private String orderSerial;
     @ApiModelProperty("项目号")
     private String customerProjectNo;
     @ApiModelProperty("是否委外,1:是，0:否")

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

 package com.ximai.mes.pro.dto;
 
 import com.ximai.mes.pro.domain.ProFeedback;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ProFeedbackCheckListDto extends ProFeedback {
     Boolean isCheckUser = false;
+    @ApiModelProperty("订单单号")
+    private String orderCode;
+
+    @ApiModelProperty("订单单号序号")
+    private String orderSerial;
 }

mes/src/main/java/com/ximai/mes/pro/mapper/ProFeedbackMapper.java

@@ -62,6 +62,7 @@ public interface ProFeedbackMapper {
             "\tLEFT JOIN md_workunit wu ON wu.workunit_id = tw.workunit_id\n" +
             "\tLEFT JOIN md_item it ON it.item_id = f.item_id \n" +
             "\tLEFT JOIN pro_task ta  ON ta.task_id = f.task_id \n" +
+            "\tLEFT JOIN pro_workorder workorder  ON workorder.workorder_id = f.workorder_id \n" +
             "${ew.customSqlSegment}")
     List<ProFeedbackVo> queryProFeedbackListJoinTaskWorkUnit(@Param("ew") QueryWrapper<ProFeedback> query);
 

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

@@ -451,6 +451,16 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
         query.eq(StringUtils.isNotEmpty(proTaskWorkunit.getCustomerProjectNo()), "wo.customer_project_no", proTaskWorkunit.getCustomerProjectNo());
         query.eq(StringUtils.isNotEmpty(proTaskWorkunit.getOrderCode()), "wo.order_code", proTaskWorkunit.getOrderCode());
         query.eq(StringUtils.isNotEmpty(proTaskWorkunit.getTaskBatch()), "SUBSTRING_INDEX(t.task_batch, '-', -1)", proTaskWorkunit.getTaskBatch());
+
+        query.like(StringUtils.isNotEmpty(proTaskWorkunit.getProductCode()), "wo.product_code",
+                proTaskWorkunit.getProductCode());
+        query.like(StringUtils.isNotEmpty(proTaskWorkunit.getOrderCode()), "wo.order_code",
+                proTaskWorkunit.getOrderCode());
+        query.like(StringUtils.isNotEmpty(proTaskWorkunit.getOrderSerial()), "wo.order_serial",
+                proTaskWorkunit.getOrderSerial());
+
+
+
         query.gt("ptw.quantity",0);
         query.orderByAsc("schedule_start_date");
         List<ProTaskWorkunit> list = proTaskWorkunitService.selectTaskWorkUnitJoinTask(query);

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

@@ -101,7 +101,7 @@
             <if test="orderSource != null  and orderSource != ''">and pw.order_source = #{orderSource}</if>
             <if test="sourceCode != null  and sourceCode != ''">and pw.source_code = #{sourceCode}</if>
             <if test="productId != null ">and pw.product_id = #{productId}</if>
-            <if test="productCode != null  and productCode != ''">and pw.product_code = #{productCode}</if>
+            <if test="productCode != null  and productCode != ''">and pw.product_code like  '%${productCode}%'</if>
             <if test="productName != null  and productName != ''">and pw.product_name like concat('%', #{productName},
                 '%')
             </if>
@@ -131,6 +131,7 @@
             <if test="status != null  and status != ''">and pw.status = #{status}</if>
             <if test="arrangeCode != null and arrangeCode !=''">and pw.arrange_code = #{arrangeCode}</if>
             <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="statusArr != null">and pw.status in
                 <foreach item="status" collection="statusArr" open="(" separator="," close=")">