车间发料PDA新增材质、规格模糊查询，展示列新增需求件数

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java

@@ -294,7 +294,7 @@ public class CallItemController {
      */
     @ResponseBody
     @GetMapping("/findIssueItemListPda")
-    public R findIssueItemListPda(String workCenter, String resource, String item,String requiredFromDate, String requiredToDate, Boolean matchResource) {
+    public R findIssueItemListPda(String workCenter, String resource, String item,String spec,String texture,String requiredFromDate, String requiredToDate, Boolean matchResource) {
         List<CallItem> result;
         try {
             String site = CommonMethods.getSite();
@@ -306,6 +306,8 @@ public class CallItemController {
             issueItemDto.setWorkCenter(workCenter);
             issueItemDto.setMatchResource(matchResource);
             issueItemDto.setItem(item);
+            issueItemDto.setSpec(spec);
+            issueItemDto.setTexture(texture);
             if (StringUtil.notBlank(requiredFromDate)) {
                 issueItemDto.setRequiredFromDT(LocalDate.parse(requiredFromDate, DateTimeFormatter.ISO_DATE));
             }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java

@@ -15,6 +15,8 @@ public class IssueItemDto implements Serializable {
     private Boolean matchResource;
     private LocalDate requiredFromDT;
     private LocalDate requiredToDT;
+    private String spec;
+    private String texture;
 
     public String getSite() {
         return site;
@@ -95,4 +97,20 @@ public class IssueItemDto implements Serializable {
     public void setRequiredToDT(LocalDate requiredToDT) {
         this.requiredToDT = requiredToDT;
     }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getTexture() {
+        return texture;
+    }
+
+    public void setTexture(String texture) {
+        this.texture = texture;
+    }
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java

@@ -453,6 +453,8 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
             String component = callItem.getItem();
             String itemGroup = callItem.getItemGroup();
             BigDecimal reqQty = callItem.getDispatchQty();
+            // 需求件数
+            callItem.setDispatchQty(reqQty);
             String blankingSize =  callItem.getBlankingSize();
 
             if (StringUtil.isBlank(blankingSize)) {

dispatch/src/main/resources/mapper/CallItemMapper.xml

@@ -1032,6 +1032,8 @@
         LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh'
         LEFT JOIN ITEM I ON I.HANDLE = ZCI.COMPONENT_BO
         LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = 'zh'
+        LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = I.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC'
+        LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = I.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE'
         LEFT JOIN ITEM_GROUP_MEMBER IGM ON IGM.ITEM_BO = ZCI.COMPONENT_BO
         LEFT JOIN ITEM_GROUP IG ON IG.HANDLE = IGM.ITEM_GROUP_BO
         WHERE ZCI.CALL_TYPE = 'MATERIAL' AND ZCI.STATUS = '802' AND ZCI.SITE = #{site}
@@ -1050,6 +1052,12 @@
         <if test="requiredToDT != null">
             AND ZCI.REQUIRED_DATE_TIME &lt;= #{requiredToDT}
         </if>
+        <if test="spec != null and spec != ''">
+            AND CFA.VALUE LIKE '%' || #{spec} || '%'
+        </if>
+        <if test="texture != null and texture != ''">
+            AND CFB.VALUE LIKE '%' || #{texture} || '%'
+        </if>
         GROUP BY  ZCI.COMPONENT_BO ,ZSD.WORK_CENTER ,WCT.DESCRIPTION ,I.ITEM ,IT.DESCRIPTION ,ZSD.BLANKING_SIZE ,IG.ITEM_GROUP
         ORDER BY ZCI.COMPONENT_BO
     </select>
@@ -1065,6 +1073,8 @@
         LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh'
         LEFT JOIN ITEM I ON I.HANDLE = ZCI.COMPONENT_BO
         LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = 'zh'
+        LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = I.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC'
+        LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = I.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE'
         LEFT JOIN ITEM_GROUP_MEMBER IGM ON IGM.ITEM_BO = ZCI.COMPONENT_BO
         LEFT JOIN ITEM_GROUP IG ON IG.HANDLE = IGM.ITEM_GROUP_BO
         LEFT JOIN RESRCE R ON R.RESRCE = ZCI.RESRCE AND R.SITE = ZCI.SITE
@@ -1084,6 +1094,12 @@
         <if test="requiredToDT != null">
             AND ZCI.REQUIRED_DATE_TIME &lt;= #{requiredToDT}
         </if>
+        <if test="spec != null and spec != ''">
+            AND CFA.VALUE LIKE '%' || #{spec} || '%'
+        </if>
+        <if test="texture != null and texture != ''">
+            AND CFB.VALUE LIKE '%' || #{texture} || '%'
+        </if>
         GROUP BY  ZCI.COMPONENT_BO ,ZSD.WORK_CENTER ,WCT.DESCRIPTION ,I.ITEM ,IT.DESCRIPTION ,ZSD.BLANKING_SIZE ,IG.ITEM_GROUP , ZCI.RESRCE, R.DESCRIPTION
         ORDER BY ZCI.COMPONENT_BO
     </select>