From 4757cf4ded692c56ef710a0a6b2c02f191fe906a Mon Sep 17 00:00:00 2001
From: limy135302065 <1353020654@qq.com>
Date: Fri, 10 Dec 2021 10:31:46 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8A=A5=E5=BA=9F=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=95=B4=E7=90=86=E4=B8=8B=E8=BE=BE=20=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=91=98=E9=9D=A2=E6=9D=BF=EF=BC=88=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=9D=A1=E7=A0=81=E9=80=89=E6=8B=A9=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=97=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AbnormalBillController.java    |  6 ++-
 .../anomaly/mapper/AbnormalBillMapper.java    |  1 +
 .../anomaly/service/AbnormalBillService.java  |  1 +
 .../service/impl/AbnormalBillServiceImpl.java |  6 +++
 .../resources/mapper/AbnormalBillMapper.xml   |  5 ++
 .../ShopOrderReleaseController.java           | 15 ++++--
 .../service/ShopOrderReleaseService.java      |  2 +-
 .../impl/ShopOrderReleaseServiceImpl.java     | 54 +++++++++++++++----
 .../mapper/ShopOrderReleaseMapper.xml         |  1 +
 .../foreverwin/mesnac/meapi/dto/SfcDto.java   | 10 ++++
 meapi/src/main/resources/mapper/SfcMapper.xml | 19 +++++--
 11 files changed, 100 insertions(+), 20 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index 3c4bcbfc..8aeddedb 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -185,7 +185,11 @@ public class AbnormalBillController {
         result = abnormalBillService.getQCAbnormal();
         return R.ok(result);
     }
