Merge remote-tracking branch 'origin/master'

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

@@ -59,6 +59,9 @@ public interface CallItemMapper extends BaseMapper<CallItem> {
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     List<CallItem> findIssueMatchCallItemList(@Param("site")String site, @Param("workOrder")String workOrder, @Param("blankingSize")String blankingSize, @Param("resource")String resource, @Param("item")String item);
 
+    // 查询叫料记录,根据发料情况，更新叫料数据
+    List<CallItem> findIssueMatchCallItemListPda(@Param("site")String site, @Param("workCenter")String workCenter, @Param("blankingSize")String blankingSize, @Param("resource")String resource, @Param("item")String item);
+
     //车间发料查询
     List<CallItem> finsIssueItemListToResource(IssueItemDto issueItemDto);
     List<CallItem> finsIssueItemListNoResource(IssueItemDto issueItemDto);

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

@@ -8,6 +8,7 @@ import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.util.ExceptionUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.dispatch.dto.IssueItemDto;
+import com.foreverwin.mesnac.dispatch.mapper.CallItemMapper;
 import com.foreverwin.mesnac.dispatch.model.CallItem;
 import com.foreverwin.mesnac.dispatch.model.IssueItem;
 import com.foreverwin.mesnac.dispatch.mapper.IssueItemMapper;
@@ -61,6 +62,8 @@ public class IssueItemServiceImpl extends ServiceImpl<IssueItemMapper, IssueItem
     @Autowired
     private CallItemService callItemService;
     @Autowired
+    private CallItemMapper callItemMapper;
+    @Autowired
     private ItemBatchService itemBatchService;
     @Autowired
     private InventoryService inventoryService;
@@ -151,6 +154,7 @@ public class IssueItemServiceImpl extends ServiceImpl<IssueItemMapper, IssueItem
         String materialType = itemModel.getMaterialType();
         Boolean oddments = jsonObject.getBoolean("oddments");
         String resource = jsonObject.getString("resource");
+        String workCenter = jsonObject.getString("workCenter");
         String workOrder = jsonObject.getString("workOrder");
         String blankingSize = jsonObject.getString("blankingSize");
 
@@ -257,7 +261,8 @@ public class IssueItemServiceImpl extends ServiceImpl<IssueItemMapper, IssueItem
 
                 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 //查询匹配的叫料记录
-                List<CallItem> list = callItemService.findIssueMatchCallItemList(site, workOrder, blankingSize, resource, item);
+//                List<CallItem> list = callItemService.findIssueMatchCallItemList(site, workOrder, blankingSize, resource, item);
+                List<CallItem> list = callItemMapper.findIssueMatchCallItemListPda(site,workCenter,null,resource,item);
                 if (list == null || list.size() <= 0) {
                     throw BusinessException.build("未找到当前物料对应的叫料记录！");
                 }

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

@@ -881,6 +881,28 @@
         ORDER BY B.REQUIRED_DATE_TIME
     </select>
 
+    <!--查询叫料记录-->
+    <select id="findIssueMatchCallItemListPda" resultMap="FullResultMap">
+        SELECT B.HANDLE, B.SITE, B.CALL_ITEM_NO, B.SHOP_ORDER, B.SFC, B.RESRCE, B.REQUIRED_QTY, NVL(B.ISSUE_QTY,0) ISSUE_QTY, B.REQUIRED_DATE_TIME, B.STATUS,
+        P.WORK_CENTER
+        FROM Z_CALL_ITEM B
+        INNER JOIN Z_SFC_DISPATCH P ON B.SFC_DISPATCH_BO = P.HANDLE
+        LEFT JOIN WORK_CENTER wc ON WC.WORK_CENTER = P.WORK_CENTER
+        INNER JOIN ITEM M ON B.COMPONENT_BO = M.HANDLE
+        WHERE B.SITE = #{site} AND M.ITEM = #{item} AND B.STATUS = '802' AND CALL_TYPE = 'MATERIAL'
+        AND (B.ISSUE_QTY IS NULL OR B.ISSUE_QTY &lt; B.REQUIRED_QTY)
+        <if test="blankingSize != null and blankingSize != ''">
+            AND P.BLANKING_SIZE = #{blankingSize}
+        </if>
+        <if test="workCenter != null and workCenter != ''">
+            AND WC.WORK_CENTER = #{workCenter}
+        </if>
+        <if test="resource != null and resource != ''">
+            AND B.RESRCE = #{resource}
+        </if>
+        ORDER BY B.REQUIRED_DATE_TIME
+    </select>
+
     <select id="finsIssueItemListToResource" resultMap="FullResultMap">
         SELECT VIP.SITE, VIP.WORK_ORDER, VIP.CALL_TYPE, VIP.ITEM_GROUP, VIP.ITEM_BO, VIP.ITEM, VIP.ITEM_DESCRIPTION, VIP.REQUIRED_QTY, VIP.BLANKING_SIZE, VIP.RESRCE, VIP.RESOURCE_DESCRIPTION, SIP.SOURCE_RESOURCE
         FROM (

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

@@ -610,7 +610,7 @@
                     <if test="ew.entity.workCenter!=null"> AND WORK_CENTER=#{ew.entity.workCenter}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
                     <if test="ew.entity.employee!=null"> AND EMPLOYEE=#{ew.entity.employee}</if>
-                    <if test="et.entity.employeeDescription!=null">EMPLOYEE_DESCRIPTION=#{et.entity.employeeDescription},</if>
+                    <if test="ew.entity.employeeDescription!=null">EMPLOYEE_DESCRIPTION=#{et.entity.employeeDescription},</if>
                     <if test="ew.entity.turnOperation!=null"> AND TURN_OPERATION=#{ew.entity.turnOperation}</if>
                     <if test="ew.entity.dispatchQty!=null"> AND DISPATCH_QTY=#{ew.entity.dispatchQty}</if>
                     <if test="ew.entity.prodHours!=null"> AND PROD_HOURS=#{ew.entity.prodHours}</if>
@@ -758,7 +758,7 @@
         ) WIP
         LEFT JOIN Z_SFC_DISPATCH V1 ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ
         LEFT JOIN Z_SFC_DISPATCH V2 ON V2.SITE = WIP.SITE AND V2.SFC = WIP.SFC AND V2.DISPATCH_SEQ = WIP.AFTER_SEQ
-        ORDER BY WIP.SFC, TO_NUMBER(WIP.DISPATCH_SEQ)
+        ORDER BY WIP.SHOP_ORDER
     </select>
 
     <update id="updateSfcDispatchStatus" >