From 101f359f32562a221c3b826d5014fbcd69a189fa Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sat, 21 Dec 2024 07:24:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=AF=E5=8D=95=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java index 9034a1d..ff52a7c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java @@ -435,9 +435,9 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService { } mesKanBanShowModel.setSummaryRealSupplyRealCount(summaryRealSupplyRealCount); Long summaryWorkOrderYellowCount = kanBan.getSummaryWorkOrderYellowCount(); - if (summaryRealSupplyRealCount > summaryWorkOrderYellowCount){ + if (summaryRealSupplyRealCount > summaryWorkOrderYellowCount && summaryRealSupplyRealCount < summaryWorkOrderRedCount){ mesKanBanShowModel.setSummaryWorkOrderColor("orange"); - }else if (summaryRealSupplyRealCount > summaryWorkOrderRedCount){ + }else if (summaryRealSupplyRealCount >= summaryWorkOrderRedCount){ mesKanBanShowModel.setSummaryWorkOrderColor("red"); } //成品缓冲 From 42033f7d572645b28e87cbf4da177895787378cf Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 23 Dec 2024 11:34:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20bug=2044172=20PC-=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?vin=E5=92=8C=E6=9D=A1=E7=A0=81=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 374fe89..0b4aec6 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 @@ -103,6 +103,10 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { commonQueryHql.append("AND ms.isValid = :isValid "); // 动态添加其他查询条件 + if (!StringUtils.isEmpty(model.getVin())) { + commonQueryHql.append("AND momd.vin like :vin "); + } + if (!StringUtils.isEmpty(model.getShippingCode())) { commonQueryHql.append("AND ms.shippingCode like :shippingCode "); } @@ -152,6 +156,11 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao { dataQuery.setParameter("organizeCode", model.getOrganizeCode()); dataQuery.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); dataQuery.setParameter("isValid", CommonEnumUtil.IS_VAILD.VAILD.getValue()); + + if (!StringUtils.isEmpty(model.getVin())) { + dataQuery.setParameter("vin", model.getVin() + "%"); + } + if (!StringUtils.isEmpty(model.getShippingCode())) { dataQuery.setParameter("shippingCode", model.getShippingCode() + "%"); }