From 106a7aa8bd023e468f56d455cf5f0374d5208c1d Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Thu, 10 Apr 2025 09:09:09 +0800 Subject: [PATCH] =?UTF-8?q?feat=20sap=E4=B8=8B=E5=8F=91=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E6=81=92=E6=B8=A9?= =?UTF-8?q?=E6=81=92=E6=B9=BF=E3=80=81=E7=86=9F=E5=8C=96=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cim/idm/constants/MaturingEnums.java | 29 +++++++++++++++++++ .../com/cim/idm/constants/StorageEnums.java | 28 ++++++++++++++++++ .../idm/controller/SAPToWMSController.java | 15 ++++++---- 3 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/constants/MaturingEnums.java create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/constants/StorageEnums.java diff --git a/zi-wms-pda/src/main/java/com/cim/idm/constants/MaturingEnums.java b/zi-wms-pda/src/main/java/com/cim/idm/constants/MaturingEnums.java new file mode 100644 index 0000000..6ec35b5 --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/constants/MaturingEnums.java @@ -0,0 +1,29 @@ +package com.cim.idm.constants; + +import lombok.Getter; + +@Getter +public enum MaturingEnums { + NOT_MATURED("01", "不熟化"), + NORMAL_TEMPERATURE("02", "常温"), + LOW_TEMPERATURE("03", "低温"), + MODERATE_TEMPERATURE("04", "中温"), + HIGH_TEMPERATURE("05", "高温"); + + private final String code; + private final String info; + + MaturingEnums(String code, String info) { + this.code = code; + this.info = info; + } + + public String getMaturing(String code) { + for (MaturingEnums value : MaturingEnums.values()) { + if (value.getCode().equals(code)) { + return value.getInfo(); + } + } + return MaturingEnums.NOT_MATURED.getCode(); + } +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/constants/StorageEnums.java b/zi-wms-pda/src/main/java/com/cim/idm/constants/StorageEnums.java new file mode 100644 index 0000000..3c1134c --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/constants/StorageEnums.java @@ -0,0 +1,28 @@ +package com.cim.idm.constants; + +import lombok.Getter; + +@Getter +public enum StorageEnums { + GENERAL_WAREHOUSE("01", "普通仓库"), + CONSTANT_TEMPERATURE_WAREHOUSE("02", "恒温仓库"), + COLD_WAREHOUSE("03", "冷藏仓库"), + DRY_FILM_WAREHOUSE("04", "干膜仓库"); + + private final String code; + private final String info; + + StorageEnums(String code, String info) { + this.code = code; + this.info = info; + } + + public String getStorage(String code) { + for (StorageEnums value : StorageEnums.values()) { + if (value.getCode().equals(code)) { + return value.getInfo(); + } + } + return StorageEnums.GENERAL_WAREHOUSE.getCode(); + } +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java index ff17428..1e911a1 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java @@ -82,9 +82,9 @@ public class SAPToWMSController { ArrayList> data = request.getBODY(); // 主表 - String insertSql="INSERT INTO MATERIALSPEC (sitename, materialspecname, materialgroup, materialgroupdescription, materialunit, materialunitdesc, deliverycycle, minorderqty, phase, materialtype, mstae, oldmaterialspecname, highvalueflag, commonmaterialflag, purchasetype, width, financialtype, createtime, createuser, lasteventtime, lasteventuser, lasteventtimekey, lasteventname, lasteventcomment,desc_en,IS_CON_TEMP ,MATURATIONTIME ,MATURATIONFLAG ,DEGREE,EXPIRATION_RULES, ZTURENAME, ZMDQ) " + SystemPropHelper.CR + - "VALUES(:sitename, :materialspecname, :materialgroup, :materialgroupdescription, :materialunit, :materialunitdesc,:deliverycycle, :minorderqty, :phase, :materialtype, :mstae, :oldmaterialspecname, :highvalueflag, :commonmaterialflag, :purchasetype, :width, :financialtype, :createtime, :createuser, :lasteventtime, :lasteventuser, :lasteventtimekey, :lasteventname, :lasteventcomment,:desc_en,:IS_CON_TEMP ,:MATURATIONTIME ,:MATURATIONFLAG ,:DEGREE,:EXPIRATION_RULES, :zturename, :zmdq)"; - String updateSql = "UPDATE MATERIALSPEC SET materialgroup = :materialgroup,desc_en=:desc_en,IS_CON_TEMP=:IS_CON_TEMP ,MATURATIONTIME=:MATURATIONTIME ,MATURATIONFLAG=:MATURATIONFLAG ,DEGREE=:DEGREE,EXPIRATION_RULES=:EXPIRATION_RULES, materialgroupdescription = :materialgroupdescription, materialunit = :materialunit, materialunitdesc = :materialunitdesc, deliverycycle = :deliverycycle, minorderqty = :minorderqty, phase = :phase, materialtype = :materialtype, mstae = :mstae, oldmaterialspecname = :oldmaterialspecname, highvalueflag = highvalueflag, commonmaterialflag = :commonmaterialflag, purchasetype = :purchasetype, width = :width, financialtype = :financialtype, createtime = :createtime, createuser = :createuser, lasteventtime = :lasteventtime, lasteventuser = :lasteventuser, lasteventtimekey = :lasteventtimekey, lasteventname = :lasteventname, lasteventcomment = :lasteventcomment, zturename = :zturename, zmdq = :zmdq where materialspecname = :materialspecname and sitename = :sitename"; + String insertSql="INSERT INTO MATERIALSPEC (sitename, materialspecname, materialgroup, materialgroupdescription, materialunit, materialunitdesc, deliverycycle, minorderqty, phase, materialtype, mstae, oldmaterialspecname, highvalueflag, commonmaterialflag, purchasetype, width, financialtype, createtime, createuser, lasteventtime, lasteventuser, lasteventtimekey, lasteventname, lasteventcomment,desc_en,IS_CON_TEMP ,MATURATIONTIME ,MATURATIONFLAG ,DEGREE,EXPIRATION_RULES, ZTURENAME, ZMDQ, IS_CON_TEMP_T, MATURATIONTIME_T, MATURATIONFLAG_T) " + SystemPropHelper.CR + + "VALUES(:sitename, :materialspecname, :materialgroup, :materialgroupdescription, :materialunit, :materialunitdesc,:deliverycycle, :minorderqty, :phase, :materialtype, :mstae, :oldmaterialspecname, :highvalueflag, :commonmaterialflag, :purchasetype, :width, :financialtype, :createtime, :createuser, :lasteventtime, :lasteventuser, :lasteventtimekey, :lasteventname, :lasteventcomment,:desc_en,:IS_CON_TEMP ,:MATURATIONTIME ,:MATURATIONFLAG ,:DEGREE,:EXPIRATION_RULES, :zturename, :zmdq, :IS_CON_TEMP_T, :MATURATIONTIME_T, :MATURATIONFLAG_T)"; + String updateSql = "UPDATE MATERIALSPEC SET materialgroup = :materialgroup,desc_en=:desc_en,IS_CON_TEMP=:IS_CON_TEMP ,MATURATIONTIME=:MATURATIONTIME ,MATURATIONFLAG=:MATURATIONFLAG ,DEGREE=:DEGREE,EXPIRATION_RULES=:EXPIRATION_RULES, materialgroupdescription = :materialgroupdescription, materialunit = :materialunit, materialunitdesc = :materialunitdesc, deliverycycle = :deliverycycle, minorderqty = :minorderqty, phase = :phase, materialtype = :materialtype, mstae = :mstae, oldmaterialspecname = :oldmaterialspecname, highvalueflag = highvalueflag, commonmaterialflag = :commonmaterialflag, purchasetype = :purchasetype, width = :width, financialtype = :financialtype, createtime = :createtime, createuser = :createuser, lasteventtime = :lasteventtime, lasteventuser = :lasteventuser, lasteventtimekey = :lasteventtimekey, lasteventname = :lasteventname, lasteventcomment = :lasteventcomment, zturename = :zturename, zmdq = :zmdq, IS_CON_TEMP_T = :IS_CON_TEMP_T, MATURATIONTIME_T = :MATURATIONTIME_T, MATURATIONFLAG_T = :MATURATIONFLAG_T where materialspecname = :materialspecname and sitename = :sitename"; // 附加单位 String insertMarmSql = "insert into BS_MATERIALUNIT (materialspecname, additionalunit, modulecule, denominator) " + "VALUES(:materialspecname, :additionalunit, :modulecule, :denominator)"; @@ -178,7 +178,7 @@ public class SAPToWMSController { ZBZQTYPE="0"; } //存储条件ZRAUBE 01普通 02恒温 03冷藏 04干膜 - if(StringUtils.equals(ZRAUBE, "02")) + /*if(StringUtils.equals(ZRAUBE, "02")) { ZRAUBE="Y"; } @@ -193,11 +193,14 @@ public class SAPToWMSController { { MATURATIONFLAG="N"; - } + }*/ map.put("IS_CON_TEMP", ZRAUBE); + map.put("IS_CON_TEMP_T", ZRAUBE); map.put("MATURATIONTIME", ZDAY); - map.put("MATURATIONFLAG", MATURATIONFLAG); + map.put("MATURATIONTIME_T", ZDAY); + map.put("MATURATIONFLAG", ZTEMPB); + map.put("MATURATIONFLAG_T", ZTEMPB); map.put("DEGREE", ZTEMPB); map.put("EXPIRATION_RULES", ZBZQTYPE);