diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java index 3856c3e3..dd68fe57 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java @@ -13,8 +13,8 @@ import java.util.List; /** * - * @author robert - * @since 2021-06-29 + * @author zjw + * @since 2021-08-12 */ @RestController @RequestMapping("/Z-ABNORMAL-BILL-DISPOSE") @@ -80,7 +80,7 @@ public class AbnormalBillDisposeController { .or().like(AbnormalBillDispose::getRouterBo, frontPage.getGlobalQuery()) .or().like(AbnormalBillDispose::getResolveShopOrder, frontPage.getGlobalQuery()) .or().like(AbnormalBillDispose::getResolveRemark, frontPage.getGlobalQuery()) - .or().like(AbnormalBillDispose::getResolveSendUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillDispose::getResolveSendUserGroup, frontPage.getGlobalQuery()) .or().like(AbnormalBillDispose::getClosedUser, frontPage.getGlobalQuery()) .or().like(AbnormalBillDispose::getAbnormalReason, frontPage.getGlobalQuery()) .or().like(AbnormalBillDispose::getBeforeMeasure, frontPage.getGlobalQuery()) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java index 8b69a27c..7721b6bf 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java @@ -15,8 +15,8 @@ import java.util.List; /** * - * @author 赵嘉伟 - * @since 2021-07-23 + * @author zjw + * @since 2021-08-12 */ @RestController @RequestMapping("/Z-ABNORMAL-BILL-LOG") @@ -109,7 +109,7 @@ public class AbnormalBillLogController { .or().like(AbnormalBillLog::getRouterBo, frontPage.getGlobalQuery()) .or().like(AbnormalBillLog::getResolveShopOrder, frontPage.getGlobalQuery()) .or().like(AbnormalBillLog::getResolveRemark, frontPage.getGlobalQuery()) - .or().like(AbnormalBillLog::getResolveSendUser, frontPage.getGlobalQuery()) + .or().like(AbnormalBillLog::getResolveSendUserGroup, frontPage.getGlobalQuery()) .or().like(AbnormalBillLog::getClosedUser, frontPage.getGlobalQuery()) .or().like(AbnormalBillLog::getAbnormalReason, frontPage.getGlobalQuery()) .or().like(AbnormalBillLog::getBeforeMeasure, frontPage.getGlobalQuery()) @@ -165,7 +165,6 @@ public class AbnormalBillLogController { return R.ok(abnormalBillLogService.removeByIds(ids)); } - @GetMapping("/saveAndUpdate") public R saveAndUpdate(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java index c5efb797..3070aa21 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java @@ -12,12 +12,13 @@ import org.springframework.stereotype.Repository; * 异常单处置 Mapper 接口 *

* - * @author robert - * @since 2021-06-29 + * @author zjw + * @since 2021-08-12 */ @Repository public interface AbnormalBillDisposeMapper extends BaseMapper { + /** * 质量异常检索 * @param abnormalBill @@ -29,4 +30,5 @@ public interface AbnormalBillDisposeMapper extends BaseMapper * - * @author 赵嘉伟 - * @since 2021-07-23 + * @author zjw + * @since 2021-08-12 */ @Repository public interface AbnormalBillLogMapper extends BaseMapper { diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java index beae589f..2ec563fb 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java @@ -14,8 +14,8 @@ import java.time.LocalDateTime; * 异常单处置 *

* - * @author robert - * @since 2021-06-29 + * @author zjw + * @since 2021-08-12 */ @TableName("Z_ABNORMAL_BILL_DISPOSE") @@ -27,7 +27,7 @@ public class AbnormalBillDispose extends Model { /** * 主键 */ - @TableId(value = "HANDLE", type = IdType.INPUT) + @TableId(value = "HANDLE", type = IdType.INPUT) private String handle; /** * 站点 @@ -90,7 +90,11 @@ public class AbnormalBillDispose extends Model { @TableField("RESOLVE_DATE_TIME") private LocalDateTime resolveDateTime; /** - * 异常方案 + * 异常方案 一个字母的质量异常响应，二个字母的是设备异常响应 + X | 线下换料 , S | 试装, R | 让步放心, C | 产品报废 , +P | 配作 , F | 返修 , + + CG 常规维修,JH 计划维修,DX 大项修 */ @TableField("ABNORMAL_METHOD") private String abnormalMethod; @@ -110,10 +114,10 @@ public class AbnormalBillDispose extends Model { @TableField("RESOLVE_REMARK") private String resolveRemark; /** - * 发送用户 + * 发送用户组 */ - @TableField("RESOLVE_SEND_USER") - private String resolveSendUser; + @TableField("RESOLVE_SEND_USER_GROUP") + private String resolveSendUserGroup; /** * 闭环关闭填报人 */ @@ -292,12 +296,12 @@ public class AbnormalBillDispose extends Model { this.resolveRemark = resolveRemark; } - public String getResolveSendUser() { - return resolveSendUser; + public String getResolveSendUserGroup() { + return resolveSendUserGroup; } - public void setResolveSendUser(String resolveSendUser) { - this.resolveSendUser = resolveSendUser; + public void setResolveSendUserGroup(String resolveSendUserGroup) { + this.resolveSendUserGroup = resolveSendUserGroup; } public String getClosedUser() { @@ -398,7 +402,7 @@ public static final String RESOLVE_SHOP_ORDER = "RESOLVE_SHOP_ORDER"; public static final String RESOLVE_REMARK = "RESOLVE_REMARK"; -public static final String RESOLVE_SEND_USER = "RESOLVE_SEND_USER"; +public static final String RESOLVE_SEND_USER_GROUP = "RESOLVE_SEND_USER_GROUP"; public static final String CLOSED_USER = "CLOSED_USER"; @@ -442,7 +446,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; ", routerBo = " + routerBo + ", resolveShopOrder = " + resolveShopOrder + ", resolveRemark = " + resolveRemark + - ", resolveSendUser = " + resolveSendUser + + ", resolveSendUserGroup = " + resolveSendUserGroup + ", closedUser = " + closedUser + ", closedDateTime = " + closedDateTime + ", abnormalReason = " + abnormalReason + diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java index 8e503406..eb89b0af 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java @@ -14,8 +14,8 @@ import java.time.LocalDateTime; * 异常单记录表 *

* - * @author 赵嘉伟 - * @since 2021-07-23 + * @author zjw + * @since 2021-08-12 */ @TableName("Z_ABNORMAL_BILL_LOG") @@ -260,10 +260,10 @@ public class AbnormalBillLog extends Model { @TableField("RESOLVE_REMARK") private String resolveRemark; /** - * 发送用户 + * 发送用户组 */ - @TableField("RESOLVE_SEND_USER") - private String resolveSendUser; + @TableField("RESOLVE_SEND_USER_GROUP") + private String resolveSendUserGroup; /** * 闭环关闭填报人 */ @@ -692,12 +692,12 @@ public class AbnormalBillLog extends Model { this.resolveRemark = resolveRemark; } - public String getResolveSendUser() { - return resolveSendUser; + public String getResolveSendUserGroup() { + return resolveSendUserGroup; } - public void setResolveSendUser(String resolveSendUser) { - this.resolveSendUser = resolveSendUser; + public void setResolveSendUserGroup(String resolveSendUserGroup) { + this.resolveSendUserGroup = resolveSendUserGroup; } public String getClosedUser() { @@ -874,7 +874,7 @@ public static final String RESOLVE_SHOP_ORDER = "RESOLVE_SHOP_ORDER"; public static final String RESOLVE_REMARK = "RESOLVE_REMARK"; -public static final String RESOLVE_SEND_USER = "RESOLVE_SEND_USER"; +public static final String RESOLVE_SEND_USER_GROUP = "RESOLVE_SEND_USER_GROUP"; public static final String CLOSED_USER = "CLOSED_USER"; @@ -952,7 +952,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; ", routerBo = " + routerBo + ", resolveShopOrder = " + resolveShopOrder + ", resolveRemark = " + resolveRemark + - ", resolveSendUser = " + resolveSendUser + + ", resolveSendUserGroup = " + resolveSendUserGroup + ", closedUser = " + closedUser + ", closedDateTime = " + closedDateTime + ", abnormalReason = " + abnormalReason + diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java index a8018ed9..ad65bcf1 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java @@ -12,8 +12,8 @@ import java.util.List; * 异常单处置 服务类 *

* - * @author robert - * @since 2021-06-29 + * @author zjw + * @since 2021-08-12 */ public interface AbnormalBillDisposeService extends IService { diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java index 9bdf6cdf..1b91b704 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java @@ -15,8 +15,8 @@ import java.util.List; * 异常单记录表 服务类 *

* - * @author 赵嘉伟 - * @since 2021-07-23 + * @author zjw + * @since 2021-08-12 */ public interface AbnormalBillLogService extends IService { 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 49aaccda..df5ab507 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 @@ -85,7 +85,7 @@ public interface AbnormalBillService extends IService { * 方案确认 * @param abnormalBill */ - void programConfirm(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose); + void programConfirm(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose); /** * 判责提交 diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java index ebb7af58..a017bbc4 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java @@ -17,8 +17,8 @@ import java.util.List; * 异常单处置 服务实现类 *

* - * @author robert - * @since 2021-06-29 + * @author zjw + * @since 2021-08-12 */ @Service @Transactional(rollbackFor = Exception.class) 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 84205ff7..366c9fe4 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 @@ -13,10 +13,11 @@ import com.foreverwin.mesnac.anomaly.service.*; import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.util.StringUtil; -import com.foreverwin.mesnac.meapi.mapper.NwaUserMapper; import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper; +import com.foreverwin.mesnac.meapi.model.NwaUser; import com.foreverwin.mesnac.meapi.model.Router; import com.foreverwin.mesnac.meapi.model.ShopOrder; +import com.foreverwin.mesnac.meapi.service.NwaUserService; import com.foreverwin.mesnac.meapi.service.RouterService; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; @@ -34,8 +35,8 @@ import java.util.List; * 异常单记录表 服务实现类 *

* - * @author 赵嘉伟 - * @since 2021-07-23 + * @author zjw + * @since 2021-08-12 */ @Service @Transactional(rollbackFor = Exception.class) @@ -45,6 +46,8 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, AbnormalBillLog abnormalBillLog) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -112,12 +117,9 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl strings = Arrays.asList(split); - int length = nwaUserMapper.checkUser(site, strings); - if(length != strings.size()){ - throw BusinessException.build("发送用户填报错误"); - } + String resolveSendUserGroup = abnormalBillDispose.getResolveSendUserGroup(); + List nwaUsers = nwaUserService.checkUserGroup(site, resolveSendUserGroup); + if(abnormalBillLogMapper.selectById(abnormalBillLog.getHandle()) == null){ @@ -178,4 +180,7 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl strings = Arrays.asList(split); - int length = nwaUserMapper.checkUser(site, strings); - if(length != strings.size()){ - throw BusinessException.build("发送用户填报错误"); - } + nwaUserService.checkUserGroup(site,abnormalBillDispose.getResolveSendUserGroup()); //设置解决方案的处理时间和处理人 @@ -925,7 +924,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl nwaUsers = nwaUserService.checkUserGroup(site,abnormalMessage.getSendUserGroup()); + List nwaUsers = nwaUserService.checkUserGroup(site,abnormalMessage.getSendUserGroup()); StringBuilder sendUsers = new StringBuilder(); for (int i = 0; i < nwaUsers.size(); i++) { if(i == (nwaUsers.size() - 1)){ @@ -1060,6 +1059,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl getScrapDtoBysfc(String site, String sfc) { //判断该产品条码是否已经报废 -// if(sfcScrapMapper.selectById(HandleEnum.SFC_SCRAP.getHandle(site,sfc)) != null){ -// throw new BaseException("该产品条码已经报废"); -// } if(this.jgProductionIsScrap(site,sfc)){ throw new BaseException("该产品条码的异常方案不是报废"); } return abnormalBillMapper.findScrapDtoBySfc(site, sfc); } - - - - } \ No newline at end of file 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 3fd796b2..759f5fde 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 @@ -142,7 +142,7 @@ public class AbnormalPlanServiceImpl extends ServiceImpl - + @@ -21,7 +21,7 @@ - + @@ -32,6 +32,8 @@ + + @@ -69,12 +71,17 @@ + + - HANDLE, SITE, ABNORMAL_BILL_BO, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, DUTY_TYPE, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME + HANDLE, SITE, ABNORMAL_BILL_BO, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, DUTY_TYPE, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER_GROUP, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME + + 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,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 ,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, - ZABD.ABNORMAL_REASON ABNORMAL_REASON,ZABD.BEFORE_MEASURE BEFORE_MEASURE,"MAP".VALUE "MAP",listagg(ZANC.NC_CODE_GROUP || '/'||ZANC.NC_CODE || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE, + 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,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 , + NWA2.FULL_NAME 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_GROUP RESOLVE_SEND_USER_GROUP, + ZABD.ABNORMAL_REASON ABNORMAL_REASON,ZABD.BEFORE_MEASURE BEFORE_MEASURE,"MAP".VALUE "MAP",listagg(ZANC.NC_CODE_GROUP || '/'||ZANC.NC_CODE || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE, ZABD.ROUTER_BO ROUTER_BO,ZAB.OPERATION OPERATION,I.HANDLE ITEM_BO,ZAB.REPORT_SEND_USER_GROUP REPORT_SEND_USER_GROUP FROM Z_ABNORMAL_BILL ZAB - LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE = ZABD.ABNORMAL_BILL_BO - INNER JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO - LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = #{locale} - INNER JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZAB.SHOP_ORDER AND SO.SITE = ZAB.SITE - 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} - LEFT JOIN Z_NWA_USER NWA ON NWA.USER_NAME = ZAB.PB_USER AND NWA.SITE = ZAB.SITE - LEFT JOIN NC_GROUP NG ON NG.NC_GROUP = ZANC.NC_CODE_GROUP AND NG.SITE = ZAB.SITE - LEFT JOIN ROUTER R ON SUBSTR(R.HANDLE,1,INSTR(R.HANDLE,',',-1)-1) = SUBSTR(ZABD.ROUTER_BO,1,INSTR(ZABD.ROUTER_BO,',',-1)-1) AND R.CURRENT_REVISION = 'true' + LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE = ZABD.ABNORMAL_BILL_BO + INNER JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO + LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = #{locale} + INNER JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZAB.SHOP_ORDER AND SO.SITE = ZAB.SITE + 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} + LEFT JOIN Z_NWA_USER NWA ON NWA.USER_NAME = ZAB.PB_USER AND NWA.SITE = ZAB.SITE + LEFT JOIN Z_NWA_USER NWA2 ON NWA2.USER_NAME = ZAB.INSPECTOR AND NWA2.SITE = ZAB.SITE + LEFT JOIN NC_GROUP NG ON NG.NC_GROUP = ZANC.NC_CODE_GROUP AND NG.SITE = ZAB.SITE + LEFT JOIN ROUTER R ON SUBSTR(R.HANDLE,1,INSTR(R.HANDLE,',',-1)-1) = SUBSTR(ZABD.ROUTER_BO,1,INSTR(ZABD.ROUTER_BO,',',-1)-1) AND R.CURRENT_REVISION = 'true' @@ -655,17 +736,17 @@ 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_GRADE ,NWA.FULL_NAME ,ZAB.PB_QTY ,ZAB.DISCOVER , - 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 , - ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION,I.HANDLE, - ZAB.REPORT_SEND_USER_GROUP + 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_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 , + 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_GROUP , + ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION,I.HANDLE, + ZAB.REPORT_SEND_USER_GROUP diff --git a/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml index e0fe68f7..28ec07f0 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml @@ -51,7 +51,7 @@ - + @@ -66,7 +66,7 @@ - HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, NC_CODE_GROUP, 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, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME + HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, NC_CODE_GROUP, 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, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER_GROUP, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME @@ -147,7 +147,7 @@ AND ROUTER_BO=#{ew.entity.routerBo} AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} AND RESOLVE_REMARK=#{ew.entity.resolveRemark} - AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup} AND CLOSED_USER=#{ew.entity.closedUser} AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} AND ABNORMAL_REASON=#{ew.entity.abnormalReason} @@ -215,7 +215,7 @@ AND ROUTER_BO=#{ew.entity.routerBo} AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} AND RESOLVE_REMARK=#{ew.entity.resolveRemark} - AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup} AND CLOSED_USER=#{ew.entity.closedUser} AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} AND ABNORMAL_REASON=#{ew.entity.abnormalReason} @@ -291,7 +291,7 @@ AND ROUTER_BO=#{ew.entity.routerBo} AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} AND RESOLVE_REMARK=#{ew.entity.resolveRemark} - AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup} AND CLOSED_USER=#{ew.entity.closedUser} AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} AND ABNORMAL_REASON=#{ew.entity.abnormalReason} @@ -367,7 +367,7 @@ AND ROUTER_BO=#{ew.entity.routerBo} AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} AND RESOLVE_REMARK=#{ew.entity.resolveRemark} - AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup} AND CLOSED_USER=#{ew.entity.closedUser} AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} AND ABNORMAL_REASON=#{ew.entity.abnormalReason} @@ -443,7 +443,7 @@ AND ROUTER_BO=#{ew.entity.routerBo} AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} AND RESOLVE_REMARK=#{ew.entity.resolveRemark} - AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup} AND CLOSED_USER=#{ew.entity.closedUser} AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} AND ABNORMAL_REASON=#{ew.entity.abnormalReason} @@ -519,7 +519,7 @@ AND ROUTER_BO=#{ew.entity.routerBo} AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} AND RESOLVE_REMARK=#{ew.entity.resolveRemark} - AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup} AND CLOSED_USER=#{ew.entity.closedUser} AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} AND ABNORMAL_REASON=#{ew.entity.abnormalReason} @@ -595,7 +595,7 @@ AND ROUTER_BO=#{ew.entity.routerBo} AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} AND RESOLVE_REMARK=#{ew.entity.resolveRemark} - AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup} AND CLOSED_USER=#{ew.entity.closedUser} AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} AND ABNORMAL_REASON=#{ew.entity.abnormalReason} @@ -667,7 +667,7 @@ ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, - RESOLVE_SEND_USER, + RESOLVE_SEND_USER_GROUP, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, @@ -727,7 +727,7 @@ #{routerBo}, #{resolveShopOrder}, #{resolveRemark}, - #{resolveSendUser}, + #{resolveSendUserGroup}, #{closedUser}, #{closedDateTime}, #{abnormalReason}, @@ -794,7 +794,7 @@ #{routerBo}, #{resolveShopOrder}, #{resolveRemark}, - #{resolveSendUser}, + #{resolveSendUserGroup}, #{closedUser}, #{closedDateTime}, #{abnormalReason}, @@ -857,7 +857,7 @@ ROUTER_BO=#{et.routerBo}, RESOLVE_SHOP_ORDER=#{et.resolveShopOrder}, RESOLVE_REMARK=#{et.resolveRemark}, - RESOLVE_SEND_USER=#{et.resolveSendUser}, + RESOLVE_SEND_USER_GROUP=#{et.resolveSendUserGroup}, CLOSED_USER=#{et.closedUser}, CLOSED_DATE_TIME=#{et.closedDateTime}, ABNORMAL_REASON=#{et.abnormalReason}, @@ -920,7 +920,7 @@ ROUTER_BO=#{et.routerBo}, RESOLVE_SHOP_ORDER=#{et.resolveShopOrder}, RESOLVE_REMARK=#{et.resolveRemark}, - RESOLVE_SEND_USER=#{et.resolveSendUser}, + RESOLVE_SEND_USER_GROUP=#{et.resolveSendUserGroup}, CLOSED_USER=#{et.closedUser}, CLOSED_DATE_TIME=#{et.closedDateTime}, ABNORMAL_REASON=#{et.abnormalReason}, @@ -983,7 +983,7 @@ ROUTER_BO=#{et.routerBo}, RESOLVE_SHOP_ORDER=#{et.resolveShopOrder}, RESOLVE_REMARK=#{et.resolveRemark}, - RESOLVE_SEND_USER=#{et.resolveSendUser}, + RESOLVE_SEND_USER_GROUP=#{et.resolveSendUserGroup}, CLOSED_USER=#{et.closedUser}, CLOSED_DATE_TIME=#{et.closedDateTime}, ABNORMAL_REASON=#{et.abnormalReason}, @@ -1045,7 +1045,7 @@ AND ROUTER_BO=#{ew.entity.routerBo} AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} AND RESOLVE_REMARK=#{ew.entity.resolveRemark} - AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup} AND CLOSED_USER=#{ew.entity.closedUser} AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} AND ABNORMAL_REASON=#{ew.entity.abnormalReason} @@ -1138,7 +1138,7 @@ AND ROUTER_BO=#{ew.entity.routerBo} AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder} AND RESOLVE_REMARK=#{ew.entity.resolveRemark} - AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser} + AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup} AND CLOSED_USER=#{ew.entity.closedUser} AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime} AND ABNORMAL_REASON=#{ew.entity.abnormalReason} @@ -1167,7 +1167,6 @@ - - diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index 24f60e19..ed19ce64 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -987,7 +987,7 @@ SELECT S.SFC SFC, S2.STATUS STATUS, SUBSTR(SS.OPERATION_BO ,INSTR(SS.OPERATION_BO ,',',1)+1,(INSTR(SS.OPERATION_BO ,'#',1)-1)-(INSTR(SS.OPERATION_BO ,',',1)+1)) || '/' || SS.STEP_ID OPERATION, - ZSD.RESRCE RESRCE,ZSD.SHOP_ORDER SHOP_ORDER, + ZSD2.RESRCE RESRCE,ZSD.SHOP_ORDER SHOP_ORDER, CASE WHEN I.ITEM != 'NULL' THEN I.ITEM || '/' || I.REVISION END ITEM, CASE WHEN R.ROUTER != 'NULL' THEN R.ROUTER || '/' || R.REVISION END ROUTER , CASE WHEN B.BOM != 'NULL' THEN B.BOM || '/' || B.REVISION END BOM, @@ -1001,6 +1001,8 @@ INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0) INNER JOIN STATUS S2 ON S2.HANDLE = S.STATUS_BO INNER JOIN Z_SFC_DISPATCH ZSD ON ZSD.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID + LEFT JOIN Z_SFC_DISPATCH ZSD2 ON ZSD2.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID + AND ZSD2.DISPATCH_STATUS IN ('START','COMPLETE') LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER AND SO.SITE = S.SITE LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO LEFT JOIN ROUTER R ON R.HANDLE = ZSD.ROUTER_BO diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ProdReadyTaskMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ProdReadyTaskMapper.java index 1110e9c9..d061af62 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ProdReadyTaskMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ProdReadyTaskMapper.java @@ -20,7 +20,7 @@ import java.util.Map; @Repository public interface ProdReadyTaskMapper extends BaseMapper { - List getTaskList(@Param("entity")ProdReadyTask prodReadyTask, @Param("locale") String locale); + List getTaskList(@Param("entity")ProdReadyTask prodReadyTask, @Param("locale") String locale,@Param("admin") Integer admin,@Param("user") String user); ProdReadyTask loadProExecute(@Param("site")String site, @Param("taskBo")String taskBo, @Param("locale") String language); diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java index 5bba7756..d88b0af9 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java @@ -23,6 +23,8 @@ import com.foreverwin.mesnac.common.util.ActiveMQUtil; import com.foreverwin.mesnac.common.util.DateUtil; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.dto.BomComponentDto; +import com.foreverwin.mesnac.meapi.dto.RouterStepDto; +import com.foreverwin.mesnac.meapi.mapper.UserGroupMapper; import com.foreverwin.mesnac.meapi.mapper.WorkCenterMapper; import com.foreverwin.mesnac.meapi.model.*; import com.foreverwin.mesnac.meapi.service.*; @@ -76,12 +78,18 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl getTaskList(ProdReadyTask prodReadyTask) { - return prodReadyTaskMapper.getTaskList(prodReadyTask, LocaleContextHolder.getLocale().getLanguage()); + String user = CommonMethods.getUser(); + String site = CommonMethods.getSite(); + Integer admin = userGroupMapper.getUserGroupByUser(HandleEnum.USER.getHandle(site, user), new UserGroupBOHandle(site, "ADMINISTRATORS").getValue()); + return prodReadyTaskMapper.getTaskList(prodReadyTask, LocaleContextHolder.getLocale().getLanguage(),admin,user); } @Override @@ -380,7 +391,21 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl stepOperationList = routerStepService.findRouterOperationByRouterBo(site, router.getHandle()); + for (int i = 0; i < stepOperationList.size(); i++) { + RouterStepDto stepOperation = stepOperationList.get(i); + if (stepOperation.getStepId().equals(prodReadyTask.getStepId())) { + seq = i; + } + } + if (seq != stepOperationList.size()-1) { + RouterStepDto stepOperation = stepOperationList.get(seq + 1); + labelPrintDto.setOperation(stepOperation.getOperationDesc()); + + } labelPrintDtoList.add(labelPrintDto); printData = JSON.toJSONString(labelPrintDtoList); //打印记录 diff --git a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml index 662c74e7..e0d8ccc8 100644 --- a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml +++ b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml @@ -637,6 +637,7 @@ LEFT JOIN ITEM_T ITT ON ITT.ITEM_BO = I.HANDLE AND ITT.LOCALE =#{locale} JOIN RESRCE RES ON RES.RESRCE = zprt.RESRCE AND RES.SITE = zprt.SITE WHERE ZPRT.SITE=#{entity.site} + AND ZSD.EMPLOYEE LIKE '%${user}%' AND ZPRT.WORK_CENTER=#{entity.workCenter} AND ZPRT.RESRCE=#{entity.resrce} AND ZSD.DISPATCH_NO=#{entity.dispatchNo} diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java index 4270fdc0..69b4277c 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java @@ -1,24 +1,24 @@ package com.foreverwin.mesnac.dispatch.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.common.erp.ZprodordconfStruIn; import com.foreverwin.mesnac.common.erp.ZprodordconfStruOut; import com.foreverwin.mesnac.common.erp.holders.TableOfZprodordconfStruInHolder; import com.foreverwin.mesnac.common.erp.holders.TableOfZprodordconfStruOutHolder; import com.foreverwin.mesnac.common.util.ERPAPI; -import com.foreverwin.modular.core.util.R; -import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.mesnac.dispatch.model.ItemBatch; +import com.foreverwin.mesnac.dispatch.service.ItemBatchService; import com.foreverwin.modular.core.util.CommonMethods; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.web.bind.annotation.RequestMapping; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import com.foreverwin.mesnac.dispatch.service.ItemBatchService; -import com.foreverwin.mesnac.dispatch.model.ItemBatch; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; -import java.util.List; /** * @@ -32,6 +32,14 @@ public class ItemBatchController { @Autowired public ItemBatchService itemBatchService; + @ResponseBody + @GetMapping("/getItemBatch") + public R getItemBatch(ItemBatch itemBatch){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + itemBatch.setSite(CommonMethods.getSite()); + queryWrapper.setEntity(itemBatch); + return R.ok(itemBatchService.list(queryWrapper)); + } /** * 分页查询数据 * diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java index d0dbe19b..62e78053 100644 --- a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java +++ b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java @@ -1,7 +1,6 @@ package com.foreverwin.mesnac.integration.service.impl; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.constant.CustomFieldConstant; import com.foreverwin.mesnac.common.dto.LabelPrintDto; @@ -22,6 +21,7 @@ import com.sap.me.common.MaterialType; import com.sap.me.common.ObjectReference; import com.sap.me.common.ProcurementType; import com.sap.me.demand.*; +import com.sap.me.productdefinition.RouterStep; import com.sap.me.productdefinition.*; import com.sap.me.production.ChangeProductionServiceInterface; import com.visiprise.globalization.DateGlobalizationServiceInterface; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterStepController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterStepController.java new file mode 100644 index 00000000..5d335779 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterStepController.java @@ -0,0 +1,135 @@ +package com.foreverwin.mesnac.meapi.controller; + +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.meapi.service.RouterStepService; +import com.foreverwin.mesnac.meapi.model.RouterStep; +import java.util.List; + +/** + * + * @author Philip + * @since 2021-08-12 + */ +@RestController +@RequestMapping("/ROUTER-STEP") +public class RouterStepController { + + @Autowired + public RouterStepService routerStepService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getRouterStepById(@PathVariable String id) { + return R.ok( routerStepService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getRouterStepList(RouterStep routerStep){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(routerStep); + result = routerStepService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, RouterStep routerStep){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(routerStep); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(RouterStep::getHandle, frontPage.getGlobalQuery()) + .or().like(RouterStep::getRouterBo, frontPage.getGlobalQuery()) + .or().like(RouterStep::getStepId, frontPage.getGlobalQuery()) + .or().like(RouterStep::getDescription, frontPage.getGlobalQuery()) + .or().like(RouterStep::getRework, frontPage.getGlobalQuery()) + .or().like(RouterStep::getQueueDecisionType, frontPage.getGlobalQuery()) + .or().like(RouterStep::getRouterCompGbo, frontPage.getGlobalQuery()) + .or().like(RouterStep::getReportingStep, frontPage.getGlobalQuery()) + .or().like(RouterStep::getReportingCenterBo, frontPage.getGlobalQuery()) + .or().like(RouterStep::getTabularStepType, frontPage.getGlobalQuery()) + .or().like(RouterStep::getScrapReportingStep, frontPage.getGlobalQuery()) + .or().like(RouterStep::getIsLastReportingStep, frontPage.getGlobalQuery()) + .or().like(RouterStep::getErpSequence, frontPage.getGlobalQuery()) + .or().like(RouterStep::getErpControlKeyBo, frontPage.getGlobalQuery()) + .or().like(RouterStep::getErpWorkCenterBo, frontPage.getGlobalQuery()) + .or().like(RouterStep::getErpInspectionComplete, frontPage.getGlobalQuery()) + .or().like(RouterStep::getErpOperation, frontPage.getGlobalQuery()) + .or().like(RouterStep::getOperationActivityId, frontPage.getGlobalQuery()) + ); + } + result = routerStepService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param routerStep 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody RouterStep routerStep) { + return R.ok(routerStepService.save(routerStep)); + } + + /** + * 修改 + * @param routerStep 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody RouterStep routerStep) { + return R.ok(routerStepService.updateById(routerStep)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(routerStepService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(routerStepService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java new file mode 100644 index 00000000..dcb43d5a --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/RouterStepDto.java @@ -0,0 +1,33 @@ +package com.foreverwin.mesnac.meapi.dto; + +import com.foreverwin.mesnac.meapi.model.RouterStep; + +public class RouterStepDto extends RouterStep { + private String operation; + private String operationBo; + private String operationDesc; + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } + + public String getOperationBo() { + return operationBo; + } + + public void setOperationBo(String operationBo) { + this.operationBo = operationBo; + } + + public String getOperationDesc() { + return operationDesc; + } + + public void setOperationDesc(String operationDesc) { + this.operationDesc = operationDesc; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterStepMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterStepMapper.java new file mode 100644 index 00000000..53cef2df --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterStepMapper.java @@ -0,0 +1,23 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.meapi.dto.RouterStepDto; +import com.foreverwin.mesnac.meapi.model.RouterStep; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +@Repository +public interface RouterStepMapper extends BaseMapper { + + List findRouterOperationByRouterBo(@Param("site") String site, @Param("routerBo") String routerBO, @Param("locale")String locale); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java index b6259730..2fe80980 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java @@ -26,4 +26,5 @@ public interface UserGroupMapper extends BaseMapper { UserGroup getCustomFieldByGroup(@Param("site")String site, @Param("userGroup")String userGroup); + Integer getUserGroupByUser(@Param("userBO")String userBO,@Param("userGroupBO")String userGroupBO); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterStep.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterStep.java new file mode 100644 index 00000000..28884a2a --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterStep.java @@ -0,0 +1,284 @@ +package com.foreverwin.mesnac.meapi.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author Philip + * @since 2021-08-12 + */ + +@TableName("ROUTER_STEP") + +public class RouterStep extends Model { + + private static final long serialVersionUID = 1L; + + @TableField("HANDLE") + private String handle; + @TableField("ROUTER_BO") + private String routerBo; + @TableField("STEP_ID") + private String stepId; + @TableField("DESCRIPTION") + private String description; + @TableField("REWORK") + private String rework; + @TableField("QUEUE_DECISION_TYPE") + private String queueDecisionType; + @TableField("ROUTER_COMP_GBO") + private String routerCompGbo; + @TableField("REPORTING_STEP") + private String reportingStep; + @TableField("SEQUENCE") + private Long sequence; + @TableField("REPORTING_CENTER_BO") + private String reportingCenterBo; + @TableField("TABULAR_STEP_TYPE") + private String tabularStepType; + @TableField("SCRAP_REPORTING_STEP") + private String scrapReportingStep; + @TableField("IS_LAST_REPORTING_STEP") + private String isLastReportingStep; + @TableField("ERP_SEQUENCE") + private String erpSequence; + @TableField("ERP_CONTROL_KEY_BO") + private String erpControlKeyBo; + @TableField("ERP_WORK_CENTER_BO") + private String erpWorkCenterBo; + @TableField("ERP_INSPECTION_COMPLETE") + private String erpInspectionComplete; + @TableField("ERP_OPERATION") + private String erpOperation; + @TableField("OPERATION_ACTIVITY_ID") + private String operationActivityId; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getRouterBo() { + return routerBo; + } + + public void setRouterBo(String routerBo) { + this.routerBo = routerBo; + } + + public String getStepId() { + return stepId; + } + + public void setStepId(String stepId) { + this.stepId = stepId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getRework() { + return rework; + } + + public void setRework(String rework) { + this.rework = rework; + } + + public String getQueueDecisionType() { + return queueDecisionType; + } + + public void setQueueDecisionType(String queueDecisionType) { + this.queueDecisionType = queueDecisionType; + } + + public String getRouterCompGbo() { + return routerCompGbo; + } + + public void setRouterCompGbo(String routerCompGbo) { + this.routerCompGbo = routerCompGbo; + } + + public String getReportingStep() { + return reportingStep; + } + + public void setReportingStep(String reportingStep) { + this.reportingStep = reportingStep; + } + + public Long getSequence() { + return sequence; + } + + public void setSequence(Long sequence) { + this.sequence = sequence; + } + + public String getReportingCenterBo() { + return reportingCenterBo; + } + + public void setReportingCenterBo(String reportingCenterBo) { + this.reportingCenterBo = reportingCenterBo; + } + + public String getTabularStepType() { + return tabularStepType; + } + + public void setTabularStepType(String tabularStepType) { + this.tabularStepType = tabularStepType; + } + + public String getScrapReportingStep() { + return scrapReportingStep; + } + + public void setScrapReportingStep(String scrapReportingStep) { + this.scrapReportingStep = scrapReportingStep; + } + + public String getIsLastReportingStep() { + return isLastReportingStep; + } + + public void setIsLastReportingStep(String isLastReportingStep) { + this.isLastReportingStep = isLastReportingStep; + } + + public String getErpSequence() { + return erpSequence; + } + + public void setErpSequence(String erpSequence) { + this.erpSequence = erpSequence; + } + + public String getErpControlKeyBo() { + return erpControlKeyBo; + } + + public void setErpControlKeyBo(String erpControlKeyBo) { + this.erpControlKeyBo = erpControlKeyBo; + } + + public String getErpWorkCenterBo() { + return erpWorkCenterBo; + } + + public void setErpWorkCenterBo(String erpWorkCenterBo) { + this.erpWorkCenterBo = erpWorkCenterBo; + } + + public String getErpInspectionComplete() { + return erpInspectionComplete; + } + + public void setErpInspectionComplete(String erpInspectionComplete) { + this.erpInspectionComplete = erpInspectionComplete; + } + + public String getErpOperation() { + return erpOperation; + } + + public void setErpOperation(String erpOperation) { + this.erpOperation = erpOperation; + } + + public String getOperationActivityId() { + return operationActivityId; + } + + public void setOperationActivityId(String operationActivityId) { + this.operationActivityId = operationActivityId; + } + +public static final String HANDLE = "HANDLE"; + +public static final String ROUTER_BO = "ROUTER_BO"; + +public static final String STEP_ID = "STEP_ID"; + +public static final String DESCRIPTION = "DESCRIPTION"; + +public static final String REWORK = "REWORK"; + +public static final String QUEUE_DECISION_TYPE = "QUEUE_DECISION_TYPE"; + +public static final String ROUTER_COMP_GBO = "ROUTER_COMP_GBO"; + +public static final String REPORTING_STEP = "REPORTING_STEP"; + +public static final String SEQUENCE = "SEQUENCE"; + +public static final String REPORTING_CENTER_BO = "REPORTING_CENTER_BO"; + +public static final String TABULAR_STEP_TYPE = "TABULAR_STEP_TYPE"; + +public static final String SCRAP_REPORTING_STEP = "SCRAP_REPORTING_STEP"; + +public static final String IS_LAST_REPORTING_STEP = "IS_LAST_REPORTING_STEP"; + +public static final String ERP_SEQUENCE = "ERP_SEQUENCE"; + +public static final String ERP_CONTROL_KEY_BO = "ERP_CONTROL_KEY_BO"; + +public static final String ERP_WORK_CENTER_BO = "ERP_WORK_CENTER_BO"; + +public static final String ERP_INSPECTION_COMPLETE = "ERP_INSPECTION_COMPLETE"; + +public static final String ERP_OPERATION = "ERP_OPERATION"; + +public static final String OPERATION_ACTIVITY_ID = "OPERATION_ACTIVITY_ID"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "RouterStep{" + + "handle = " + handle + + ", routerBo = " + routerBo + + ", stepId = " + stepId + + ", description = " + description + + ", rework = " + rework + + ", queueDecisionType = " + queueDecisionType + + ", routerCompGbo = " + routerCompGbo + + ", reportingStep = " + reportingStep + + ", sequence = " + sequence + + ", reportingCenterBo = " + reportingCenterBo + + ", tabularStepType = " + tabularStepType + + ", scrapReportingStep = " + scrapReportingStep + + ", isLastReportingStep = " + isLastReportingStep + + ", erpSequence = " + erpSequence + + ", erpControlKeyBo = " + erpControlKeyBo + + ", erpWorkCenterBo = " + erpWorkCenterBo + + ", erpInspectionComplete = " + erpInspectionComplete + + ", erpOperation = " + erpOperation + + ", operationActivityId = " + operationActivityId + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepService.java new file mode 100644 index 00000000..33fbb581 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterStepService.java @@ -0,0 +1,31 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.meapi.dto.RouterStepDto; +import com.foreverwin.mesnac.meapi.model.RouterStep; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +public interface RouterStepService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, RouterStep routerStep); + + List selectList(RouterStep routerStep); + + List findRouterOperationByRouterBo(String site, String handle); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java index e5f1a6ba..dfcf201a 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java @@ -25,4 +25,6 @@ public interface UserGroupService extends IService { IPage selectPage(FrontPage frontPage, UserGroup userGroup); List selectList(UserGroup userGroup); + + Integer getUserGroupByUser(String userBO,String userGroupBO); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepServiceImpl.java new file mode 100644 index 00000000..a9477ff9 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterStepServiceImpl.java @@ -0,0 +1,53 @@ +package com.foreverwin.mesnac.meapi.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.mesnac.meapi.dto.RouterStepDto; +import com.foreverwin.mesnac.meapi.mapper.RouterStepMapper; +import com.foreverwin.mesnac.meapi.model.RouterStep; +import com.foreverwin.mesnac.meapi.service.RouterStepService; +import com.foreverwin.modular.core.util.FrontPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 服务实现类 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class RouterStepServiceImpl extends ServiceImpl implements RouterStepService { + + + @Autowired + private RouterStepMapper routerStepMapper; + + @Override + public IPage selectPage(FrontPage frontPage, RouterStep routerStep) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(routerStep); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(RouterStep routerStep) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(routerStep); + return super.list(queryWrapper); + } + + @Override + public List findRouterOperationByRouterBo(String site, String routerBO) { + return routerStepMapper.findRouterOperationByRouterBo( site, routerBO, LocaleContextHolder.getLocale().getLanguage()); + } + + +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java index ddb7b841..4207fb3d 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java @@ -12,9 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import java.util.List; + /** *

- * 服务实现类 + * 服务实现类 *

* * @author robert @@ -42,5 +43,9 @@ public class UserGroupServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, ROUTER_BO, STEP_ID, DESCRIPTION, REWORK, QUEUE_DECISION_TYPE, ROUTER_COMP_GBO, REPORTING_STEP, SEQUENCE, REPORTING_CENTER_BO, TABULAR_STEP_TYPE, SCRAP_REPORTING_STEP, IS_LAST_REPORTING_STEP, ERP_SEQUENCE, ERP_CONTROL_KEY_BO, ERP_WORK_CENTER_BO, ERP_INSPECTION_COMPLETE, ERP_OPERATION, OPERATION_ACTIVITY_ID + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO ROUTER_STEP + + HANDLE, + ROUTER_BO, + STEP_ID, + DESCRIPTION, + REWORK, + QUEUE_DECISION_TYPE, + ROUTER_COMP_GBO, + REPORTING_STEP, + SEQUENCE, + REPORTING_CENTER_BO, + TABULAR_STEP_TYPE, + SCRAP_REPORTING_STEP, + IS_LAST_REPORTING_STEP, + ERP_SEQUENCE, + ERP_CONTROL_KEY_BO, + ERP_WORK_CENTER_BO, + ERP_INSPECTION_COMPLETE, + ERP_OPERATION, + OPERATION_ACTIVITY_ID, + VALUES + + #{handle}, + #{routerBo}, + #{stepId}, + #{description}, + #{rework}, + #{queueDecisionType}, + #{routerCompGbo}, + #{reportingStep}, + #{sequence}, + #{reportingCenterBo}, + #{tabularStepType}, + #{scrapReportingStep}, + #{isLastReportingStep}, + #{erpSequence}, + #{erpControlKeyBo}, + #{erpWorkCenterBo}, + #{erpInspectionComplete}, + #{erpOperation}, + #{operationActivityId}, + + + + + INSERT INTO ROUTER_STEP + + + VALUES + + #{handle}, + #{routerBo}, + #{stepId}, + #{description}, + #{rework}, + #{queueDecisionType}, + #{routerCompGbo}, + #{reportingStep}, + #{sequence}, + #{reportingCenterBo}, + #{tabularStepType}, + #{scrapReportingStep}, + #{isLastReportingStep}, + #{erpSequence}, + #{erpControlKeyBo}, + #{erpWorkCenterBo}, + #{erpInspectionComplete}, + #{erpOperation}, + #{operationActivityId}, + + + + + + + + + + UPDATE ROUTER_STEP + HANDLE=#{et.handle}, + ROUTER_BO=#{et.routerBo}, + STEP_ID=#{et.stepId}, + DESCRIPTION=#{et.description}, + REWORK=#{et.rework}, + QUEUE_DECISION_TYPE=#{et.queueDecisionType}, + ROUTER_COMP_GBO=#{et.routerCompGbo}, + REPORTING_STEP=#{et.reportingStep}, + SEQUENCE=#{et.sequence}, + REPORTING_CENTER_BO=#{et.reportingCenterBo}, + TABULAR_STEP_TYPE=#{et.tabularStepType}, + SCRAP_REPORTING_STEP=#{et.scrapReportingStep}, + IS_LAST_REPORTING_STEP=#{et.isLastReportingStep}, + ERP_SEQUENCE=#{et.erpSequence}, + ERP_CONTROL_KEY_BO=#{et.erpControlKeyBo}, + ERP_WORK_CENTER_BO=#{et.erpWorkCenterBo}, + ERP_INSPECTION_COMPLETE=#{et.erpInspectionComplete}, + ERP_OPERATION=#{et.erpOperation}, + OPERATION_ACTIVITY_ID=#{et.operationActivityId}, + + + + + HANDLE=#{ew.entity.handle} + AND ROUTER_BO=#{ew.entity.routerBo} + AND STEP_ID=#{ew.entity.stepId} + AND DESCRIPTION=#{ew.entity.description} + AND REWORK=#{ew.entity.rework} + AND QUEUE_DECISION_TYPE=#{ew.entity.queueDecisionType} + AND ROUTER_COMP_GBO=#{ew.entity.routerCompGbo} + AND REPORTING_STEP=#{ew.entity.reportingStep} + AND SEQUENCE=#{ew.entity.sequence} + AND REPORTING_CENTER_BO=#{ew.entity.reportingCenterBo} + AND TABULAR_STEP_TYPE=#{ew.entity.tabularStepType} + AND SCRAP_REPORTING_STEP=#{ew.entity.scrapReportingStep} + AND IS_LAST_REPORTING_STEP=#{ew.entity.isLastReportingStep} + AND ERP_SEQUENCE=#{ew.entity.erpSequence} + AND ERP_CONTROL_KEY_BO=#{ew.entity.erpControlKeyBo} + AND ERP_WORK_CENTER_BO=#{ew.entity.erpWorkCenterBo} + AND ERP_INSPECTION_COMPLETE=#{ew.entity.erpInspectionComplete} + AND ERP_OPERATION=#{ew.entity.erpOperation} + AND OPERATION_ACTIVITY_ID=#{ew.entity.operationActivityId} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM ROUTER_STEP + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM ROUTER_STEP + + + + + HANDLE=#{ew.entity.handle} + + AND ROUTER_BO=#{ew.entity.routerBo} + AND STEP_ID=#{ew.entity.stepId} + AND DESCRIPTION=#{ew.entity.description} + AND REWORK=#{ew.entity.rework} + AND QUEUE_DECISION_TYPE=#{ew.entity.queueDecisionType} + AND ROUTER_COMP_GBO=#{ew.entity.routerCompGbo} + AND REPORTING_STEP=#{ew.entity.reportingStep} + AND SEQUENCE=#{ew.entity.sequence} + AND REPORTING_CENTER_BO=#{ew.entity.reportingCenterBo} + AND TABULAR_STEP_TYPE=#{ew.entity.tabularStepType} + AND SCRAP_REPORTING_STEP=#{ew.entity.scrapReportingStep} + AND IS_LAST_REPORTING_STEP=#{ew.entity.isLastReportingStep} + AND ERP_SEQUENCE=#{ew.entity.erpSequence} + AND ERP_CONTROL_KEY_BO=#{ew.entity.erpControlKeyBo} + AND ERP_WORK_CENTER_BO=#{ew.entity.erpWorkCenterBo} + AND ERP_INSPECTION_COMPLETE=#{ew.entity.erpInspectionComplete} + AND ERP_OPERATION=#{ew.entity.erpOperation} + AND OPERATION_ACTIVITY_ID=#{ew.entity.operationActivityId} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + + diff --git a/meapi/src/main/resources/mapper/UserGroupMapper.xml b/meapi/src/main/resources/mapper/UserGroupMapper.xml index d960bee9..0b471f77 100644 --- a/meapi/src/main/resources/mapper/UserGroupMapper.xml +++ b/meapi/src/main/resources/mapper/UserGroupMapper.xml @@ -358,4 +358,9 @@ LEFT JOIN CUSTOM_FIELDS CF2 ON CF2.HANDLE = UG.HANDLE AND CF2."ATTRIBUTE" = 'MESSAGE_NOTICE_TIME' WHERE UG.USER_GROUP = #{userGroup} AND UG.SITE = #{site} + + diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java b/production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java new file mode 100644 index 00000000..6113085f --- /dev/null +++ b/production/src/main/java/com/foreverwin/mesnac/production/controller/AccessoryLogController.java @@ -0,0 +1,128 @@ +package com.foreverwin.mesnac.production.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.production.model.AccessoryLog; +import com.foreverwin.mesnac.production.service.AccessoryLogService; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * + * @author Philip + * @since 2021-08-12 + */ +@RestController +@RequestMapping("/Z-ACCESSORY-LOG") +public class AccessoryLogController { + + @Autowired + public AccessoryLogService accessoryLogService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getAccessoryLogById(@PathVariable String id) { + return R.ok( accessoryLogService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getAccessoryLogList(AccessoryLog accessoryLog){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(accessoryLog); + result = accessoryLogService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, AccessoryLog accessoryLog){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(accessoryLog); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(AccessoryLog::getHandle, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getSite, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getWorkCenter, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getShopOrder, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getSfc, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getOperation, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getStepId, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getResrce, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getLabel, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getBatch, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getItem, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getRevision, frontPage.getGlobalQuery()) + .or().like(AccessoryLog::getCreateUser, frontPage.getGlobalQuery()) + ); + } + result = accessoryLogService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param accessoryLog 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody AccessoryLog accessoryLog) { + return R.ok(accessoryLogService.save(accessoryLog)); + } + + /** + * 修改 + * @param accessoryLog 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody AccessoryLog accessoryLog) { + return R.ok(accessoryLogService.updateById(accessoryLog)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(accessoryLogService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(accessoryLogService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java b/production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java new file mode 100644 index 00000000..980b27ce --- /dev/null +++ b/production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.production.mapper; + +import com.foreverwin.mesnac.production.model.AccessoryLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 辅料使用记录表 Mapper 接口 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +@Repository +public interface AccessoryLogMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/model/AccessoryLog.java b/production/src/main/java/com/foreverwin/mesnac/production/model/AccessoryLog.java new file mode 100644 index 00000000..a6f19ad3 --- /dev/null +++ b/production/src/main/java/com/foreverwin/mesnac/production/model/AccessoryLog.java @@ -0,0 +1,280 @@ +package com.foreverwin.mesnac.production.model; + +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; + +/** + *

+ * 辅料使用记录表 + *

+ * + * @author Philip + * @since 2021-08-12 + */ + +@TableName("Z_ACCESSORY_LOG") + +public class AccessoryLog extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + /** + * 站点 + */ + @TableField("SITE") + private String site; + /** + * 车间 + */ + @TableField("WORK_CENTER") + private String workCenter; + /** + * 工单 + */ + @TableField("SHOP_ORDER") + private String shopOrder; + /** + * 产品条码 + */ + @TableField("SFC") + private String sfc; + /** + * 工序 + */ + @TableField("OPERATION") + private String operation; + /** + * 步骤 + */ + @TableField("STEP_ID") + private String stepId; + /** + * 资源 + */ + @TableField("RESRCE") + private String resrce; + /** + * 标签 + */ + @TableField("LABEL") + private String label; + /** + * 批次 + */ + @TableField("BATCH") + private String batch; + /** + * 物料 + */ + @TableField("ITEM") + private String item; + /** + * 物料版本 + */ + @TableField("REVISION") + private String revision; + /** + * 使用数量 + */ + @TableField("QTY") + private Double qty; + /** + * 创建人 + */ + @TableField("CREATE_USER") + private String createUser; + /** + * 创建时间 + */ + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getWorkCenter() { + return workCenter; + } + + public void setWorkCenter(String workCenter) { + this.workCenter = workCenter; + } + + public String getShopOrder() { + return shopOrder; + } + + public void setShopOrder(String shopOrder) { + this.shopOrder = shopOrder; + } + + public String getSfc() { + return sfc; + } + + public void setSfc(String sfc) { + this.sfc = sfc; + } + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } + + public String getStepId() { + return stepId; + } + + public void setStepId(String stepId) { + this.stepId = stepId; + } + + public String getResrce() { + return resrce; + } + + public void setResrce(String resrce) { + this.resrce = resrce; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getBatch() { + return batch; + } + + public void setBatch(String batch) { + this.batch = batch; + } + + public String getItem() { + return item; + } + + public void setItem(String item) { + this.item = item; + } + + public String getRevision() { + return revision; + } + + public void setRevision(String revision) { + this.revision = revision; + } + + public Double getQty() { + return qty; + } + + public void setQty(Double qty) { + this.qty = qty; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SITE = "SITE"; + +public static final String WORK_CENTER = "WORK_CENTER"; + +public static final String SHOP_ORDER = "SHOP_ORDER"; + +public static final String SFC = "SFC"; + +public static final String OPERATION = "OPERATION"; + +public static final String STEP_ID = "STEP_ID"; + +public static final String RESRCE = "RESRCE"; + +public static final String LABEL = "LABEL"; + +public static final String BATCH = "BATCH"; + +public static final String ITEM = "ITEM"; + +public static final String REVISION = "REVISION"; + +public static final String QTY = "QTY"; + +public static final String CREATE_USER = "CREATE_USER"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "AccessoryLog{" + + "handle = " + handle + + ", site = " + site + + ", workCenter = " + workCenter + + ", shopOrder = " + shopOrder + + ", sfc = " + sfc + + ", operation = " + operation + + ", stepId = " + stepId + + ", resrce = " + resrce + + ", label = " + label + + ", batch = " + batch + + ", item = " + item + + ", revision = " + revision + + ", qty = " + qty + + ", createUser = " + createUser + + ", createdDateTime = " + createdDateTime + + "}"; + } +} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java b/production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java new file mode 100644 index 00000000..d2da0aaa --- /dev/null +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/AccessoryLogService.java @@ -0,0 +1,28 @@ +package com.foreverwin.mesnac.production.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.production.model.AccessoryLog; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 辅料使用记录表 服务类 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +public interface AccessoryLogService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, AccessoryLog accessoryLog); + + List selectList(AccessoryLog accessoryLog); +} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java new file mode 100644 index 00000000..4df573e1 --- /dev/null +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java @@ -0,0 +1,46 @@ +package com.foreverwin.mesnac.production.service.impl; + +import com.foreverwin.modular.core.util.FrontPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.production.model.AccessoryLog; +import com.foreverwin.mesnac.production.mapper.AccessoryLogMapper; +import com.foreverwin.mesnac.production.service.AccessoryLogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +/** + *

+ * 辅料使用记录表 服务实现类 + *

+ * + * @author Philip + * @since 2021-08-12 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class AccessoryLogServiceImpl extends ServiceImpl implements AccessoryLogService { + + + @Autowired + private AccessoryLogMapper accessoryLogMapper; + + @Override + public IPage selectPage(FrontPage frontPage, AccessoryLog accessoryLog) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(accessoryLog); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(AccessoryLog accessoryLog) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(accessoryLog); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index 0fb83bc6..1f9e1c00 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -332,7 +332,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { } } //报工 - //sendErp(postMapList); + sendErp(postMapList); } public void materialConsumption(String site, String operation, String sfcBo, String stepId, String resource) { @@ -468,7 +468,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { struOut.setAufnr(""); struOut.setVornr(""); struOut.setAueru("1"); - struOut.setLmnga(new BigDecimal(1)); + struOut.setLmnga(BigDecimal.ZERO); struOut.setRet(""); struOut.setMsg(""); outs[0] = struOut; 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 619c4874..d0124891 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 @@ -223,7 +223,7 @@ public class SfcScrapServiceImpl extends ServiceImpl i } wordMap.put("GF",(wordMap.get("TYPE").contains("GF"))? "✔": " "); wordMap.put("LF",(wordMap.get("TYPE").contains("LF"))? "✔": " "); - wordMap.put("OT",(wordMap.get("TYPE").contains("QT"))? "✔": " "); + wordMap.put("OT",(wordMap.get("TYPE").contains("OT"))? "✔": " "); wordMap.put("OPINION","报废"); wordMap.put("YEAR",year + ""); wordMap.put("MONTH",month + ""); diff --git a/production/src/main/resources/mapper/AccessoryLogMapper.xml b/production/src/main/resources/mapper/AccessoryLogMapper.xml new file mode 100644 index 00000000..d1c7e4ab --- /dev/null +++ b/production/src/main/resources/mapper/AccessoryLogMapper.xml @@ -0,0 +1,482 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, WORK_CENTER, SHOP_ORDER, SFC, OPERATION, STEP_ID, RESRCE, LABEL, BATCH, ITEM, REVISION, QTY, CREATE_USER, CREATED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_ACCESSORY_LOG + + HANDLE, + SITE, + WORK_CENTER, + SHOP_ORDER, + SFC, + OPERATION, + STEP_ID, + RESRCE, + LABEL, + BATCH, + ITEM, + REVISION, + QTY, + CREATE_USER, + CREATED_DATE_TIME, + VALUES + + #{handle}, + #{site}, + #{workCenter}, + #{shopOrder}, + #{sfc}, + #{operation}, + #{stepId}, + #{resrce}, + #{label}, + #{batch}, + #{item}, + #{revision}, + #{qty}, + #{createUser}, + #{createdDateTime}, + + + + + INSERT INTO Z_ACCESSORY_LOG + + + VALUES + + #{handle}, + #{site}, + #{workCenter}, + #{shopOrder}, + #{sfc}, + #{operation}, + #{stepId}, + #{resrce}, + #{label}, + #{batch}, + #{item}, + #{revision}, + #{qty}, + #{createUser}, + #{createdDateTime}, + + + + + + UPDATE Z_ACCESSORY_LOG + SITE=#{et.site}, + WORK_CENTER=#{et.workCenter}, + SHOP_ORDER=#{et.shopOrder}, + SFC=#{et.sfc}, + OPERATION=#{et.operation}, + STEP_ID=#{et.stepId}, + RESRCE=#{et.resrce}, + LABEL=#{et.label}, + BATCH=#{et.batch}, + ITEM=#{et.item}, + REVISION=#{et.revision}, + QTY=#{et.qty}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_ACCESSORY_LOG + SITE=#{et.site}, + WORK_CENTER=#{et.workCenter}, + SHOP_ORDER=#{et.shopOrder}, + SFC=#{et.sfc}, + OPERATION=#{et.operation}, + STEP_ID=#{et.stepId}, + RESRCE=#{et.resrce}, + LABEL=#{et.label}, + BATCH=#{et.batch}, + ITEM=#{et.item}, + REVISION=#{et.revision}, + QTY=#{et.qty}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_ACCESSORY_LOG + SITE=#{et.site}, + WORK_CENTER=#{et.workCenter}, + SHOP_ORDER=#{et.shopOrder}, + SFC=#{et.sfc}, + OPERATION=#{et.operation}, + STEP_ID=#{et.stepId}, + RESRCE=#{et.resrce}, + LABEL=#{et.label}, + BATCH=#{et.batch}, + ITEM=#{et.item}, + REVISION=#{et.revision}, + QTY=#{et.qty}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SITE=#{ew.entity.site} + AND WORK_CENTER=#{ew.entity.workCenter} + AND SHOP_ORDER=#{ew.entity.shopOrder} + AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} + AND STEP_ID=#{ew.entity.stepId} + AND RESRCE=#{ew.entity.resrce} + AND LABEL=#{ew.entity.label} + AND BATCH=#{ew.entity.batch} + AND ITEM=#{ew.entity.item} + AND REVISION=#{ew.entity.revision} + AND QTY=#{ew.entity.qty} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_ACCESSORY_LOG WHERE HANDLE=#{handle} + + + + DELETE FROM Z_ACCESSORY_LOG + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_ACCESSORY_LOG + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND WORK_CENTER=#{ew.entity.workCenter} + AND SHOP_ORDER=#{ew.entity.shopOrder} + AND SFC=#{ew.entity.sfc} + AND OPERATION=#{ew.entity.operation} + AND STEP_ID=#{ew.entity.stepId} + AND RESRCE=#{ew.entity.resrce} + AND LABEL=#{ew.entity.label} + AND BATCH=#{ew.entity.batch} + AND ITEM=#{ew.entity.item} + AND REVISION=#{ew.entity.revision} + AND QTY=#{ew.entity.qty} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_ACCESSORY_LOG WHERE HANDLE IN ( + #{item} + ) + + + + diff --git a/production/src/main/resources/mapper/SfcScrapMapper.xml b/production/src/main/resources/mapper/SfcScrapMapper.xml index dd00b909..e9c541bb 100644 --- a/production/src/main/resources/mapper/SfcScrapMapper.xml +++ b/production/src/main/resources/mapper/SfcScrapMapper.xml @@ -431,7 +431,7 @@