派工修改发布报错

common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java

@@ -174,6 +174,7 @@ public class SfcDispatchDto implements Serializable{
     private String isCompleted;
     private BigDecimal completedQty;
     private String userName;
+    private String resourceWorkCenter;
 
     private String status;
     private String locale;
@@ -584,6 +585,14 @@ public class SfcDispatchDto implements Serializable{
         this.userName = userName;
     }
 
+    public String getResourceWorkCenter() {
+        return resourceWorkCenter;
+    }
+
+    public void setResourceWorkCenter(String resourceWorkCenter) {
+        this.resourceWorkCenter = resourceWorkCenter;
+    }
+
     public String getLocale() {
         return locale;
     }

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

@@ -70,7 +70,7 @@ public class SfcDispatchController {
     @ResponseBody
     @GetMapping("getSfcDispatch")
     public R getSfcDispatch(String workCenter, String dispatchStatus, String item, String itemNumber, String workOrder, String shopOrder,
-                            String resrce, String resourceType, String operation, String sfc, String componentDescription, String turnOperation,
+                            String resrce, String resourceType, String operation, String sfc, String component, String componentDescription, String turnOperation,
                             String isDispatch, String startFromDate_S, String startToDate_S, String completeFromDate_S, String completeToDate_S) {
         List<ShopOrderRelease> list;
         try {
@@ -86,6 +86,7 @@ public class SfcDispatchController {
             shopOrderRelease.setResourceType(resourceType);
             shopOrderRelease.setOperation(operation);
             shopOrderRelease.setSfc(sfc);
+            shopOrderRelease.setComponent(component);
             shopOrderRelease.setComponentDescription(componentDescription);
             shopOrderRelease.setTurnOperation(turnOperation);
             shopOrderRelease.setIsDispatch(isDispatch);

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java

@@ -24,6 +24,12 @@ public interface SfcDispatchMapper extends BaseMapper<SfcDispatch> {
 
     List<SfcDispatch> findSfcDispatch(@Param("site") String site, @Param("sfc") String sfc, @Param("operation") String operation, @Param("stepId") String stepId);
 
+    /**
+     * 查询派工生产批次数据
+     *
+     * @param shopOrderRelease
+     * @return
+     */
     List<ShopOrderRelease> findSfcDispatchList(ShopOrderRelease shopOrderRelease);
 
     /**

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

@@ -1044,6 +1044,9 @@
             <if test="turnOperation != null and turnOperation != ''">
                 AND SD.TURN_OPERATION = #{turnOperation}
             </if>
+            <if test="component != null and component != ''">
+                AND CP.ITEM = #{component}
+            </if>
             <if test="componentDescription != null and componentDescription != ''">
                 AND CPT.DESCRIPTION LIKE '%' || #{componentDescription} || '%'
             </if>