diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalPlanController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalPlanController.java index e35eea12..a3e6df12 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalPlanController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalPlanController.java @@ -133,8 +133,8 @@ public class AbnormalPlanController { return R.ok(abnormalPlanService.findAbnormalPlan(abnormalPlanDto)); } - @GetMapping("/processes") - public R processes(List abnormalPlanList){ + @PostMapping("/processes") + public R processes(@RequestBody List abnormalPlanList){ abnormalPlanService.processes(abnormalPlanList); return R.ok(); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java index 82fe750d..84205ff7 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java @@ -135,7 +135,7 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl ncGroups =new ArrayList<>(); - if(!StringUtil.isBlank(ncGroup.toString().toString())){ + if(!StringUtil.isBlank(ncGroup.toString())){ ncGroup = new StringBuilder(ncGroup.substring(0, ncGroup.length() - 1)); List ncGroupList = Arrays.asList(ncGroup.toString().split(",")); ncGroups.add(ncGroupList.get(0)); 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 5ba8331e..e48cfeb1 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 @@ -225,7 +225,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl messageTypeUpdateWrapper = new UpdateWrapper<>(); // messageTypeUpdateWrapper.eq("SITE",site); @@ -903,6 +901,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl @@ -57,6 +58,15 @@ public class AbnormalPlanServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, AbnormalPlan abnormalPlan) { @@ -129,44 +139,23 @@ public class AbnormalPlanServiceImpl extends ServiceImpl nwaUsers = nwaUserService.checkUserGroup(site,message.getSendUserGroup()); - StringBuilder sendUsers = new StringBuilder(); - for (int i = 0; i < nwaUsers.size(); i++) { - if(i == (nwaUsers.size() - 1)){ - sendUsers.append(nwaUsers.get(i)); - }else{ - sendUsers.append(nwaUsers.get(i)).append("|"); - } + abnormalBillService.anomalyCreatedAndSendMessage(abnormalBill,abnormalBillDispose); + if(Constants.PROCESSED.equals(abnormalPlan.getStatus())){ + throw new BaseException("异常单:"+abnormalPlan.getAbnormalNo()+"已经处理,不能再次处理"); } - activeMQUtil.wechatSendMessage(sendUsers.toString(),message.getContent()); - //保存 - messageService.saveOrUpdate(message); + //设置状态为已处理 + abnormalPlan.setStatus(Constants.PROCESSED); + //设置处理人 + abnormalPlan.setProcessor(user); + //设置发送时间 + abnormalPlan.setSendDateTime(now); + //设置handle + abnormalPlan.setHandle(HandleEnum.ABNORMAL_PLAN.getHandle(site,abnormalPlan.getAbnormalNo())); + //更新 + this.saveOrUpdate(abnormalPlan); } } diff --git a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml index b2311ab6..38b863d1 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml @@ -624,7 +624,7 @@ PRODUCTCATEGORY.VALUE PRODUCT_CATEGORY,listagg(NG.DESCRIPTION || '/'||NCT.DESCRIPTION || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE_DESCRIPTION, ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.NC_QTY NC_QTY, ZAB.PB_GRADE PB_GRADE ,NWA.FULL_NAME PB_USER ,ZAB.PB_QTY PB_QTY ,ZAB.DISCOVER DISCOVER , - ZAB.INSPECTOR INSPECTOR ,ZAB.ENTITY_LOCATION ENTITY_LOCATION ,ZAB.REPORT_FROM REPORT_FROM ,ZAB.OBJECT_BO OBJECT_BO , + ZAB.INSPECTOR INSPECTOR ,ZAB.ENTITY_LOCATION ENTITY_LOCATION ,ZAB.REPORT_FROM REPORT_FROM ,SUBSTR(ZAB.OBJECT_BO,INSTR(ZAB.OBJECT_BO,',')+1) OBJECT_BO, ZAB.PB_PHOTOSHOP PB_PHOTOSHOP,ZABD.DUTY_CAUSE_DESCRIPTION DUTY_CAUSE_DESCRIPTION,ZABD.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,ZABD.DUTY_DEPART DUTY_DEPART, ZABD.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,ZABD.DUTY_TYPE DUTY_TYPE,ZABD.PRINCIPAL_USER PRINCIPAL_USER,ZABD.ABNORMAL_METHOD ABNORMAL_METHOD, R.ROUTER ROUTER,ZABD.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,ZABD.RESOLVE_REMARK RESOLVE_REMARK,ZABD.RESOLVE_SEND_USER RESOLVE_SEND_USER, @@ -660,7 +660,7 @@ ZAB.WORK_CENTER ,ZAB.RESRCE , WORKORDER.VALUE ,ITEMNUMBER.VALUE , PRODUCTCATEGORY.VALUE, ZAB.PB_DESCRIPTION ,ZAB.NC_QTY , ZAB.PB_GRADE ,NWA.FULL_NAME ,ZAB.PB_QTY ,ZAB.DISCOVER , - ZAB.INSPECTOR ,ZAB.ENTITY_LOCATION ,ZAB.REPORT_FROM ,ZAB.OBJECT_BO , + ZAB.INSPECTOR ,ZAB.ENTITY_LOCATION ,ZAB.REPORT_FROM ,SUBSTR(ZAB.OBJECT_BO,INSTR(ZAB.OBJECT_BO,',')+1), ZAB.PB_PHOTOSHOP ,ZABD.DUTY_CAUSE_DESCRIPTION ,ZABD.DUTY_CAUSE_TYPE ,ZABD.DUTY_DEPART , ZABD.DUTY_SEND_USER_GROUP ,ZABD.DUTY_TYPE ,ZABD.PRINCIPAL_USER ,ZABD.ABNORMAL_METHOD , R.ROUTER ,ZABD.RESOLVE_SHOP_ORDER ,ZABD.RESOLVE_REMARK ,ZABD.RESOLVE_SEND_USER , diff --git a/anomaly/src/main/resources/mapper/AbnormalPlanMapper.xml b/anomaly/src/main/resources/mapper/AbnormalPlanMapper.xml index 6e7af945..2ac0a459 100644 --- a/anomaly/src/main/resources/mapper/AbnormalPlanMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalPlanMapper.xml @@ -553,7 +553,8 @@ - SELECT DISTINCT WC.WORK_CENTER WORK_CENTER,WO.VALUE WORK_ORDER,WO2.VALUE DWG_NO,ZSS.QTY QTY,ZSS.OPERATION OPERATION, - ZSS.REASON REASON,ZSS."TYPE" "TYPE", - CASE WHEN I1.VALUE != NULL THEN I1.VALUE * I.QTY_MULTIPLIER - WHEN I2.VALUE != NULL THEN I2.VALUE * I.QTY_MULTIPLIER - ELSE I.QTY_MULTIPLIER END WEIGHT,I.ITEM ITEM,S.SFC SFC,it.DESCRIPTION ITEM_DESCRIPTION, - SO.SHOP_ORDER SHOP_ORDER + SELECT DISTINCT NVL(WC.WORK_CENTER,' ') WORK_CENTER,NVL(WO.VALUE,' ') WORK_ORDER,NVL(WO2.VALUE,' ') DWG_NO,NVL(ZSS.QTY,0) QTY,NVL(ZSS.OPERATION,' ') OPERATION, + NVL(ZSS.REASON,' ') REASON,NVL(ZSS."TYPE",' ') "TYPE", + CASE WHEN I1.VALUE != NULL THEN NVL(I1.VALUE * I.QTY_MULTIPLIER,0) + WHEN I2.VALUE != NULL THEN NVL(I2.VALUE * I.QTY_MULTIPLIER,0) + ELSE NVL(I.QTY_MULTIPLIER,0) END WEIGHT,NVL(I.ITEM,' ') ITEM,NVL(S.SFC,' ') SFC,NVL(it.DESCRIPTION,' ') ITEM_DESCRIPTION, + NVL(SO.SHOP_ORDER,' ') SHOP_ORDER FROM SHOP_ORDER SO LEFT JOIN WORK_CENTER WC ON SO.PLANNED_WORK_CENTER_BO = WC.HANDLE diff --git a/production/src/main/resources/mapper/SplitSfcMapper.xml b/production/src/main/resources/mapper/SplitSfcMapper.xml index 235a0d55..f41b6117 100644 --- a/production/src/main/resources/mapper/SplitSfcMapper.xml +++ b/production/src/main/resources/mapper/SplitSfcMapper.xml @@ -380,7 +380,7 @@