From 93f890ec284b9677115b663abd536e3c65d1296f Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Tue, 18 Mar 2025 15:28:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat=20=E9=A2=84=E5=A4=87=E5=8D=95=E5=87=BA?= =?UTF-8?q?=E5=BA=93-=E6=8F=90=E4=BA=A4-=E8=AF=AD=E5=8F=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java index c2e3622..0a7e3ae 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java @@ -2439,7 +2439,7 @@ public class ToSAPServiceImpl { .append(" WHERE ").append(SystemPropHelper.CR) .append(" mp.SHIPREQUESTNAME = :SHIPREQUESTNAME ").append(SystemPropHelper.CR) .append(" AND mp.SITENAME = :SITENAME ").append(SystemPropHelper.CR) - .append(" AND mp.STOCKSTATE = 'Stocked' AND T.MATERIALPACKINGNAME IN :BATCH ").append(SystemPropHelper.CR) + .append(" AND mp.STOCKSTATE = 'Stocked' AND mp.MATERIALPACKINGNAME IN :BATCH ").append(SystemPropHelper.CR) .append(" GROUP BY ").append(SystemPropHelper.CR) .append(" mp.SHIPREQUESTDETAILNAME , ").append(SystemPropHelper.CR) .append(" mp.ERPLOCATION, ").append(SystemPropHelper.CR) From c58e1d9f7f239afbf3e746c6822fa6d05131e1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=B4=E8=BE=89?= Date: Tue, 18 Mar 2025 17:12:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=AC=E7=BD=91=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zi-wms-environment/config/db/oracle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zi-wms-environment/config/db/oracle.properties b/zi-wms-environment/config/db/oracle.properties index a761665..1b95d72 100644 --- a/zi-wms-environment/config/db/oracle.properties +++ b/zi-wms-environment/config/db/oracle.properties @@ -6,18 +6,18 @@ #db.Local.url=jdbc:oracle:thin:@10.140.249.73:1521:ORCL #db.Local.username=b16mwmsadm #db.Local.password=adm2024 -db.Local.url=jdbc:oracle:thin:@192.168.1.73:1526/test +db.Local.url=jdbc:oracle:thin:@123.57.206.181:1521/ORCLPDB1 db.Local.username=ziwms_sap_test db.Local.password=adm2024 #Section 2 - Customer Local dev DB Info -db.Dev.url=jdbc:oracle:thin:@192.168.1.73:1526/test +db.Dev.url=jdbc:oracle:thin:@123.57.206.181:1521/ORCLPDB1 db.Dev.username=ziwms_sap_test db.Dev.password=adm2024 #Section 3 - Customer Test DB Info -db.Tst.url=jdbc:oracle:thin:@192.168.1.73:1526/test +db.Tst.url=jdbc:oracle:thin:@123.57.206.181:1521/ORCLPDB1 db.Tst.username=ziwms_sap_test db.Tst.password=adm2024 #Section 4 - Customer Prod DB Info -db.Prd.url=jdbc:oracle:thin:@192.168.1.73:1526/test +db.Prd.url=jdbc:oracle:thin:@123.57.206.181:1521/ORCLPDB1 db.Prd.username=ziwms_sap_test db.Prd.password=adm2024 \ No newline at end of file From c632d22b892a55634e98f98d745a944e1c0844dd Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Wed, 19 Mar 2025 11:29:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat=20=E6=97=A0=E8=AE=A2=E5=8D=95=E6=97=A0?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=85=A5=E5=BA=93-=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/controller/CacheWareController.java | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java new file mode 100644 index 0000000..fc4ff7b --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java @@ -0,0 +1,59 @@ +package com.cim.idm.controller; + +import com.cim.idm.framework.IDMFrameServiceProxy; +import com.cim.idm.framework.data.EventInfo; +import com.cim.idm.response.BaseResponse; +import com.cim.idm.response.RespGenerator; +import com.cim.idm.utils.EventInfoUtil; +import io.swagger.annotations.Api; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.sql.Timestamp; +import java.text.ParseException; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.Map; + +@Api("无订单无批次缓存仓") +@RestController +@RequestMapping("/stockIn") +@EnableAutoConfiguration +public class CacheWareController { + + @RequestMapping(value = "/checkNChargeNOrder", method = RequestMethod.POST) + public BaseResponse> checkNChargeNOrder(@RequestBody Map params) throws ParseException { + + String sitename = (String)params.get("SITENAME"); + String userid = (String)params.get("USERID"); + String materialspecname = (String)params.get("MATERIALSPECNAME"); + String makedatet = (String) params.get("MAKEDATE"); + // @TODO 原代码异常：Timestamp makedate = Timestamp.valueOf(makedatet); + Timestamp makedate = Timestamp.from( + LocalDateTime.parse(makedatet, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")) + .atZone(ZoneOffset.UTC).toInstant()); + String is_sure = (String)params.get("IS_SURE"); + + Map bindMap = new HashMap(); + + bindMap.put("SITENAME", sitename); + bindMap.put("MATERIALSPECNAME", materialspecname); + bindMap.put("MAKEDATE", makedate); + bindMap.put("IS_SURE", is_sure); + + String sql = "UPDATE MATERIALCACHE E SET E.IS_SURE = :IS_SURE WHERE E.MATERIALSPECNAME = :MATERIALSPECNAME AND SITENAME = :SITENAME AND MAKEDATE = :MAKEDATE"; + IDMFrameServiceProxy.getSqlTemplate().update(sql, bindMap); + + EventInfo eventInfo = new EventInfoUtil().makeEventInfo("checkNChargeNOrder", userid, "checkNChargeNOrder"); + + BaseResponse returnOK = RespGenerator.returnOK(params); + return returnOK; + + } +} From 0becda94f8e0b27374942d3c1a29b581c5d8854d Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Wed, 19 Mar 2025 14:48:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat=20=E5=BD=A2=E6=80=81=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?-=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java index 89d865b..1a091e0 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java @@ -70,7 +70,7 @@ public class MoveTransformServiceImpl { } else if (parseFloat - materialQuantity2 == 0) { hashMap.put("stockState", "StockOut"); } else { - hashMap.put("MaterialQuantity", materialQuantity2 - parseFloat ); + hashMap.put("materialQuantity", materialQuantity2 - parseFloat ); } setEventInfo.setUserColumns(hashMap); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPacking.getKey(), makeEventInfo, setEventInfo);