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 ce4ac105..89162c43 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 @@ -12,6 +12,7 @@ import com.foreverwin.mesnac.common.service.SfcDispatchCommonService; import com.foreverwin.mesnac.meapi.service.NcCodeService; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.R; +import com.sap.me.frame.service.CommonMethods; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -78,6 +79,7 @@ public class AbnormalBillController { public R page(FrontPage frontPage, AbnormalBill abnormalBill){ IPage result; QueryWrapper queryWrapper = new QueryWrapper<>(); + abnormalBill.setSite(CommonMethods.getSite()); queryWrapper.setEntity(abnormalBill); if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { //TODO modify global query 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 8ade73d2..3c9eec5b 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 @@ -162,6 +162,8 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl 0){ + abnormalNcCodeService.saveOrUpdateBatch(abnormalNcCodes); + } abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose); this.saveOrUpdate(abnormalBill); /** diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index 7d304651..4898d922 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -437,12 +437,12 @@ AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} - ${ew.sqlSegment} + AND ${ew.sqlSegment} - ${ew.sqlSegment} + AND ${ew.sqlSegment} diff --git a/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruIn.java b/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruIn.java index 970756d6..87f5382d 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruIn.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruIn.java @@ -476,22 +476,4 @@ public class ZprodordconfStruIn implements java.io.Serializable { _javaType, _xmlType, typeDesc); } - @Override - public String toString() { - return "ZprodordconfStruIn{" + - "aufnr='" + aufnr + '\'' + - ", vornr='" + vornr + '\'' + - ", aueru='" + aueru + '\'' + - ", lmnga=" + lmnga + - ", xmnga=" + xmnga + - ", ism01=" + ism01 + - ", ism02=" + ism02 + - ", ism03=" + ism03 + - ", ism04=" + ism04 + - ", ism05=" + ism05 + - ", ism06=" + ism06 + - ", __equalsCalc=" + __equalsCalc + - ", __hashCodeCalc=" + __hashCodeCalc + - '}'; - } } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruOut.java b/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruOut.java index 18eb1910..ee84e2b3 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruOut.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruOut.java @@ -512,23 +512,4 @@ public class ZprodordconfStruOut implements java.io.Serializable { _javaType, _xmlType, typeDesc); } - @Override - public String toString() { - return "ZprodordconfStruOut{" + - "aufnr='" + aufnr + '\'' + - ", vornr='" + vornr + '\'' + - ", aueru='" + aueru + '\'' + - ", lmnga=" + lmnga + - ", ism01=" + ism01 + - ", ism02=" + ism02 + - ", ism03=" + ism03 + - ", ism04=" + ism04 + - ", ism05=" + ism05 + - ", ism06=" + ism06 + - ", ret='" + ret + '\'' + - ", msg='" + msg + '\'' + - ", __equalsCalc=" + __equalsCalc + - ", __hashCodeCalc=" + __hashCodeCalc + - '}'; - } } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/erp/document.wsdl b/common/src/main/java/com/foreverwin/mesnac/common/erp/document.wsdl new file mode 100644 index 00000000..84931cac --- /dev/null +++ b/common/src/main/java/com/foreverwin/mesnac/common/erp/document.wsdl @@ -0,0 +1 @@ +falsefalsefalsetruenofalse \ No newline at end of file diff --git a/common/src/main/java/com/foreverwin/mesnac/common/erp/saperp.wsdl b/common/src/main/java/com/foreverwin/mesnac/common/erp/saperp.wsdl deleted file mode 100644 index aa49348f..00000000 --- a/common/src/main/java/com/foreverwin/mesnac/common/erp/saperp.wsdl +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - -false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -false - - - - -false -true -no -false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/console/src/main/resources/application-local.yml b/console/src/main/resources/application-local.yml index 3e8ab68f..31b82509 100644 --- a/console/src/main/resources/application-local.yml +++ b/console/src/main/resources/application-local.yml @@ -58,11 +58,11 @@ activemq: #WebService ws: erp: - server: 172.16.251.223 + server: srm.mesnac.com port: 8000 - user: mesd001 - pwd: a123456 - valid: N + user: mes001 + pwd: mesprd + valid: Y #quartz任务启用 quartz: diff --git a/console/src/main/resources/application-prd.yml b/console/src/main/resources/application-prd.yml index 0ad6c415..67c4d5aa 100644 --- a/console/src/main/resources/application-prd.yml +++ b/console/src/main/resources/application-prd.yml @@ -9,7 +9,7 @@ spring: jndi-name: jdbc/jts/wipPool activemq: enabled: true - brokerUrl: tcp://172.16.251.166:61616?wireFormat.maxInactivityDuration=0 + brokerUrl: tcp://172.16.170.166:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin pool: @@ -18,7 +18,7 @@ spring: #发送消息 activemq: - brokerUrl: tcp://172.16.251.164:61616?wireFormat.maxInactivityDuration=0 + brokerUrl: tcp://172.16.170.164:61616?wireFormat.maxInactivityDuration=0 password: admin user: admin pool: @@ -32,18 +32,18 @@ ws: port: 8000 user: mes001 pwd: mesprd - valid: N + valid: Y #ftp ftp: - host: 172.16.251.165 + host: 172.16.170.165 port: 21 username: mesftp password: mesnac1@3 #打印服务 print: - server: http://10.10.170.32:8022/print/mesnacprint + server: http://172.16.170.163:8022/print/mesnacprint #文件模板路径 exportDocument: diff --git a/console/src/test/java/com/foreverwin/mesnac/console/TmdMc.java b/console/src/test/java/com/foreverwin/mesnac/console/TmdMc.java index c6053aed..9a0311d3 100644 --- a/console/src/test/java/com/foreverwin/mesnac/console/TmdMc.java +++ b/console/src/test/java/com/foreverwin/mesnac/console/TmdMc.java @@ -22,8 +22,8 @@ public class TmdMc { @Test public void callErpWebService() throws RemoteException { - String shopOrder = "SO20210714"; - String stepId = "OP001"; + String shopOrder = "000100434347"; + String stepId = "0060"; //请求参数 @@ -57,7 +57,6 @@ public class TmdMc { struOut.setAufnr(shopOrder); struOut.setVornr(stepId); struOut.setAueru("1"); - struOut.setLmnga(new BigDecimal(1)); struOut.setRet(""); struOut.setMsg(""); outs[0] = struOut; @@ -65,9 +64,13 @@ public class TmdMc { //调用WS ERPAPI.erpWebService().zmesProdordconf(inHolder, outHolder); - //状态： S|成功， E|失败 - String status = outHolder.value[1].getRet(); - String message = outHolder.value[1].getMsg(); - System.out.println("ERP接口返回：状态:" + status + ",消息:" + message); + if (outHolder == null || outHolder.value == null || outHolder.value.length <= 0) { + System.out.println("ERP接口失败"); + } else { + //状态： S|成功， E|失败 + String status = outHolder.value[1].getRet(); + String message = outHolder.value[1].getMsg(); + System.out.println("ERP接口返回：状态:" + status + ",消息:" + message); + } } } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java index 29cc8a78..87e4d075 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java @@ -294,7 +294,7 @@ public class CallItemController { */ @ResponseBody @GetMapping("/findIssueItemListPda") - public R findIssueItemListPda(String workCenter, String resource, String item,String requiredFromDate, String requiredToDate, Boolean matchResource) { + public R findIssueItemListPda(String workCenter, String resource, String item,String spec,String texture,String requiredFromDate, String requiredToDate, Boolean matchResource) { List result; try { String site = CommonMethods.getSite(); @@ -306,6 +306,8 @@ public class CallItemController { issueItemDto.setWorkCenter(workCenter); issueItemDto.setMatchResource(matchResource); issueItemDto.setItem(item); + issueItemDto.setSpec(spec); + issueItemDto.setTexture(texture); if (StringUtil.notBlank(requiredFromDate)) { issueItemDto.setRequiredFromDT(LocalDate.parse(requiredFromDate, DateTimeFormatter.ISO_DATE)); } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java index b9629770..090485fe 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java @@ -15,6 +15,8 @@ public class IssueItemDto implements Serializable { private Boolean matchResource; private LocalDate requiredFromDT; private LocalDate requiredToDT; + private String spec; + private String texture; public String getSite() { return site; @@ -95,4 +97,20 @@ public class IssueItemDto implements Serializable { public void setRequiredToDT(LocalDate requiredToDT) { this.requiredToDT = requiredToDT; } + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public String getTexture() { + return texture; + } + + public void setTexture(String texture) { + this.texture = texture; + } } diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java index c0b16de0..d8737b61 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java @@ -453,6 +453,8 @@ public class CallItemServiceImpl extends ServiceImpl i String component = callItem.getItem(); String itemGroup = callItem.getItemGroup(); BigDecimal reqQty = callItem.getDispatchQty(); + // 需求件数 + callItem.setDispatchQty(reqQty); String blankingSize = callItem.getBlankingSize(); if (StringUtil.isBlank(blankingSize)) { diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml index 03bfeff7..daf51181 100644 --- a/dispatch/src/main/resources/mapper/CallItemMapper.xml +++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml @@ -1032,6 +1032,8 @@ LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh' LEFT JOIN ITEM I ON I.HANDLE = ZCI.COMPONENT_BO LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = 'zh' + LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = I.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC' + LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = I.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE' LEFT JOIN ITEM_GROUP_MEMBER IGM ON IGM.ITEM_BO = ZCI.COMPONENT_BO LEFT JOIN ITEM_GROUP IG ON IG.HANDLE = IGM.ITEM_GROUP_BO WHERE ZCI.CALL_TYPE = 'MATERIAL' AND ZCI.STATUS = '802' AND ZCI.SITE = #{site} @@ -1050,6 +1052,12 @@ AND ZCI.REQUIRED_DATE_TIME <= #{requiredToDT} + + AND CFA.VALUE LIKE '%' || #{spec} || '%' + + + AND CFB.VALUE LIKE '%' || #{texture} || '%' + GROUP BY ZCI.COMPONENT_BO ,ZSD.WORK_CENTER ,WCT.DESCRIPTION ,I.ITEM ,IT.DESCRIPTION ,ZSD.BLANKING_SIZE ,IG.ITEM_GROUP ORDER BY ZCI.COMPONENT_BO @@ -1065,6 +1073,8 @@ LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh' LEFT JOIN ITEM I ON I.HANDLE = ZCI.COMPONENT_BO LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = 'zh' + LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = I.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC' + LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = I.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE' LEFT JOIN ITEM_GROUP_MEMBER IGM ON IGM.ITEM_BO = ZCI.COMPONENT_BO LEFT JOIN ITEM_GROUP IG ON IG.HANDLE = IGM.ITEM_GROUP_BO LEFT JOIN RESRCE R ON R.RESRCE = ZCI.RESRCE AND R.SITE = ZCI.SITE @@ -1084,6 +1094,12 @@ AND ZCI.REQUIRED_DATE_TIME <= #{requiredToDT} + + AND CFA.VALUE LIKE '%' || #{spec} || '%' + + + AND CFB.VALUE LIKE '%' || #{texture} || '%' + GROUP BY ZCI.COMPONENT_BO ,ZSD.WORK_CENTER ,WCT.DESCRIPTION ,I.ITEM ,IT.DESCRIPTION ,ZSD.BLANKING_SIZE ,IG.ITEM_GROUP , ZCI.RESRCE, R.DESCRIPTION ORDER BY ZCI.COMPONENT_BO diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml index cfebf0b7..d5debda4 100644 --- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml @@ -731,7 +731,8 @@ diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/ShopOrderDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/ShopOrderDto.java index bdac713a..811a7269 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/ShopOrderDto.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/ShopOrderDto.java @@ -28,6 +28,12 @@ public class ShopOrderDto extends ShopOrder { */ private String workCenter; + /** + * 图号 + * @return + */ + private String map; + public String getWorkOrder() { return workOrder; } @@ -59,4 +65,12 @@ public class ShopOrderDto extends ShopOrder { public void setWorkCenter(String workCenter) { this.workCenter = workCenter; } + + public String getMap() { + return map; + } + + public void setMap(String map) { + this.map = map; + } } diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml index beea997e..ccfef860 100644 --- a/meapi/src/main/resources/mapper/ResrceMapper.xml +++ b/meapi/src/main/resources/mapper/ResrceMapper.xml @@ -611,4 +611,12 @@ GROUP BY RS.HANDLE, RS.SITE, RS.RESRCE, RS.DESCRIPTION, RS.STATUS_BO, RS.PROCESS_RESOURCE, RS.OPERATION_BO, RS.VALID_FROM, RS.VALID_TO, RS.SETUP_STATE, RS.CREATED_DATE_TIME, RS.MODIFIED_DATE_TIME + + + + diff --git a/meapi/src/main/resources/mapper/ShopOrderMapper.xml b/meapi/src/main/resources/mapper/ShopOrderMapper.xml index 0f9ab9d5..6939953b 100644 --- a/meapi/src/main/resources/mapper/ShopOrderMapper.xml +++ b/meapi/src/main/resources/mapper/ShopOrderMapper.xml @@ -1009,11 +1009,12 @@ diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java index 2d545a37..b4ea1a2f 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java @@ -159,7 +159,7 @@ public class SfcScrapServiceImpl extends ServiceImpl i sfcScrap.setModifiedDateTime(now); //向生产派工那边发送数据 - podTemplateService.sendErp(sfcScrap.getSfc(),sfcScrap.getStepId(),BigDecimal.valueOf(0L),BigDecimal.valueOf(sfcScrap.getQty()),BigDecimal.valueOf(0L)); + // podTemplateService.sendErp(sfcScrap.getSfc(),sfcScrap.getStepId(),BigDecimal.valueOf(0L),BigDecimal.valueOf(sfcScrap.getQty()),BigDecimal.valueOf(0L)); try{ //调用mes公共接口，报废 diff --git a/production/src/main/resources/mapper/SfcScrapMapper.xml b/production/src/main/resources/mapper/SfcScrapMapper.xml index f1594657..0c958e80 100644 --- a/production/src/main/resources/mapper/SfcScrapMapper.xml +++ b/production/src/main/resources/mapper/SfcScrapMapper.xml @@ -436,7 +436,7 @@ 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,NVL(ZSS.DUTY_USER,' ') DUTY_USER + NVL(SO.SHOP_ORDER,' ') SHOP_ORDER,NVL(ZNU.FULL_NAME,' ') DUTY_USER FROM SHOP_ORDER SO LEFT JOIN WORK_CENTER WC ON SO.PLANNED_WORK_CENTER_BO = WC.HANDLE @@ -448,6 +448,7 @@ LEFT JOIN OPERATION O ON O.OPERATION = ZSS.OPERATION AND O.SITE = SO.SITE LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = #{locale} LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO + LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZSS.DUTY_USER LEFT JOIN ITEM_T it ON it.ITEM_BO = I.HANDLE AND it.LOCALE = #{locale} LEFT JOIN CUSTOM_FIELDS I1 ON I1.HANDLE = I.HANDLE AND I1."ATTRIBUTE" = 'PER_METER' LEFT JOIN CUSTOM_FIELDS I2 ON I2.HANDLE = I.HANDLE AND I2."ATTRIBUTE" = 'PER_SQUARE_METER' diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java b/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java index 829229ee..50a8e14c 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java @@ -29,6 +29,7 @@ public class InspectionTaskManage implements Serializable { private LocalDateTime createdDateTime; private String modifyUser; private LocalDateTime modifiedDateTime; + private String fullName; private List inspectionTaskDetailList; @@ -215,4 +216,12 @@ public class InspectionTaskManage implements Serializable { public void setInspectionTaskDetailList(List inspectionTaskDetailList) { this.inspectionTaskDetailList = inspectionTaskDetailList; } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } } diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java b/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java index bf6b6302..1ed34e6e 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java @@ -151,6 +151,13 @@ public class SelfReport extends Model { @TableField(exist = false) private String productCategory; + /** + * 传过去的User + * @return + */ + @TableField(exist = false) + private String pbUser; + public String getProductCategory() { return productCategory; } @@ -343,6 +350,14 @@ public class SelfReport extends Model { this.description = description; } + public String getPbUser() { + return pbUser; + } + + public void setPbUser(String pbUser) { + this.pbUser = pbUser; + } + public static final String HANDLE = "HANDLE"; public static final String SITE = "SITE"; diff --git a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml index 68b442df..04924cc9 100644 --- a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml +++ b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml @@ -25,15 +25,17 @@ + - SELECT ZSR.HANDLE, ZSR.SITE, ZSR.TASK_NO, ZSR.WORK_CENTER,ZSR.NC_CODE_DESC, 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 + SELECT ZSR.HANDLE, ZSR.SITE, ZSR.TASK_NO, ZSR.WORK_CENTER,ZSR.NC_CODE_DESC, 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,ZSR.CREATE_USER PB_USER 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