From a0d1bd69cfe28c22067e0d08a780b9997a7f261c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Thu, 15 May 2025 09:51:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=81=92=E6=B8=A9=E6=81=92?= =?UTF-8?q?=E6=B9=BF=E3=80=81=E6=98=AF=E5=90=A6=E7=86=9F=E5=8C=96=E7=94=B1?= =?UTF-8?q?Y=E6=94=B9=E4=B8=BA01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cim/idm/service/Impl/ProductIntoServiceImpl.java | 8 ++++---- .../src/main/java/com/cim/idm/utils/CommonUtils.java | 2 +- .../service/MaterialPackingServiceImpl.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java index f0daad5..d7b4ccd 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java @@ -458,13 +458,13 @@ public class ProductIntoServiceImpl implements FGStockInService { } } String ckhw = "Y".equals(const_temp) ? "恒温恒湿" : "非恒温恒湿"; - String wlhw = "Y".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿"; + String wlhw = "01".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿"; String cksh = "Y".equals(is_oven) ? "熟化" : "非熟化"; - String wlsh = "Y".equals(maturationflag) ? "熟化" : "非熟化"; + String wlsh = "01".equals(maturationflag) ? "熟化" : "非熟化"; //物料非熟化 不能进熟化仓 - if ("Y".equals(maturationflag)) { + if ("01".equals(maturationflag)) { } else { //非熟化逻辑 if ("Y".equals(is_oven)) { @@ -475,7 +475,7 @@ public class ProductIntoServiceImpl implements FGStockInService { //物料恒温 只能进恒温仓或熟化仓 2024.11 String packingGrade = queryForList.get(0).get("PACKINGGRADE") == null ? "" : queryForList.get(0).get("PACKINGGRADE").toString(); if (!"NG".equals(packingGrade)) { - if ("Y".equals(is_CON_TEMP)) { + if ("01".equals(is_CON_TEMP)) { if ("Y".equals(const_temp) || "Y".equals(is_oven)) { } else { diff --git a/zi-wms-pda/src/main/java/com/cim/idm/utils/CommonUtils.java b/zi-wms-pda/src/main/java/com/cim/idm/utils/CommonUtils.java index 991edfc..f0de2db 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/utils/CommonUtils.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/utils/CommonUtils.java @@ -127,7 +127,7 @@ public class CommonUtils { */ public Boolean JudgeMentERPLocationAndMaterialSpec(String ERPLOcxation,String materialSpec) { - String DetailSql = "SELECT IS_CON_TEMP FROM MATERIALSPEC m WHERE MATERIALSPECNAME =:MATERIALSPECNAME AND IS_CON_TEMP='Y' "; + String DetailSql = "SELECT IS_CON_TEMP FROM MATERIALSPEC m WHERE MATERIALSPECNAME =:MATERIALSPECNAME AND IS_CON_TEMP='01' "; Map DetailMap = new HashMap(); DetailMap.put("MATERIALSPECNAME",materialSpec ); List> ShipDetaillist = IDMFrameServiceProxy.getSqlTemplate().queryForList(DetailSql, DetailMap); diff --git a/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpacking/service/MaterialPackingServiceImpl.java b/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpacking/service/MaterialPackingServiceImpl.java index e7f5690..1034ae1 100644 --- a/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpacking/service/MaterialPackingServiceImpl.java +++ b/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpacking/service/MaterialPackingServiceImpl.java @@ -6573,11 +6573,11 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo, } } String ckhw = "Y".equals(const_temp) ? "恒温恒湿" : "非恒温恒湿"; - String wlhw = "Y".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿"; + String wlhw = "01".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿"; String cksh = "Y".equals(is_oven) ? "熟化" : "非熟化"; - String wlsh = "Y".equals(maturationflag) ? "熟化" : "非熟化"; + String wlsh = "01".equals(maturationflag) ? "熟化" : "非熟化"; // if (!const_temp.equals(is_CON_TEMP)) { // throw new RuntimeException("仓库" + ckhw + "; 物料" + wlhw); // }