-
+    @GetMapping("getAbnormalSFCPage")
+    public R getAbnormalSFCPage(FrontPage frontPage,@RequestParam(required =  false) Map paramMap){
+        String globalQuery = frontPage.getGlobalQuery();
+        return R.ok(abnormalBillService.getAbnormalSFCPage(frontPage.getPagePlus(),paramMap,globalQuery));
+    }
     @GetMapping("getAbnormalByConditionalPage")
     public R getAbnormalByConditionalPage(FrontPage frontPage,@RequestParam(required =  false) Map paramMap){
         String globalQuery = frontPage.getGlobalQuery();
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
index 85d71a20..1783104f 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
@@ -46,5 +46,6 @@ public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
 
     IPage getAbnormalByConditional(IPage page, @Param("paramMap")Map<String,String> paramMap,@Param("keyword")String keyword);
 
+    IPage getAbnormalSFCPage(IPage page, @Param("paramMap")Map<String,String> paramMap,@Param("keyword")String keyword);
     Map<String,String> findReplaceMessageByAbnormal(@Param("abnormalBill")AbnormalBill abnormalBill);
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
index f3a377b4..0d3240e0 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
@@ -145,6 +145,7 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
 
     IPage getAbnormalByConditionalPage(IPage page,Map paramMap,String keyword);
 
+    IPage getAbnormalSFCPage(IPage page,Map paramMap,String keyword);
     /**
      * @param sfcDto 以下是传递的参数
      * sfc
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 6f8fc050..357de2a7 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -1348,6 +1348,12 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         return abnormalBillMapper.getAbnormalByConditional(page,paramMap,keyword);
     }
 
+    @Override
+    public IPage getAbnormalSFCPage(IPage page, Map paramMap, String keyword) {
+        paramMap.put("site",CommonMethods.getSite());
+        return abnormalBillMapper.getAbnormalSFCPage(page,paramMap,keyword);
+    }
+
     /**
      * @param sfcDto 以下是传递的参数
      * sfc
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 6f39e4eb..0ca0be65 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -1262,6 +1262,11 @@
         ORDER BY zab.CREATED_DATE_TIME DESC
     </select>
 
+    <select id="getAbnormalSFCPage" resultMap="BaseResultMap">
+        SELECT ZAB.SFC,ZAB.ITEM_BO,ZAB.SHOP_ORDER,ZAB.NC_QTY FROM Z_ABNORMAL_BILL ZAB
+        LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE = ZABD.ABNORMAL_BILL_BO
+        WHERE ZABD.ABNORMAL_METHOD='C' AND ZAB.SFC IS NOT NULL
+    </select>
     <select id="findReplaceMessageByAbnormal" resultType="java.util.HashMap">
         SELECT wct.DESCRIPTION WORKCENTER,so.SHOP_ORDER SHOPORDER ,
                it.DESCRIPTION ITEM,
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java
index 2322b91b..6c929883 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java
@@ -97,16 +97,25 @@ public class ShopOrderReleaseController {
     @ResponseBody
     @PostMapping("shopOrderRelease")
     public R shopOrderRelease(@RequestBody List<ShopOrderRelease> shopOrderList) {
-
+        Boolean flag;
+        StringBuffer message = new StringBuffer();
         try {
             String site = CommonMethods.getSite();
             String user = CommonMethods.getUser();
-            shopOrderReleaseService.shopOrderRelease(site, user, shopOrderList);
+            flag=shopOrderReleaseService.shopOrderRelease(site, user, message, shopOrderList);
         } catch (Exception e) {
             return R.failed(e.getMessage());
         }
 
-        return R.ok();
+        if (flag) {
+            message.insert(0, "工单下达成功");
+            return R.ok(message.toString());
+        } else {
+            message.insert(0, "工单下达失败：");
+            return R.failed(message.toString());
+        }
+
+//        return R.ok();
     }
 
 
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ShopOrderReleaseService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ShopOrderReleaseService.java
index 421170ea..d28a02af 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ShopOrderReleaseService.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ShopOrderReleaseService.java
@@ -62,7 +62,7 @@ public interface ShopOrderReleaseService {
      * @param user
      * @param shopOrderList
      */
-    void shopOrderRelease(String site, String user, List<ShopOrderRelease> shopOrderList);
+    boolean shopOrderRelease(String site, String user,StringBuffer message, List<ShopOrderRelease> shopOrderList);
 
     /**
      * 工单整理- 刷新派工单
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
index 5b7a976b..3f07cda5 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
@@ -130,12 +130,10 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
     }
 
     @Override
-    public void shopOrderRelease(String site, String user, List<ShopOrderRelease> shopOrderList) {
+    public boolean shopOrderRelease(String site, String user,StringBuffer message, List<ShopOrderRelease> shopOrderList) {
         if (shopOrderList == null || shopOrderList.size() <= 0) {
             throw new BaseException("请至少选择一笔需要下达的工单");
         }
-
-
         //工单标准服务
         ShopOrderServiceInterface shopOrderServiceInterface = null;
         try {
@@ -143,14 +141,19 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
         } catch (ClassNotFoundException ex) {
             throw BusinessException.build("获取ME标准服务失败");
         }
-
+        int seq = 0;
+        boolean flag = true;
         for (ShopOrderRelease shopOrderReleaseModel : shopOrderList) {
             //查询工单信息
             String shopOrder = shopOrderReleaseModel.getShopOrder();
             String shopOrderBo = shopOrderReleaseModel.getShopOrderBo();
             ShopOrder shopOrderModel = shopOrderService.getById(shopOrderBo);
             if (shopOrderModel == null) {
-                throw new BaseException("工单[" + shopOrder + "]不存在");
+                flag =false;
+                message.append(seq++ % 3 == 0 ? "\n" : "|   |");
+                message.append("工单[" + shopOrder + "]不存在");
+                continue;
+//                throw new BaseException("工单[" + shopOrder + "]不存在");
             }
 
             // 校验工单对应的工单BOM是否更新了组件数据
@@ -161,24 +164,40 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
             BigDecimal qtyToBuild = new BigDecimal(shopOrderModel.getQtyToBuild());
             BigDecimal qtyReleased = new BigDecimal(shopOrderModel.getQtyReleased());
             if (!"501".equals(StringUtils.trimHandle(statusBo))) {
-                throw new BaseException("工单[" +shopOrder+ "]不是可下达状态");
+                flag =false;
+                message.append(seq++ % 3 == 0 ? "\n" : "|   |");
+                message.append("工单[" +shopOrder+ "]不是可下达状态");
+                continue;
+//                throw new BaseException("工单[" +shopOrder+ "]不是可下达状态");
             }
             if (qtyReleased.compareTo(qtyToBuild) >= 0) {
-                throw new BaseException("工单[" +shopOrder+ "]没有可用下达数量");
+                flag =false;
+                message.append(seq++ % 3 == 0 ? "\n" : "|   |");
+                message.append("工单[" +shopOrder+ "]没有可用下达数量");
+                continue;
+//                throw new BaseException("工单[" +shopOrder+ "]没有可用下达数量");
             }
             BigDecimal qtyToRelease = qtyToBuild.subtract(qtyReleased);
 
             //查询工艺路线
             Router routerModel = routerService.getCurrentRouter(routerBo);
             if (routerModel == null) {
-                throw new BaseException("工艺路线[" +StringUtils.trimHandle(routerBo)+ "]不存在");
+                flag =false;
+                message.append(seq++ % 3 == 0 ? "\n" : "|   |");
+                message.append("工艺路线[" +StringUtils.trimHandle(routerBo)+ "]不存在");
+                continue;
+//                throw new BaseException("工艺路线[" +StringUtils.trimHandle(routerBo)+ "]不存在");
             }
             routerBo = routerModel.getHandle();
 
             //查询工艺路线详细
             List<RouterDTO> routerList = shopOrderReleaseMapper.selectShopOrderRouter(routerBo);
             if (routerList == null || routerList.size() <= 0) {
-                throw new BaseException("工艺路线[" +StringUtils.trimHandle(routerBo)+ "]主数据不完整，请确认");
+                flag =false;
+                message.append(seq++ % 3 == 0 ? "\n" : "|   |");
+                message.append("工艺路线[" +StringUtils.trimHandle(routerBo)+ "]主数据不完整，请确认");
+                continue;
+//                throw new BaseException("工艺路线[" +StringUtils.trimHandle(routerBo)+ "]主数据不完整，请确认");
             }
 
             //工单下达
@@ -189,14 +208,26 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
                 request.setQuantityToRelease(qtyToRelease);
                 response = shopOrderServiceInterface.releaseShopOrder(request);
             } catch (Exception e) {
-                ExceptionUtil.throwException(e);
+                flag=false;
+                message.append(seq++ % 3 == 0 ? "\n" : "|   |");
+                message.append(e.getMessage());
+                continue;
+//                ExceptionUtil.throwException(e);
             }
             if (response == null) {
+//                flag =false;
+//                message.append(seq++ % 3 == 0 ? "\n" : "|   |");
+//                message.append("工单下达失败：调用标准接口处理异常");
+//                continue;
                 throw new BaseException("工单下达失败：调用标准接口处理异常");
             }
 
             List<ReleasedSfc> sfcList = response.getReleasedSfcList();
             if (sfcList == null || sfcList.size() <= 0) {
+//                flag =false;
+//                message.append(seq++ % 3 == 0 ? "\n" : "|   |");
+//                message.append("工单下达失败：获取生产批次清单为空");
+//                continue;
                 throw new BaseException("工单下达失败：获取生产批次清单为空");
             }
 
@@ -218,7 +249,8 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
                 updateShopOrder.setPlannedWorkCenterBo(workCenterBo);
                 shopOrderService.updateById(updateShopOrder);
             }*/
-        } //end for shopOrderList
+        }
+        return flag;//end for shopOrderList
     }
 
 
