From 4751c67aa03484c3338fb39034dc5ff9af51c56e Mon Sep 17 00:00:00 2001 From: zpl Date: Wed, 1 Sep 2021 15:16:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReportDataController.java | 1 - .../service/impl/ReportDataServiceImpl.java | 2 + .../resources/mapper/ReportDataMapper.xml | 65 ++++++++++++++++++- 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java index e980e8e4..beb192e0 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java @@ -82,7 +82,6 @@ public class ReportDataController { @GetMapping("/findProductStateInfo") public R findProductStateInfo(@RequestParam(required = false) Map paramMap) { try { - paramMap.put("site", CommonMethods.getSite()); List> result = reportDataService.findProductStateInfo(paramMap); return R.ok(result); } catch (Exception e) { diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java index 216ac4fa..68042807 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java @@ -2,6 +2,7 @@ package com.foreverwin.mesnac.common.service.impl; import com.foreverwin.mesnac.common.mapper.ReportDataMapper; import com.foreverwin.mesnac.common.service.ReportDataService; +import com.foreverwin.modular.core.util.CommonMethods; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,6 +34,7 @@ public class ReportDataServiceImpl implements ReportDataService{ @Override public List> findProductStateInfo(Map paramMap) { + paramMap.put("site", CommonMethods.getSite()); return reportDataMapper.findProductStateInfo(paramMap); } } diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 8d20197d..815ebdc4 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -42,10 +42,10 @@ AND ZT.RESULT = #{result} - AND ZT.MODIFIED_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') + AND ZT.MODIFIED_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD') - 8/24 - AND ZT.MODIFIED_DATE_TIME <= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS') + AND ZT.MODIFIED_DATE_TIME <= TO_DATE(#{startToDate}|| '15:59:59', 'YYYY-MM-DD HH24:MI:SS') @@ -61,6 +61,67 @@ From 05232d0a31eeb0b629f5ff503dc5980c15f0ca35 Mon Sep 17 00:00:00 2001 From: zpl Date: Wed, 1 Sep 2021 17:24:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/resources/mapper/ReportDataMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 815ebdc4..1e12d13e 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -79,9 +79,9 @@ LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE LEFT JOIN ROUTER RU ON RU.HANDLE = ZSD.ROUTER_BO WHERE ZSD.SITE = #{site} - + AND CFA.VALUE LIKE '%'||#{workOrder}||'%' From 22b5ecf8ce7baa983fefbe1bf6ae399da9daf230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Wed, 1 Sep 2021 20:55:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BA=A7=E5=93=81=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=89=8B=E5=8A=A8=E5=BF=85=E8=BE=93?= =?UTF-8?q?=E9=A1=B9=202.=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=A8=E9=83=A8=EF=BC=8C=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=A0=B9=E6=8D=AE=E5=BC=82=E5=B8=B8=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E7=9A=84=E4=BA=A7=E5=93=81=E7=B1=BB=E5=88=AB=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/anomaly/model/AbnormalBill.java | 68 +++------ .../anomaly/service/AbnormalCauseService.java | 4 +- .../anomaly/service/AbnormalPlanService.java | 2 +- .../service/impl/AbnormalBillServiceImpl.java | 5 + .../impl/AbnormalCauseServiceImpl.java | 2 +- .../service/impl/AnomalyJobServiceImpl.java | 10 +- .../mapper/AbnormalBillDisposeMapper.xml | 8 +- .../resources/mapper/AbnormalBillMapper.xml | 144 ++++++++++-------- .../foreverwin/mesnac/meapi/model/Item.java | 18 ++- .../src/main/resources/mapper/ItemMapper.xml | 4 +- 10 files changed, 132 insertions(+), 133 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 b3ea9369..8ebf7d8b 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 @@ -14,8 +14,8 @@ import java.time.LocalDateTime; * 异常单 *

* - * @author zjw - * @since 2021-08-16 + * @author Philip + * @since 2021-09-01 */ @TableName("Z_ABNORMAL_BILL") @@ -224,6 +224,11 @@ public class AbnormalBill extends Model { */ @TableField("MODIFIED_DATE_TIME") private LocalDateTime modifiedDateTime; + /** + * 产品型号 + */ + @TableField("PRODUCT_CATEGORY") + private String productCategory; @TableField(exist = false) private String filePath; @@ -235,9 +240,6 @@ public class AbnormalBill extends Model { private String fileNum; - - - public String getHandle() { return handle; } @@ -558,6 +560,14 @@ public class AbnormalBill extends Model { this.modifiedDateTime = modifiedDateTime; } + public String getProductCategory() { + return productCategory; + } + + public void setProductCategory(String productCategory) { + this.productCategory = productCategory; + } + public String getFilePath() { return filePath; } @@ -582,7 +592,7 @@ public class AbnormalBill extends Model { this.fileNum = fileNum; } -public static final String HANDLE = "HANDLE"; + public static final String HANDLE = "HANDLE"; public static final String SITE = "SITE"; @@ -663,54 +673,10 @@ public static final String MODIFIED_USER = "MODIFIED_USER"; public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + @Override protected Serializable pkVal() { return this.handle; } - @Override - public String toString() { - return "AbnormalBill{" + - "handle = " + handle + - ", site = " + site + - ", abnormalNo = " + abnormalNo + - ", status = " + status + - ", correction = " + correction + - ", program = " + program + - ", type = " + type + - ", itemBo = " + itemBo + - ", sfc = " + sfc + - ", operation = " + operation + - ", workCenter = " + workCenter + - ", shopOrder = " + shopOrder + - ", messageType = " + messageType + - ", resrce = " + resrce + - ", ncCode = " + ncCode + - ", shutDown = " + shutDown + - ", responseUser = " + responseUser + - ", responseDateTime = " + responseDateTime + - ", pbDescription = " + pbDescription + - ", ncQty = " + ncQty + - ", pbGrade = " + pbGrade + - ", pbUser = " + pbUser + - ", pbQty = " + pbQty + - ", repairDateTime = " + repairDateTime + - ", discover = " + discover + - ", inspector = " + inspector + - ", entityLocation = " + entityLocation + - ", reportFrom = " + reportFrom + - ", objectBo = " + objectBo + - ", pbPhotoshop = " + pbPhotoshop + - ", cancelCode = " + cancelCode + - ", cancelReason = " + cancelReason + - ", cancelDateTime = " + cancelDateTime + - ", cancelUser = " + cancelUser + - ", reportSendUserGroup = " + reportSendUserGroup + - ", cancelSendUserGroup = " + cancelSendUserGroup + - ", createdUser = " + createdUser + - ", createdDateTime = " + createdDateTime + - ", modifiedUser = " + modifiedUser + - ", modifiedDateTime = " + modifiedDateTime + - "}"; - } } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalCauseService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalCauseService.java index 60fa6bd4..c252af38 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalCauseService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalCauseService.java @@ -1,10 +1,10 @@ package com.foreverwin.mesnac.anomaly.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.foreverwin.mesnac.anomaly.model.AbnormalCause; -import com.baomidou.mybatisplus.extension.service.IService; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -28,5 +28,5 @@ public interface AbnormalCauseService extends IService { List selectList(AbnormalCause abnormalCause); - void insertByAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List dutyCauseType); + void insertByAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, List dutyCauseType); } \ No newline at end of file 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 e868e054..43c44cf8 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); - void sendMessage(AbnormalBill abnormalBill,AbnormalPlan abnormalPlan); + void sendMessage(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 8e971d66..26e5dd4c 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 @@ -332,6 +332,11 @@ public class AbnormalBillServiceImpl extends ServiceImpl dutyTypeList = dataFieldListService.findDataFieldListById(dataField); hashMap.put("dutyType",dutyTypeList); + //产品类别 + dataField.setDataField("PRODUCT_CATEGORY"); + List productCategory = dataFieldListService.findDataFieldListById(dataField); + hashMap.put("productCategory",productCategory); + //当前登录用户的fullName List list = userService.findList(CommonMethods.getUser()); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalCauseServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalCauseServiceImpl.java index 85b092fe..21a72f49 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalCauseServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalCauseServiceImpl.java @@ -51,7 +51,7 @@ public class AbnormalCauseServiceImpl extends ServiceImpl dutyCauseType) { + public void insertByAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, List dutyCauseType) { String site = CommonMethods.getSite(); String user = CommonMethods.getUser(); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java index de4f6dc2..f123edfe 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java @@ -90,7 +90,7 @@ public class AnomalyJobServiceImpl implements AnomalyJobService { abnormalMessage.setUpUser(null); } - abnormalBill.setHandle(abnormalMessage.getMessageType()); + abnormalBill.setHandle(abnormalMessage.getObjectBo()); String message = abnormalBillService.formatMessage(abnormalBill,abnormalMessage.getMessageType(),site); abnormalMessage.setContent(message+"，It's Job send"); @@ -121,15 +121,17 @@ public class AnomalyJobServiceImpl implements AnomalyJobService { StringBuilder sendUsers = new StringBuilder(); for (int i = 0; i < nwaUsers.size(); i++) { if(i == (nwaUsers.size() - 1)){ - sendUsers.append(nwaUsers.get(i)); + sendUsers.append(nwaUsers.get(i).getUserName()); }else{ - sendUsers.append(nwaUsers.get(i)).append("|"); + sendUsers.append(nwaUsers.get(i).getUserName()).append("|"); } } activeMQUtil.wechatSendMessage(sendUsers.toString(),abnormalMessage.getContent()); // } + //保存升级的消息类型 messageService.saveOrUpdate(abnormalMessage); - // messageService.saveOrUpdate(_abnormalMessage); + //保存原先的消息类型，让原先的消息类型的stauts改为Y + messageService.saveOrUpdate(_abnormalMessage); } } } diff --git a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml index 0e8b2a1d..bd59cfda 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml @@ -710,7 +710,7 @@ SELECT ZAB.ABNORMAL_NO ABNORMAL_NO ,ZAB.STATUS STATUS,I.ITEM ITEM,IT.DESCRIPTION ITEM_DESCRIPTION, ZAB."TYPE" "TYPE" ,ZAB.SFC SFC,ZAB.MESSAGE_TYPE MESSAGE_TYPE,ZAB.SHOP_ORDER SHOP_ORDER, ZAB.WORK_CENTER WORK_CENTER,ZAB.RESRCE RESRCE, WORKORDER.VALUE WORK_ORDER,ITEMNUMBER.VALUE ITEM_NUMBER, - PRODUCTCATEGORY.VALUE PRODUCT_CATEGORY, + ZAB.PRODUCT_CATEGORY 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 , @@ -733,7 +733,6 @@ LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO AND OT.LOCALE = #{locale} LEFT JOIN CUSTOM_FIELDS WORKORDER ON WORKORDER.HANDLE = SO.HANDLE AND WORKORDER."ATTRIBUTE" = 'WORK_ORDER' LEFT JOIN CUSTOM_FIELDS ITEMNUMBER ON ITEMNUMBER.HANDLE = SO.HANDLE AND ITEMNUMBER."ATTRIBUTE" = 'ITEM_NUMBER' - LEFT JOIN CUSTOM_FIELDS PRODUCTCATEGORY ON PRODUCTCATEGORY.HANDLE = SO.HANDLE AND PRODUCTCATEGORY."ATTRIBUTE" = 'PRODUCT_CATEGORY' LEFT JOIN CUSTOM_FIELDS "MAP" ON "MAP".HANDLE = SO.HANDLE AND "MAP"."ATTRIBUTE" = 'MAP' LEFT JOIN Z_ABNORMAL_NC_CODE ZANC ON ZAB.HANDLE = ZANC.ABNORMAL_BILL_BO LEFT JOIN NC_CODE_T NCT ON ('NCCodeBO:' || ZAB.SITE || ',' || ZANC.NC_CODE) = NCT.NC_CODE_BO AND NCT.LOCALE = #{locale} @@ -750,13 +749,16 @@ AND ZAB.ABNORMAL_NO = #{abnormalBill.abnormalNo} + + AND ZAB.HANDLE = #{abnormalBill.handle} + GROUP BY ZAB.ABNORMAL_NO ,ZAB.STATUS ,I.ITEM ,IT.DESCRIPTION , ZAB."TYPE" ,ZAB.SFC ,ZAB.MESSAGE_TYPE ,ZAB.SHOP_ORDER , ZAB.WORK_CENTER ,ZAB.RESRCE , WORKORDER.VALUE ,ITEMNUMBER.VALUE , - PRODUCTCATEGORY.VALUE, ZAB.PB_DESCRIPTION ,ZAB.NC_QTY , + ZAB.PB_DESCRIPTION ,ZAB.NC_QTY ,ZAB.PRODUCT_CATEGORY, ZAB.PB_GRADE ,NWA.FULL_NAME ,ZAB.PB_QTY ,ZAB.DISCOVER , NWA2.FULL_NAME ,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 , diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index 20580a3f..b590823a 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -44,10 +44,10 @@ + - @@ -79,7 +79,7 @@ - HANDLE, SITE, ABNORMAL_NO, STATUS, CORRECTION, PROGRAM, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME + HANDLE, SITE, ABNORMAL_NO, STATUS, CORRECTION, PROGRAM, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, PRODUCT_CATEGORY @@ -153,6 +153,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND PRODUCT_CATEGORY=#{ew.entity.productCategory} @@ -203,6 +204,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND PRODUCT_CATEGORY=#{ew.entity.productCategory} ${ew.sqlSegment} @@ -261,6 +263,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND PRODUCT_CATEGORY=#{ew.entity.productCategory} ${ew.sqlSegment} @@ -319,6 +322,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND PRODUCT_CATEGORY=#{ew.entity.productCategory} ${ew.sqlSegment} @@ -377,6 +381,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND PRODUCT_CATEGORY=#{ew.entity.productCategory} ${ew.sqlSegment} @@ -435,6 +440,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND PRODUCT_CATEGORY=#{ew.entity.productCategory} AND ${ew.sqlSegment} @@ -493,6 +499,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND PRODUCT_CATEGORY=#{ew.entity.productCategory} ${ew.sqlSegment} @@ -547,6 +554,7 @@ CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, + PRODUCT_CATEGORY, VALUES #{handle}, @@ -589,6 +597,7 @@ #{createdDateTime}, #{modifiedUser}, #{modifiedDateTime}, + #{productCategory}, @@ -638,6 +647,7 @@ #{createdDateTime}, #{modifiedUser}, #{modifiedDateTime}, + #{productCategory}, @@ -683,6 +693,7 @@ CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + PRODUCT_CATEGORY=#{et.productCategory}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -728,6 +739,7 @@ CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + PRODUCT_CATEGORY=#{et.productCategory}, WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} @@ -773,6 +785,7 @@ CREATED_DATE_TIME=#{et.createdDateTime}, MODIFIED_USER=#{et.modifiedUser}, MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + PRODUCT_CATEGORY=#{et.productCategory}, @@ -817,6 +830,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND PRODUCT_CATEGORY=#{ew.entity.productCategory} ${ew.sqlSegment} @@ -892,6 +906,7 @@ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} AND MODIFIED_USER=#{ew.entity.modifiedUser} AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + AND PRODUCT_CATEGORY=#{ew.entity.productCategory} ${ew.sqlSegment} @@ -925,7 +940,6 @@ LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZAB.CREATED_USER AND ZNU.SITE = ZAB.SITE LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZAB.SHOP_ORDER AND SO.SITE = ZAB.SITE LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER' - LEFT JOIN CUSTOM_FIELDS CF2 ON CF2.HANDLE = SO.HANDLE AND CF2."ATTRIBUTE" = 'PRODUCT_CATEGORY' LEFT JOIN Z_ABNORMAL_NC_CODE ZANC ON ZANC.ABNORMAL_BILL_BO = ZAB.HANDLE LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = 'NCCodeBO:'|| ZAB.SITE || ',' || ZANC.NC_CODE AND NCT.LOCALE = #{language} @@ -945,15 +959,12 @@ AND zab.STATUS = #{abnormalBill.status} - - AND zab.PROGRAM IS NULL - - - AND zab.CORRECTION IS NULL - AND zab.PROGRAM = 'true' AND zab.CORRECTION = 'true' AND zab.status != 'G' + + AND zab.STATUS != 'Q' AND zab.STATUS != 'G' + AND zab.CREATED_DATE_TIME >= #{abnormalBill.startDateTime} @@ -973,64 +984,65 @@ AND CF.VALUE LIKE '%${abnormalBill.workOrder}%' - AND CF2.VALUE LIKE '%${abnormalBill.productionCategory}' + AND zab.PRODUCT_CATEGORY LIKE '%${abnormalBill.productionCategory}' - - - AND ZAB.REPORT_SEND_USER_GROUP IN - - UPPER(#{item.userGroup}) - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - AND 1 == 2 - - - + + + + + + GROUP BY zab.ABNORMAL_NO,zab.STATUS,it.DESCRIPTION,zab.CREATED_DATE_TIME,zab.RESPONSE_DATE_TIME, ZNU.FULL_NAME,zab.NC_CODE,zab.PB_DESCRIPTION + ORDER BY zab.CREATED_DATE_TIME DESC diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Item.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Item.java index ae49579b..d829f017 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Item.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Item.java @@ -1,13 +1,13 @@ package com.foreverwin.mesnac.meapi.model; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.IdType; /** *

@@ -153,6 +153,8 @@ public class Item extends Model { private String labelControl; @TableField(exist = false) private String batchControl; + @TableField(exist = false) + private String mapNo; public String getLabelControl() { return labelControl; @@ -674,6 +676,14 @@ public class Item extends Model { this.origin = origin; } + public String getMapNo() { + return mapNo; + } + + public void setMapNo(String mapNo) { + this.mapNo = mapNo; + } + public static final String HANDLE = "HANDLE"; public static final String CHANGE_STAMP = "CHANGE_STAMP"; diff --git a/meapi/src/main/resources/mapper/ItemMapper.xml b/meapi/src/main/resources/mapper/ItemMapper.xml index a44d2492..22db0f63 100644 --- a/meapi/src/main/resources/mapper/ItemMapper.xml +++ b/meapi/src/main/resources/mapper/ItemMapper.xml @@ -66,6 +66,7 @@ + @@ -79,9 +80,10 @@