Merge remote-tracking branch 'origin/master'

anomaly/src/main/resources/mapper/AbnormalBillMapper.xml

@@ -1014,6 +1014,6 @@
         SELECT * FROM Z_ABNORMAL_BILL zab
       	JOIN sfc s ON zab.SITE=s.SITE AND zab.SFC=s.SFC
       	JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO= ZAB.HANDLE
-      	WHERE zab.SITE=#{site} AND zab.STATUS='G' AND zab."TYPE"='Z'   AND s.QTY>1 AND (ZABD.ABNORMAL_METHOD='F' OR  ZABD.ABNORMAL_METHOD='C')   AND ZABD.ROUTER_BO IS NOT NULL ORDER BY  ZABD.CLOSED_DATE_TIME DESC
+      	WHERE zab.SITE=#{site} AND zab.STATUS='G' AND zab."TYPE"='Z'   AND s.QTY>1 AND (ZABD.ABNORMAL_METHOD='F'  OR  ZABD.ABNORMAL_METHOD='C')  ORDER BY  ZABD.CLOSED_DATE_TIME DESC
     </select>
 </mapper>

common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java

@@ -83,7 +83,7 @@ public class PrintLogServiceImpl extends ServiceImpl<PrintLogMapper, PrintLog> i
         JSONObject jsonObject = JSONObject.parseObject(post);
         Integer code = jsonObject.getInteger("code");
         String msg = jsonObject.getString("msg");
