From 226ee0be3faf7daa110d6c2b797b07dcdd21e708 Mon Sep 17 00:00:00 2001 From: yxw Date: Wed, 18 Sep 2024 14:27:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A3=81=E7=89=87=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 3a6d2a7..aa94a4e 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -480,4 +480,8 @@ public class MesPcnExtConstWords { public static final String LOT_NO = "lotNo"; //包装数量 public static final String PACKAGE_QTY = "packageQty"; + //二维码 + public static final String QR_CODE = "qrCode"; + //条形码 + public static final String BAR_CODE = "barCode"; } From a6a399205dbcdb021f1d498914c94b83f61785c8 Mon Sep 17 00:00:00 2001 From: yxw Date: Wed, 18 Sep 2024 15:05:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=A3=81=E7=89=87=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../print/strategy/CutWorkOrderPackageSnPrintStrategy.java | 6 ++++++ .../serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java | 2 ++ .../serviceimpl/step/MesWorkOrderCutPackageSnSaveStepService.java | 1 + .../i3plus/ext/mes/pcn/pojo/model/MesWorkOrderCutDetailModel.java | 3 +++ .../cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 2 ++ 5 files changed, 14 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java index 1d979fd..f74c12d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java @@ -49,6 +49,12 @@ public class CutWorkOrderPackageSnPrintStrategy implements IPrintTemplateStrateg resultMap.put(MesPcnExtConstWords.QTY, model.getQty()); resultMap.put(MesPcnExtConstWords.CUT_WORK_ORDER_NO, model.getCutWorkOrderNo()); resultMap.put(MesPcnExtConstWords.PACKAGE_SN, model.getPackageNo()); + // 二维码 + resultMap.put(MesPcnExtConstWords.BAR_CODE, model.getPackageNo()); + // 二维码 + resultMap.put(MesPcnExtConstWords.QR_CODE, new StringJoiner(MesPcnExtConstWords.VERTIVAL_BAR).add("YFWHU") + .add(model.getPackageNo()).add(model.getOrganizeCode()).add(model.getQty().toString()) + .add("EA").toString()); printDataMapList.add(resultMap); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java index 9bfd58e..93652c0 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java @@ -106,6 +106,8 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService { resultMap = printModel.getPrintContextList(); } + List cutWorkOrderNoList = workOrderCutFgDataContext.stream().map(MesWorkOrderCutDetailModel::getCutWorkOrderNo).collect(Collectors.toList()); + // 裁片方案代码 // 根据裁片方案代码查询裁片方案成品配置 //返回打印标识 给前端 diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackageSnSaveStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackageSnSaveStepService.java index 3c271d8..c670417 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackageSnSaveStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackageSnSaveStepService.java @@ -151,6 +151,7 @@ public class MesWorkOrderCutPackageSnSaveStepService extends BaseStepService { newWorkOrderCutDetailModel.setPrinter(mesPartContext.getPrinter()); newWorkOrderCutDetailModel.setCustPartNo(mesPartContext == null ? "" : mesPartContext.getCustPartNo()); newWorkOrderCutDetailModel.setLabelTemplate(mesPartContext.getLabelTemplate()); + newWorkOrderCutDetailModel.setOrganizeCode(mesPartContext.getOrganizeCode()); workOrderCutPackages.add(cutPackage); newWorkOrderCutFgDataContextList.add(newWorkOrderCutDetailModel); diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesWorkOrderCutDetailModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesWorkOrderCutDetailModel.java index 1e0d52c..af5cf0b 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesWorkOrderCutDetailModel.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesWorkOrderCutDetailModel.java @@ -15,6 +15,9 @@ import lombok.Data; @Api("裁片工单明细MODEL") public class MesWorkOrderCutDetailModel { + @ApiParam("工厂代码") + private String organizeCode; + @ApiParam("裁片工单号") private String cutWorkOrderNo; diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index aa94a4e..0c3ed92 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -484,4 +484,6 @@ public class MesPcnExtConstWords { public static final String QR_CODE = "qrCode"; //条形码 public static final String BAR_CODE = "barCode"; + //竖杠 + public static final String VERTIVAL_BAR = "|"; } From 6e90772d0fb3e2b42a56f679d7c59ad4358ce7d5 Mon Sep 17 00:00:00 2001 From: yxw Date: Wed, 18 Sep 2024 15:07:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=A3=81=E7=89=87=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 630c248..3a84fd5 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -489,4 +489,11 @@ public class MesPcnExtConstWords { //工步解绑 public static final String STEP_UNBINDING = "工步解绑"; + + //二维码 + public static final String QR_CODE = "qrCode"; + //条形码 + public static final String BAR_CODE = "barCode"; + //竖杠 + public static final String VERTIVAL_BAR = "|"; } From 8a0ccc46f9e927f20288cf8bca3aff42f5de2430 Mon Sep 17 00:00:00 2001 From: yxw Date: Wed, 18 Sep 2024 15:44:14 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=A3=81=E7=89=87=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=93=E5=8D=B0=E5=B7=A5=E6=AD=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A3=81=E7=89=87=E5=B7=A5=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E5=B7=B2=E6=89=93=E5=8D=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../step/MesWorkOrderCutPackagePrintStepService.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java index 93652c0..8a685e8 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderCutService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesPartContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPartContext; @@ -8,16 +9,22 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesWorkOrderCutDetailModel; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplateParam; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCut; import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.i3plus.pojo.mes.model.StationResultBean; import cn.estsh.i3plus.pojo.mes.model.StepResult; import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateParamRepository; import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesWorkOrderCutRepository; +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -49,6 +56,9 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService { @Autowired private MesLabelTemplateParamRepository labelTemplateParamRao; + @Autowired + private MesWorkOrderCutRepository workOrderCutRepository; + @Override public StepResult execute(StationRequestBean reqBean) { @@ -107,6 +117,12 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService { } List cutWorkOrderNoList = workOrderCutFgDataContext.stream().map(MesWorkOrderCutDetailModel::getCutWorkOrderNo).collect(Collectors.toList()); + // 修改工单为已打印 + workOrderCutRepository.updateByProperties( + new String[]{MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.CUT_WORK_ORDER_NO}, + new Object[]{CommonEnumUtil.VALID, CommonEnumUtil.IS_DEAL.NO.getValue(), reqBean.getOrganizeCode(), cutWorkOrderNoList.get(0)}, + new String[]{MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME, MesPcnExtConstWords.SYSTEM_SYNC_STATUS, MesPcnExtConstWords.WORK_ORDER_STATUS}, + new Object[]{reqBean.getUserInfo(), TimeTool.getNowTime(true), CommonEnumUtil.FALSE, MesExtEnumUtil.CUT_ORDER_STATUS.PRINTED.getValue()}); // 裁片方案代码 // 根据裁片方案代码查询裁片方案成品配置 From cab28f1ba8533dcd39801bd9aa36231bc054da56 Mon Sep 17 00:00:00 2001 From: yxw Date: Wed, 18 Sep 2024 16:20:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=A3=81=E7=89=87=E7=AE=B1=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=89=93=E5=8D=B0=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java | 3 ++- .../cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java index f74c12d..86f593a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java @@ -45,11 +45,12 @@ public class CutWorkOrderPackageSnPrintStrategy implements IPrintTemplateStrateg } resultMap.put(MesPcnExtConstWords.LOT_NO, lotNo); + resultMap.put(MesPcnExtConstWords.TIME, model.getCreateDatetime()); resultMap.put(MesPcnExtConstWords.PACKAGE_QTY, model.getPackageQty()); resultMap.put(MesPcnExtConstWords.QTY, model.getQty()); resultMap.put(MesPcnExtConstWords.CUT_WORK_ORDER_NO, model.getCutWorkOrderNo()); resultMap.put(MesPcnExtConstWords.PACKAGE_SN, model.getPackageNo()); - // 二维码 + // 一维码 resultMap.put(MesPcnExtConstWords.BAR_CODE, model.getPackageNo()); // 二维码 resultMap.put(MesPcnExtConstWords.QR_CODE, new StringJoiner(MesPcnExtConstWords.VERTIVAL_BAR).add("YFWHU") diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 3a84fd5..8ada139 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -496,4 +496,6 @@ public class MesPcnExtConstWords { public static final String BAR_CODE = "barCode"; //竖杠 public static final String VERTIVAL_BAR = "|"; + // 时间 + public static final String TIME = "time"; } From e798943bfe9e2de41dac02588d45499644806322 Mon Sep 17 00:00:00 2001 From: yxw Date: Wed, 18 Sep 2024 16:39:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=A3=81=E7=89=87=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=E5=B7=A5=E6=AD=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java index 8a685e8..7e113ea 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java @@ -74,7 +74,7 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService { // //String labelTemplateCode = entry.getValue().getLabelTemplate(); - List> resultMap = null; + List> resultMap = new ArrayList<>(); Map> workOrderCutDetailModelMapByPartNo = workOrderCutFgDataContext.stream().collect(Collectors.groupingBy(o -> new StringJoiner(MesPcnExtConstWords.AND).add(o.getPrinter()).add(o.getLabelTemplate()).toString())); @@ -113,7 +113,7 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService { // GenSerialNoModel model , MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep MesProduceSnPrintModel printModel = strategyService.execute(null, mesProduceSnPrintModel, null, stepResult, reqBean, true); - resultMap = printModel.getPrintContextList(); + resultMap.addAll(printModel.getPrintContextList()); } List cutWorkOrderNoList = workOrderCutFgDataContext.stream().map(MesWorkOrderCutDetailModel::getCutWorkOrderNo).collect(Collectors.toList());