From 455d6dd547b6552a71c7a990648843c7b884df66 Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 22 Jul 2024 18:47:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/MesSortShippingCheckService.java | 61 ++++++++++++---------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java index 7a1105a..8ebac19 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java @@ -497,40 +497,45 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService ConvertBean.serviceModelUpdate(vehiclesOrderDetail, userInfo); vehiclesOrderDetailRepository.save(vehiclesOrderDetail); } - - DdlPackBean orderManagementPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", orderManagementPackBean); - DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "status", orderManagementPackBean); - boolean exitByHql = shippingOrderManagementRepository.isExitByHql(orderManagementPackBean); - //2.装车单中所有发运单全部变成发运回传 - if(!exitByHql){ - List jisShippingList=new ArrayList<>(); - DdlPackBean jisBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", jisBean); - List shippingOrderManagementList = shippingOrderManagementRepository.findByHqlWhere(jisBean); - for (MesShippingOrderManagement mesShippingOrderManagement : shippingOrderManagementList) { - DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getNumEqualPack(mesShippingOrderManagement.getId(), "pid", detailPackBean); - List shippingOrderManagementDetails = shippingOrderManagementDetailRepository.findByHqlWhere(detailPackBean); - //当前装车单所有发运单明细 需要报工的数据 - jisShippingList = jisShippingService.getJisShipping(mesShippingOrderManagement, shippingOrderManagementDetails, organizeCode); - } + if(StringUtils.isEmpty(orderManagement.getOrderCode())){ //保存当前发运单明细报工 - jisShippingRepository.saveAll(jisShippingList); - - if(!StringUtil.isEmpty(vehiclesOrderDetail)){ - MesLoadingList loadingList = vehiclesOrderRepository.getById(vehiclesOrderDetail.getPid()); - if (!StringUtils.isEmpty(loadingList)) { - loadingList.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.ASN.getValue()); - ConvertBean.serviceModelUpdate(loadingList, userInfo); - shippingLoadingCheckService.update(loadingList); + jisShippingRepository.saveAll(getMesJisShippings(organizeCode, orderManagement)); + }else{ + DdlPackBean orderManagementPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", orderManagementPackBean); + DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "status", orderManagementPackBean); + boolean exitByHql = shippingOrderManagementRepository.isExitByHql(orderManagementPackBean); + //2.装车单中所有发运单全部变成发运回传 + if(!exitByHql){ + DdlPackBean jisBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", jisBean); + List shippingOrderManagementList = shippingOrderManagementRepository.findByHqlWhere(jisBean); + for (MesShippingOrderManagement mesShippingOrderManagement : shippingOrderManagementList) { + //保存当前发运单明细报工 + jisShippingRepository.saveAll(getMesJisShippings(organizeCode, mesShippingOrderManagement)); } - } - + if(!StringUtil.isEmpty(vehiclesOrderDetail)){ + MesLoadingList loadingList = vehiclesOrderRepository.getById(vehiclesOrderDetail.getPid()); + if (!StringUtils.isEmpty(loadingList)) { + loadingList.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.ASN.getValue()); + ConvertBean.serviceModelUpdate(loadingList, userInfo); + shippingLoadingCheckService.update(loadingList); + } + } + } } } + + private List getMesJisShippings(String organizeCode, MesShippingOrderManagement mesShippingOrderManagement) { + DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(mesShippingOrderManagement.getId(), "pid", detailPackBean); + List shippingOrderManagementDetails = shippingOrderManagementDetailRepository.findByHqlWhere(detailPackBean); + //当前装车单所有发运单明细 需要报工的数据 + return jisShippingService.getJisShipping(mesShippingOrderManagement, shippingOrderManagementDetails, organizeCode); + } + @Override @MonitorLog public void update(MesShippingOrderManagement item) { From 13293f05598d8d5d4050bdb10103019dd128c500 Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 22 Jul 2024 19:53:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java index 8ebac19..b034a4a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java @@ -237,7 +237,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService } scanFlg = true; - detail.setBarcode(produceSn.getSerialNumber()); + detail.setBarcode(produceSn.getProductSn()); if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) { detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER); @@ -367,6 +367,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService //封装信息 produceSn = new MesProduceSn(); produceSn.setSerialNumber(model.getSn()); + produceSn.setProductSn(model.getSn()); produceSn.setPartNo(mesShippingOrderManagementDetail.getPartNo()); } From 96f9fc2b66616e00333c7fef14209b5b0d545524 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Tue, 23 Jul 2024 15:31:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=88=86=E9=9A=94=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/numberrule/GqxnyNumberRuleStrategyService.java | 2 +- .../java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/GqxnyNumberRuleStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/GqxnyNumberRuleStrategyService.java index ecfafcd..2745cce 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/GqxnyNumberRuleStrategyService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/GqxnyNumberRuleStrategyService.java @@ -73,7 +73,7 @@ public class GqxnyNumberRuleStrategyService implements INumberRulePackAttributeS } private String stringFormat(String data, Integer length) { - return stringFormat(data, length, true, MesPcnExtConstWords.ASTERISK); + return stringFormat(data, length, true, MesPcnExtConstWords.SEPARATOR); } private String stringFormat(String data, Integer length, boolean left, String symbol) { 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 eea9d9d..517acfd 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 @@ -272,6 +272,8 @@ public class MesPcnExtConstWords { // * public static final String ASTERISK = "*"; + public static final String SEPARATOR = "-"; + //过程条码默认生成规则