diff --git a/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml b/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml
index 256d4cbc..dec4e508 100644
--- a/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml
+++ b/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml
@@ -85,6 +85,7 @@
         <if test="workCenter != null and workCenter != ''">
             AND MVP.WORK_CENTER = #{workCenter}
         </if>
+        ORDER BY MVP.SHOP_ORDER
     </select>
 
     <select id="selectShopOrderRouter" resultType="com.foreverwin.mesnac.dispatch.dto.RouterDTO">
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java
index ed1952a5..f487318f 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java
@@ -25,8 +25,18 @@ public class SfcDto extends Sfc {
     //工作令号
     private String workOrder;
     private String employeeDescription;
+    private String preWorkOrderResult;
     private String lastOperationStatus;
 
+
+    public String getPreWorkOrderResult() {
+        return preWorkOrderResult;
+    }
+
+    public void setPreWorkOrderResult(String preWorkOrderResult) {
+        this.preWorkOrderResult = preWorkOrderResult;
+    }
+
     public String getSeq() {
         return seq;
     }
diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml
index b403966e..678eac52 100644
--- a/meapi/src/main/resources/mapper/SfcMapper.xml
+++ b/meapi/src/main/resources/mapper/SfcMapper.xml
@@ -46,7 +46,9 @@
         <result column="RESRCE" property="resrce" />
         <result column="EMPLOYEE_DESCRIPTION" property="employeeDescription" />
         <result column="LAST_OPERATION_STATUS" property="lastOperationStatus" />
-
+        <result column="LAST_OPERATION_STATUS" property="lastOperationStatus" />
+        <result column="PRE_WORKORDER_RESULT" property="preWorkOrderResult"/>
+        <result column="PLANNED_COMP_DATE" property="plannedCompDate"/>
     </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -669,20 +671,28 @@
         SELECT * FROM (
         SELECT S.SITE,PREZSD.EMPLOYEE_DESCRIPTION,
         CASE WHEN SS.STEP_SEQUENCE>TO_NUMBER(zsd.DISPATCH_SEQ)-1 THEN '完成'
-        ELSE '未完成' END LAST_OPERATION_STATUS,SS.STEP_ID CURRENT_STEP_ID,zsd.STEP_ID,
-         S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION,S.ITEM_BO,S.SHOP_ORDER_BO
+        ELSE '未完成' END LAST_OPERATION_STATUS,
+        CASE WHEN ZIT.RESULT='OK' THEN '合格' WHEN ZIT.RESULT='NG' THEN '不合格' ELSE '未检验' END PRE_WORKORDER_RESULT
+        ,SS.STEP_ID CURRENT_STEP_ID,OT.DESCRIPTION OPERATION_DESCRIPTION,zsd.STEP_ID,
+         S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION,S.ITEM_BO,S.SHOP_ORDER_BO,zsd.PLANNED_COMP_DATE
         FROM SFC S
         LEFT JOIN ITEM_T IT ON S.ITEM_BO=IT.ITEM_BO AND IT.LOCALE=#{locale}
         JOIN Z_SFC_DISPATCH zsd ON S.SFC=zsd.SFC AND S.SITE=zsd.SITE
-       LEFT JOIN Z_SFC_DISPATCH PREZSD ON zsd.SFC=PREZSD.SFC AND PREZSD.DISPATCH_SEQ=TO_NUMBER(zsd.DISPATCH_SEQ)-1 AND  zsd.ROUTER_BO=PREZSD.ROUTER_BO
+        LEFT JOIN Z_SFC_DISPATCH PREZSD ON zsd.SFC=PREZSD.SFC AND PREZSD.DISPATCH_SEQ=TO_NUMBER(zsd.DISPATCH_SEQ)-1 AND  zsd.ROUTER_BO=PREZSD.ROUTER_BO
+        LEFT JOIN Z_INSPECTION_TASK ZIT ON zsd.SFC=ZIT.SFC AND zsd.PREPOSITION_STEP_ID=ZIT.STEP_ID
+
         JOIN Z_PROD_READY_TASK zprt ON ZPRT.SFC_DISPATCH_BO=zsd.HANDLE
         JOIN SFC_ROUTING SR ON SR.SFC_BO=S.HANDLE
         JOIN SFC_ROUTER SR2 ON SR.HANDLE =SR2.SFC_ROUTING_BO  AND SR2.IN_USE = 'true'
         LEFT JOIN  SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0)
         JOIN  SFC_STEP SSS ON SR2.HANDLE =SSS.SFC_ROUTER_BO AND SSS.STEP_ID = ZSD.STEP_ID AND SSS.BYPASSED = 'false'
+        JOIN Z_SFC_DISPATCH OPZSD ON OPZSD.STEP_ID = SS.STEP_ID AND ZPRT.SFC = OPZSD.SFC
+        LEFT JOIN OPERATION O ON OPZSD.OPERATION = O.OPERATION
+        LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO
         WHERE S.SITE=#{ew.entity.site}  AND ZSD.RESRCE=#{ew.entity.resrce}  AND (ZSD.DISPATCH_STATUS='RELEASE' OR ZSD.DISPATCH_STATUS='START')
         AND S.STATUS_BO  IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404')
         AND zprt.STATUS='FINISH' AND  ZPRT."RESULT"='OK'
+        order by zsd.PLANNED_COMP_DATE asc
          ) T
         WHERE T.SITE = #{ew.entity.site}
         <if test="globalQuery!=null and globalQuery!=''">
@@ -695,6 +705,7 @@
                 </otherwise>
             </choose>
         </if>
+
         </select>