From 30ae5a9eba23872cb79608ddba3f71aea7734ced Mon Sep 17 00:00:00 2001 From: yxw Date: Mon, 4 Dec 2023 13:28:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=A7=E7=BA=BF=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E5=9B=BA=E5=AE=9A=E4=BD=9C=E4=B8=9A=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E9=97=B4=E9=87=8D=E5=A4=8D=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=80=BB=E8=BE=91=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/controller/base/QualityController.java | 2 +- .../apiservice/serviceimpl/base/QualityDecisionService.java | 4 ++-- .../apiservice/serviceimpl/base/SxWorkOrderExtService.java | 13 ------------- .../apiservice/serviceimpl/busi/ProduceSnExtService.java | 5 +++-- .../apiservice/serviceimpl/busi/jx/JxOqcManageService.java | 2 +- .../serviceimpl/busi/jx/TorqueManageCheckDetailService.java | 2 ++ .../print/method/JxPrintPackageAndSpotTicketService.java | 9 ++++----- .../busi/print/strategy/SxPrintTemplateDispatchService.java | 5 ----- .../i3plus/ext/mes/pcn/pojo/model/GenerateWorkOrderDto.java | 6 ------ .../i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java | 4 ++-- 10 files changed, 15 insertions(+), 37 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/QualityController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/QualityController.java index db3d907..4fb73d9 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/QualityController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/QualityController.java @@ -113,7 +113,7 @@ public class QualityController extends MesPcnBaseController { @ApiOperation(value = "解冻") public ResultBean doUnfreeze(RepairRequestModel repairRequestModel) { try { - qualityDecisionService.doUnfreeze(repairRequestModel); + //qualityDecisionService.doUnfreeze(repairRequestModel); return ResultBean.success("解冻成功!").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/QualityDecisionService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/QualityDecisionService.java index d686b4f..4f48583 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/QualityDecisionService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/QualityDecisionService.java @@ -466,7 +466,7 @@ public class QualityDecisionService implements IQualityDecisionService { List badCellDetailList = getMesBadCellDetails(repairRequestModel, isFinalCheckAfterSn, produceSnExtModel, produceSnExt); - boolean isCompleteRepair = CollectionUtils.isEmpty(badCellDetailList) ? false : badCellDetailList.stream().filter(o -> o.getRepairStatus() == MesPcnExtEnumUtil.MES_REPAIR_STATUS.REPAIRED.getValue()).collect(Collectors.toList()).size() > 0 ; + boolean isCompleteRepair = CollectionUtils.isEmpty(badCellDetailList) ? true : badCellDetailList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getRepairStatus()) && MesPcnExtEnumUtil.MES_REPAIR_STATUS.NO_REPAIR.getValue() == o.getRepairStatus())).collect(Collectors.toList()).size() > 0 ; if (produceSnExtModel.getQcStatus() != MesPcnExtEnumUtil.PRODUCE_SN_QC_STATUS.DEFECTED.getValue()) { throw ImppExceptionBuilder.newInstance() @@ -476,7 +476,7 @@ public class QualityDecisionService implements IQualityDecisionService { .build(); } - if (!isCompleteRepair) { + if (isCompleteRepair) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxWorkOrderExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxWorkOrderExtService.java index 0a14763..e29ae08 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxWorkOrderExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxWorkOrderExtService.java @@ -152,8 +152,6 @@ public class SxWorkOrderExtService implements ISxWorkOrderExtService { checkReworkQty(workOrderDto); - checkReworkOrderBindSn(workOrderDto); - BeanUtils.copyProperties(workOrderDto, mesWorkOrderExt); String userName = AuthUtil.getSessionUser().getUserName(); String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); @@ -162,17 +160,6 @@ public class SxWorkOrderExtService implements ISxWorkOrderExtService { insertNewWorkOrder(mesWorkOrderExt); } - private List checkReworkOrderBindSn(GenerateWorkOrderDto workOrderDto) { - - if (StringUtils.isEmpty(workOrderDto.getProduceSnStart()) || StringUtils.isEmpty(workOrderDto.getProduceSnEnd())) return null; - - List produceSnExtList = new ArrayList<>(); - - - - return produceSnExtList; - } - private void checkReworkQty(GenerateWorkOrderDto workOrderDto) { Double qty = workOrderDto.getQty(); Double planQty = workOrderDto.getPlanQty(); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/ProduceSnExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/ProduceSnExtService.java index d123908..5e5604d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/ProduceSnExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/ProduceSnExtService.java @@ -672,7 +672,7 @@ public class ProduceSnExtService implements IProduceSnExtService { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("工单[%s]关联的物料号[%s]未维护成外制件", workOrder.getOrderNo(), workOrder.getPartNo()) + .setErrorDetail("工单[%s]关联的物料号[%s]基础信息物料分类2未维护成JX内制", workOrder.getOrderNo(), workOrder.getPartNo()) .build(); } @@ -775,6 +775,7 @@ public class ProduceSnExtService implements IProduceSnExtService { .setErrorDetail("请检查工单[%s]数量", workOrder.getOrderNo()) .build(); } + genSerialNoModel.setPartNo(partDb.getPartNo()); BaseResultBean resultBean = syncFuncService.syncSerialNo(genSerialNoModel, userInfo, workOrder.getOrganizeCode(), codeType.getCount()); if (resultBean != null && resultBean.isSuccess()) { if (CollectionUtils.isEmpty(resultBean.getResultList())) { @@ -944,7 +945,7 @@ public class ProduceSnExtService implements IProduceSnExtService { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) - .setErrorDetail("模板错误,请检查模板配置") + .setErrorDetail("模板错误,请检查模板配置;详细报错原因：%s",e.getMessage()) .build(); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxOqcManageService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxOqcManageService.java index ae06075..5bcc0cf 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxOqcManageService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxOqcManageService.java @@ -776,7 +776,7 @@ public class JxOqcManageService implements IJxOqcManageService { } private Double baseConvertToDecimalism(String value, int baseOfValue) { - return Double.valueOf(Integer.parseInt(value, MesPcnExtEnumUtil.OQC_BASE_TYPE.baseOfValue(baseOfValue))); + return (MesPcnExtEnumUtil.OQC_BASE_TYPE.DECIMALISM.getValue() == baseOfValue) ? Double.valueOf(value) : Double.valueOf(Integer.parseInt(value, MesPcnExtEnumUtil.OQC_BASE_TYPE.baseOfValue(baseOfValue))); } @Override diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java index 8b142bb..01f099d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java @@ -125,6 +125,8 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService } } + if("该项不需要点检".equals(torqueManageTaskDetail.getRemark())) torqueManageTaskDetailDb.setCheckResult(MesPcnExtEnumUtil.CHECK_RESULT.OK.getValue()); + torqueManageTaskDetailDb.setCheckTime(TimeTool.getNowTime(true)); torqueManageTaskDetailDb.setCheckUser(torqueManageTaskDetail.getModifyUser()); torqueManageTaskDetailDb.setRotationNoAbnormal(torqueManageTaskDetail.getRotationNoAbnormal()); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/print/method/JxPrintPackageAndSpotTicketService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/print/method/JxPrintPackageAndSpotTicketService.java index 9c3e410..a796a39 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/print/method/JxPrintPackageAndSpotTicketService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/print/method/JxPrintPackageAndSpotTicketService.java @@ -17,8 +17,8 @@ import java.util.stream.Collectors; /** * @Description 嘉兴现品票打印数据（工厂内部使用） - * @Author: wangjie - * @CreateDate: 2020/6/22 9:38 AM + * @Author: xinwang.yi + * @CreateDate: 2023/11/29 9:38 AM * @Description: **/ @Slf4j @@ -43,8 +43,7 @@ public class JxPrintPackageAndSpotTicketService extends SxPrintDispatchService i if (null == workOrderExt) { continue; } - String[] dateArr = workOrderExt.getStartTime().substring(2, 7).split("-"); - startTimeMap.put(workOrderNo, new StringJoiner(".").add(dateArr[1]).add(dateArr[0]).toString()); + startTimeMap.put(workOrderNo, workOrderExt.getStartTime().substring(0, 10).replaceAll("-", "/")); } for (PackageExtModel pack : packList) { @@ -71,7 +70,7 @@ public class JxPrintPackageAndSpotTicketService extends SxPrintDispatchService i resultMap.put(MesPcnExtConstWords.QR_CODE, pack.getPackageNo()); // 生产日期 - resultMap.put(MesPcnExtConstWords.YEAR_MONTH_DAY, pack.getWorkTime()); + resultMap.put(MesPcnExtConstWords.YEAR_MONTH_DAY, startTimeMap.get(pack.getLastWorkOrderNo())); resultMap.put(MesPcnExtConstWords.QTY, pack.getQty()); resultMapList.add(resultMap); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/print/strategy/SxPrintTemplateDispatchService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/print/strategy/SxPrintTemplateDispatchService.java index 380a3fb..746d65c 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/print/strategy/SxPrintTemplateDispatchService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/print/strategy/SxPrintTemplateDispatchService.java @@ -98,11 +98,6 @@ public class SxPrintTemplateDispatchService { MesBusiConfig mesBusiConfig = busiConfigService.queryBusiConfigeByCfgCode(MesPcnExtConstWords.COMMON_TEMPLATE_URL, printModel.getLabelTemplate().getOrganizeCode()); if(mesBusiConfig == null){ log.info("BarTender模板地址未维护 - cfgCode - COMMON_TEMPLATE_URL"); - //throw ImppExceptionBuilder.newInstance() - // .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode()) - // .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - // .setErrorDetail("BarTender模板地址未维护，请在业务配置页面中维护配置代码[COMMON_TEMPLATE_URL]”") - // .build(); }else{ resultMap.put(MesPcnExtConstWords.TEMPLATE_URL, mesBusiConfig.getCfgValue() + printModel.getLabelTemplate().getTemplateCode() +".BTW"); } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/GenerateWorkOrderDto.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/GenerateWorkOrderDto.java index 27e9033..0570844 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/GenerateWorkOrderDto.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/GenerateWorkOrderDto.java @@ -58,10 +58,4 @@ public class GenerateWorkOrderDto { @ApiParam("Erp库存地") private String erpWarehouse; - @ApiParam("产品条码起始") - private String produceSnStart; - - @ApiParam("产品条码截至") - private String produceSnEnd; - } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java index 75f31d0..c593814 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java @@ -2558,8 +2558,8 @@ public class MesPcnExtEnumUtil { * 物料类型2 */ public enum CATEGORY_CODE_2 { - INSIDE("10", "内置件"), - OUTSIDE("20", "外制件"); + INSIDE("10", "备用"), + OUTSIDE("20", "JX内制"); private String value; private String description;