From 17f6d253ea24d63de00d9a2da52b188a3647714d Mon Sep 17 00:00:00 2001 From: yangwl <1726150332@qq.com> Date: Mon, 10 Oct 2022 15:19:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8B=86=E5=88=86=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=E3=80=81=E5=8F=91?= =?UTF-8?q?=E9=80=81=E8=AE=A1=E5=88=92=E5=A4=84=E7=90=86=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E3=80=81=E6=B4=BE=E5=B7=A5=E5=8D=95=E7=89=A9=E6=96=99=E5=8E=BB?= =?UTF-8?q?=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/anomaly/model/AbnormalBill.java | 1 + .../mesnac/anomaly/model/AbnormalPlan.java | 12 +- .../anomaly/service/AbnormalPlanService.java | 2 +- .../service/impl/AbnormalBillServiceImpl.java | 9 +- .../service/impl/AbnormalPlanServiceImpl.java | 16 +- .../resources/mapper/AbnormalBillMapper.xml | 175 ++++++++++++++---- .../service/impl/SfcDispatchServiceImpl.java | 7 + .../main/resources/mapper/ShopOrderMapper.xml | 2 +- .../main/resources/mapper/SplitSfcMapper.xml | 2 +- 9 files changed, 180 insertions(+), 46 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java index f6ba0c46..0e1a57e7 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java @@ -276,6 +276,7 @@ public class AbnormalBill extends Model { @TableField(exist = false) private String mapNo; + /** * 物料描述 */ diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalPlan.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalPlan.java index fcff9b7a..891e873d 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalPlan.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalPlan.java @@ -124,7 +124,17 @@ public class AbnormalPlan extends Model { private String rtHandle; - public String getRtHandle() { + private String reapirContent; + + public String getReapirContent() { + return reapirContent; + } + + public void setReapirContent(String reapirContent) { + this.reapirContent = reapirContent; + } + + public String getRtHandle() { return rtHandle; } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java index 90c71263..65d19b75 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java @@ -39,5 +39,5 @@ public interface AbnormalPlanService extends IService { void processes(List abnormalPlanList) throws Exception; - void sendMessage(AbnormalBill abnormalBill, AbnormalPlan abnormalPlan); + void sendMessage(List userList,AbnormalBill abnormalBill, AbnormalPlan abnormalPlan); } \ No newline at end of file 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 31a3d3d1..2588bd87 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 @@ -257,8 +257,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl replaceMessage = abnormalBillMapper.findReplaceMessageByAbnormal(abnormalBill); + if (abnormalBill.getType().equals("S")){ replaceMessage=abnormalBillMapper.findReplaceMessageResrce(abnormalBill); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java index 9032262e..07370311 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java @@ -263,7 +263,7 @@ public class AbnormalPlanServiceImpl extends ServiceImpl sendUserGroupList = new ArrayList<>(Arrays.asList(sendUserGroup.split(","))); + for (String userGroup : sendUserGroupList) { + List userList=new ArrayList<>(); abnormalPlans.get(i).setSendUserGroup(userGroup); - this.sendMessage(abnormalBills.get(i),abnormalPlans.get(i)); + for (String u : sendUserGroupList){ + List nwaUsers = nwaUserService.checkUserGroup(site,u); + for (NwaUser nwaUser:nwaUsers){ + userList.add(nwaUser.getFullName()); + } + } + this.sendMessage(userList,abnormalBills.get(i),abnormalPlans.get(i)); } abnormalPlans.get(i).setSendUserGroup(sendUserGroup); } @@ -313,7 +321,7 @@ public class AbnormalPlanServiceImpl extends ServiceImpl userList,AbnormalBill abnormalBill,AbnormalPlan abnormalPlan) { //创建一个消息记录表 String site = CommonMethods.getSite(); String user = CommonMethods.getUser(); @@ -332,6 +340,8 @@ public class AbnormalPlanServiceImpl extends ServiceImpl AND zab.PRODUCT_CATEGORY LIKE '%${abnormalBill.productionCategory}' + + + AND IT.DESCRIPTION like '%' ||#{abnormalBill.itemDescription}|| '%' + @@ -1172,6 +1176,8 @@ AND SFC = #{sfc} + AND PROGRAM !='true' + @@ -1296,7 +1302,7 @@ 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') ORDER BY ZABD.CLOSED_DATE_TIME DESC + WHERE zab.SITE=#{site} AND zab.STATUS IN ('F','J','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 WO.VALUE WORK_ORDER,ITEM.VALUE ITEM_NUMBER,PC.VALUE PRODUCT_CATEGORY,WC.WORK_CENTER + SELECT SO.SHOP_ORDER,SO.STATUS_BO,WO.VALUE WORK_ORDER,ITEM.VALUE ITEM_NUMBER,PC.VALUE PRODUCT_CATEGORY,WC.WORK_CENTER FROM SHOP_ORDER SO LEFT JOIN CUSTOM_FIELDS WO ON WO.HANDLE = SO.HANDLE AND WO."ATTRIBUTE" = 'WORK_ORDER' LEFT JOIN CUSTOM_FIELDS ITEM ON ITEM.HANDLE = SO.HANDLE AND ITEM."ATTRIBUTE" = 'ITEM_NUMBER' diff --git a/production/src/main/resources/mapper/SplitSfcMapper.xml b/production/src/main/resources/mapper/SplitSfcMapper.xml index 61da666c..a7dd4131 100644 --- a/production/src/main/resources/mapper/SplitSfcMapper.xml +++ b/production/src/main/resources/mapper/SplitSfcMapper.xml @@ -392,7 +392,7 @@