-        if (code == 500){
+        if (code != 0){
             throw BusinessException.build(msg);
         }
         // 更新打印记录：是否已打印、使用的打印机、打印次数

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

@@ -110,6 +110,30 @@ public class CallItemController {
         return R.ok(result);
     }
 
+    /**
+     * 查询叫料明细数据
+     *
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/findCallItemInfoList")
+    public R findCallItemInfoList(@RequestBody  CallItem callItem){
+        List<CallItem> result;
+        try {
+            callItem.setSite(CommonMethods.getSite());
+            if (callItem.getStartFromDate_S() != null) {
+                callItem.setStartFromDate(DateUtil.parse(callItem.getStartFromDate_S()));
+            }
+            if (callItem.getStartToDate_S() != null) {
+                callItem.setStartToDate(DateUtil.parse(callItem.getStartToDate_S()));
+            }
+            result = callItemService.findCallItemInfoList(callItem);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+        return R.ok(result);
+    }
+
     @ResponseBody
     @PostMapping("/callItem")
     public R callItem(@RequestBody List<CallItem> callItemList) {

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

@@ -34,6 +34,8 @@ public interface CallItemMapper extends BaseMapper<CallItem> {
 
     List<CallItem> findCallItemDetailList(CallItem callItem);
 
+    List<CallItem> findCallItemInfoList(CallItem callItem);
+
     List<CallItem> findCallItemDetailListByDispatchBo(@Param("site") String site, @Param("list") List<String> list);
 
     void updateCallItemStatusByDispatchBo(@Param("status") String status, @Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List<String> list);

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java

@@ -142,6 +142,8 @@ public class CallItem extends Model<CallItem> {
    @TableField(exist = false)
    private String component;
    @TableField(exist = false)
+   private String componentDescription;
+   @TableField(exist = false)
    private String itemDescription;
    @TableField(exist = false)
    private String materialType;
@@ -158,6 +160,8 @@ public class CallItem extends Model<CallItem> {
    @TableField(exist = false)
    private String workCenter;
    @TableField(exist = false)
+   private String workCenterDescription;
+   @TableField(exist = false)
    private String dispatchNo;
    @TableField(exist = false)
    private BigDecimal dispatchQty;
@@ -384,6 +388,14 @@ public class CallItem extends Model<CallItem> {
       this.component = component;
    }
 
+   public String getComponentDescription() {
+      return componentDescription;
+   }
+
+   public void setComponentDescription(String componentDescription) {
+      this.componentDescription = componentDescription;
+   }
+
    public String getItemDescription() {
       return itemDescription;
    }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java

@@ -58,6 +58,14 @@ public interface CallItemService extends IService<CallItem> {
      */
     List<CallItem> findCallItemDetailListByDispatchBo(String site, List<String> dispatchBoList);
 
+    /**
+     * 生产叫料PDA
+     *
+     * @param callItem
+     * @return
+     */
+    List<CallItem> findCallItemInfoList(CallItem callItem);
+
 
     /**
      * 叫料

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

@@ -134,6 +134,11 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
         return callItemMapper.findCallItemDetailListByDispatchBo(site, dispatchBoList);
     }
 
+    @Override
+    public List<CallItem> findCallItemInfoList(CallItem callItem) {
+        return callItemMapper.findCallItemInfoList(callItem);
+    }
+
     @Override
     public void callItem(String site, String user, List<CallItem> callItemList) {
         if (callItemList == null || callItemList.size() <= 0) {

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

@@ -969,4 +969,42 @@
         ON VIP.SITE = SIP.SITE AND VIP.ITEM_BO = SIP.ITEM_BO AND VIP.REQUIRED_QTY > 0
         ORDER BY VIP.WORK_ORDER, VIP.ITEM
     </select>
+
+    <select id="findCallItemInfoList" resultMap="FullResultMap">
+        SELECT  CI.RESRCE ,CF.VALUE SHOP_ORDER ,CI.REQUIRED_QTY , CI.STATUS AS CALL_STATUS,
+        B.BOM AS ITEM, B.DESCRIPTION ITEM_DESCRIPTION ,
+        SD.WORK_CENTER , WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION, SD.BLANKING_SIZE, SD.REMARK, SD.PLANNED_START_DATE,
+        I.ITEM AS ITEM_NO ,IT.DESCRIPTION AS COMPONENT_DESCRIPTION
+        FROM  Z_CALL_ITEM CI
+        LEFT JOIN SHOP_ORDER SO ON CI.SHOP_ORDER = SO.SHOP_ORDER
+        LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
+        INNER JOIN BOM_COMPONENT BC ON CI.COMPONENT_BO = BC.COMPONENT_GBO
+        LEFT JOIN BOM B ON BC.BOM_BO = B.HANDLE
+        INNER JOIN Z_SFC_DISPATCH SD ON CI.SFC_DISPATCH_BO = SD.HANDLE
+        LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = SD.WORK_CENTER
+        LEFT JOIN WORK_CENTER_T WCT ON WC.HANDLE = WCT.WORK_CENTER_BO
+        LEFT JOIN ITEM I ON CI.COMPONENT_BO = I.HANDLE
+        LEFT JOIN ITEM_T IT ON I.HANDLE = IT.ITEM_BO
+        WHERE CI.SITE = #{site}
+        <if test="workCenter != null and workCenter != ''">
+            AND SD.WORK_CENTER = #{workCenter}
+        </if>
+        <if test="resrce != null and resrce != ''">
+            AND CI.RESRCE = #{resrce}
+        </if>
+        <if test="component != null and component != ''">
+            AND I.ITEM = #{component}
+        </if>
+        <if test="status != null and status != ''">
+            AND CI.STATUS = #{status}
+        </if>
+        <if test="startFromDate_S != null">
+            AND SD.PLANNED_START_DATE >= #{startFromDate_S}
+        </if>
+        <if test="startToDate_S != null">
+            AND SD.PLANNED_START_DATE &lt;= #{startToDate_S}
+        </if>
+        ORDER BY CF.VALUE ,CI.RESRCE, I.ITEM
+    </select>
+
 </mapper>

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

@@ -34,7 +34,7 @@
             FROM SHOP_ORDER SO
             INNER JOIN ITEM IM ON SO.PLANNED_ITEM_BO = IM.HANDLE
             INNER JOIN STATUS ST ON SO.STATUS_BO = ST.HANDLE AND ST.STATUS_GROUP = 'ORDERS'
-            INNER JOIN ROUTER RT ON SO.PLANNED_ROUTER_BO = RT.HANDLE OR SO.PLANNED_ROUTER_BO = 'RouterBO:'||RT.SITE||','||RT.ROUTER||','||RT.ROUTER_TYPE||',#'
+            INNER JOIN ROUTER RT ON SO.PLANNED_ROUTER_BO = RT.HANDLE OR (SO.PLANNED_ROUTER_BO = 'RouterBO:'||RT.SITE||','||RT.ROUTER||','||RT.ROUTER_TYPE||',#' AND RT.CURRENT_REVISION = 'true')
             INNER JOIN ROUTER_OPERATION RO ON RT.ENTRY_ROUTER_STEP_BO = RO.ROUTER_STEP_BO
             INNER JOIN OPERATION OP ON SO.SITE = OP.SITE AND SPLIT(RO.OPERATION_BO,2) = OP.OPERATION AND OP.CURRENT_REVISION = 'true'
             LEFT JOIN (

production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java

@@ -177,15 +177,12 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
         SplitSfcDto splitSfcDto=splitSfcMapper.getAbnormalQty(site,sfc,operation, abnormalNo);
         String routerBo = splitSfcDto.getRouterBo();
         String ncCode = splitSfcDto.getNcCode();
-        if (StringUtil.isBlank(routerBo)){
-            throw new BaseException("异常处置未选择处置工艺路线");
-        }
         if (StringUtil.isBlank(ncCode)){
             throw new BaseException("异常处置未选择不良代码");
         }
         BigDecimal sfcQty = new BigDecimal(sfcData.getQty());
         if (new BigDecimal(splitSfcDto.getNcQty()).compareTo(sfcQty)>=0){
-            throw new BaseException("质量异常数量不小于于产品条码的数量，不能拆分");
+            throw new BaseException("质量异常数量大于等于于产品条码的数量，不能拆分");
         }
         if (splitQty.compareTo(new BigDecimal(splitSfcDto.getNcQty()))>0){
             throw new BaseException("拆分数量大于质量异常数量的数量，不能拆分");
@@ -206,6 +203,9 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
             Collection<SplitSfcResponse> splitSfcResponses = splitService.splitSfc(splitSfcRequest);
             SplitSfcResponse splitSfcResponse = splitSfcResponses.iterator().next();
             String newSfcRef = splitSfcResponse.getNewSfcRef();
+            String newSfc = StringUtil.trimHandle(newSfcRef);
+
+            if(StringUtil.notBlank(routerBo)){
                 //记录不合格
                 CreateNCRequest createNCRequest=new CreateNCRequest();
                 createNCRequest.setQty(splitQty);
@@ -235,8 +235,10 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
                 dispositionSfcsRequest.setDispositionSelection(dispositionSelection);
                 dispositionSfcsRequest.setProdCtx(new ProductionContext());
                 ncProductionService.dispositionMultipleSfcs(dispositionSfcsRequest);
+                String workCenterBo = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, sfcData.getShopOrder())).getPlannedWorkCenterBo();
+                sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),newSfc, sfcData.getShopOrder(),maxRevisionRouter.getHandle());
+            }
             SplitSfc splitSfc=new SplitSfc();
-            String newSfc = StringUtil.trimHandle(newSfcRef);
             splitSfc.setHandle(HandleEnum.SPLIT_SFC.getHandle(site,newSfc));
             splitSfc.setSite(site);
             splitSfc.setSfc(sfc);
@@ -246,8 +248,6 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
             splitSfc.setCreateUser(CommonMethods.getUser());
             splitSfc.setCreatedDateTime(LocalDateTime.now());
             save(splitSfc);
-            String workCenterBo = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, sfcData.getShopOrder())).getPlannedWorkCenterBo();
-            sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),newSfc, sfcData.getShopOrder(),maxRevisionRouter.getHandle());
             return splitSfc;
         } catch (Exception e) {
             ExceptionUtil.throwException(e);

quality/src/main/resources/mapper/SelfReportMapper.xml

@@ -153,9 +153,10 @@
         </if>
     </select>
     <select id="selectListByCondition" resultMap="BaseResultMap">
-        SELECT ZSR.HANDLE, ZSR.SITE, ZSR.TASK_NO, ZSR.WORK_CENTER, ZSR.SHOP_ORDER, ZSR.ITEM, ZSR.OP_STEP, ZSR.RESRCE, ZSR.SFC, ZSR.NC_CODE, ZSR.NC_QTY, ZSR.LOCATION, ZSR.STATE, ZSR.REMARK, ZSR.CREATE_USER,ZSR. CREATED_DATE_TIME,IT.DESCRIPTION FROM Z_SELF_REPORT ZSR
+        SELECT ZSR.HANDLE, ZSR.SITE, ZSR.TASK_NO, ZSR.WORK_CENTER, ZSR.SHOP_ORDER, ZSR.ITEM, ZSR.OP_STEP, ZSR.RESRCE, ZSR.SFC, ZSR.NC_CODE, ZSR.NC_QTY, ZSR.LOCATION, ZSR.STATE, ZSR.REMARK, B.FULL_NAME CREATE_USER,ZSR. CREATED_DATE_TIME,IT.DESCRIPTION FROM Z_SELF_REPORT ZSR
         JOIN ITEM I ON I.ITEM = ZSR.ITEM AND I.CURRENT_REVISION='true'
         LEFT JOIN ITEM_T IT ON I.HANDLE = IT.ITEM_BO AND IT.LOCALE = #{locale}
+        LEFT JOIN Z_NWA_USER B ON ZSR.SITE = B.SITE AND ZSR.CREATE_USER = B.USER_NAME
         <where>
             <if test="ew!=null">
                 <if test="ew.entity!=null">