From 219353cde29fa543826770d2fca586475227b9c3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 27 Dec 2024 16:50:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=88=E5=B9=B6=20test-temp-castle-24122?= =?UTF-8?q?71558-44316=20=2044316=20=E6=8E=92=E5=BA=8F=E5=B7=A5=E5=8D=95BO?= =?UTF-8?q?M=E6=8B=86=E5=88=86=E9=80=BB=E8=BE=91=E6=9B=B4=E6=96=B0=20---?= =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index a535d95..afdce9d 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -181,6 +181,8 @@ public class MesExtConstWords { public static final String SYNC_TO_WMS = "syncToWms"; //BOM版本 public static final String BOM_VERSION = "bomVersion"; + //BOM代码 + public static final String BOM_CODE = "bomCode"; //生效时间 public static final String EFF_START_TIME = "effStartTime"; //失效时间 From be6816c3dd72ee051e41f4472f8a1443604f70d6 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sat, 28 Dec 2024 20:44:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?43316=20=E4=BF=AE=E5=A4=8DbomVersion?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 6 +++--- .../ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 07298ad..f925a2c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -2307,13 +2307,13 @@ public class MesWorkOrderService extends BaseMesService implements MesException.throwMesBusiException("物料【%s】对应bom信息不存在", partNo); } MesBom mesBom = mesBoms.get(0); - String effEndTime = mesBom.getEffEndTime(); + String effStartTime = mesBom.getEffStartTime(); String bomCode = mesBom.getBomCode(); DdlPackBean ddlPackBean1 = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, ddlPackBean1); - DdlPreparedPack.getStringEqualPack(effEndTime, MesExtConstWords.EFF_START_TIME, ddlPackBean); - DdlPreparedPack.getStringEqualPack(bomCode, "bomCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(effStartTime, MesExtConstWords.EFF_START_TIME, ddlPackBean1); + DdlPreparedPack.getStringEqualPack(bomCode, "bomCode", ddlPackBean1); //如果存在多个bomCode取最新的一个 return mesBomRDao.findByHqlWhere(ddlPackBean1); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java index e375145..cef9094 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java @@ -871,8 +871,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { DdlPackBean bomPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(mesBom.getBomCode(), "bomCode", bomPackBean); DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, bomPackBean); - DdlPreparedPack.getStringSmallerPack(effectiveTime, MesExtConstWords.EFF_START_TIME, bomPackBean); - if (isWithEffEndTime) DdlPreparedPack.getStringBiggerPack(effectiveTime, MesExtConstWords.EFF_END_TIME, bomPackBean); + DdlPreparedPack.getStringEqualPack(mesBom.getEffStartTime(), MesExtConstWords.EFF_START_TIME, bomPackBean); List bomList = bomRao.findByHqlWhere(bomPackBean); for (MesBom bom : bomList) { From 49c072cc44cd7855c8dc9f1e516d0b68e86c89b3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 Dec 2024 14:32:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=2044615=20=E5=8F=91=E8=BF=90=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81=E5=8F=91=E8=BF=90=E7=BB=84?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daoimpl/report/ShipmentDetailReportDaoImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java index 0b4aec6..03ec002 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java @@ -106,7 +106,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { if (!StringUtils.isEmpty(model.getVin())) { commonQueryHql.append("AND momd.vin like :vin "); } - + if (!StringUtils.isEmpty(model.getCustOrderNo())) { + commonQueryHql.append("AND momd.custOrderNo like :custOrderNo "); + } if (!StringUtils.isEmpty(model.getShippingCode())) { commonQueryHql.append("AND ms.shippingCode like :shippingCode "); } @@ -122,6 +124,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { if (!StringUtils.isEmpty(model.getCustCode())) { commonQueryHql.append("AND ms.custCode like :custCode "); } + if (!StringUtils.isEmpty(model.getShippingGroupName())) { + commonQueryHql.append("AND ms.shippingGroupName like :shippingGroupName "); + } if (!StringUtils.isEmpty(model.getCustOrganizeCode())) { commonQueryHql.append("AND ms.custOrganizeCode = :custOrganizeCode "); } @@ -160,7 +165,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { if (!StringUtils.isEmpty(model.getVin())) { dataQuery.setParameter("vin", model.getVin() + "%"); } - + if (!StringUtils.isEmpty(model.getShippingCode())) { + dataQuery.setParameter("custOrderNo", model.getCustOrderNo() + "%"); + } if (!StringUtils.isEmpty(model.getShippingCode())) { dataQuery.setParameter("shippingCode", model.getShippingCode() + "%"); } @@ -176,6 +183,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { if (!StringUtils.isEmpty(model.getCustCode())) { dataQuery.setParameter("custCode", model.getCustCode() + "%"); } + if (!StringUtils.isEmpty(model.getShippingGroupName())) { + dataQuery.setParameter("shippingGroupName", "%" + model.getShippingGroupName() + "%"); + } if (!StringUtils.isEmpty(model.getCustOrganizeCode())) { dataQuery.setParameter("custOrganizeCode", model.getCustOrganizeCode()); } From fada3121131374e83c3c2638d350dfcfbd32012d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 Dec 2024 14:52:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=2044615=20=E5=8F=91=E8=BF=90=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81=E5=8F=91=E8=BF=90=E7=BB=84?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java index 03ec002..1a9eee8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java @@ -165,7 +165,7 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { if (!StringUtils.isEmpty(model.getVin())) { dataQuery.setParameter("vin", model.getVin() + "%"); } - if (!StringUtils.isEmpty(model.getShippingCode())) { + if (!StringUtils.isEmpty(model.getCustOrderNo())) { dataQuery.setParameter("custOrderNo", model.getCustOrderNo() + "%"); } if (!StringUtils.isEmpty(model.getShippingCode())) {