From 0bc29a7e71e0c740eb6d136e5666aa716163d92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Thu, 9 Oct 2025 14:38:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                              | 4 ++++
 .../api/service/impl/IfsCallErrorLogServiceImpl.java      | 4 ++--
 .../service/impl/WcsIntegrationServiceImpl.java           | 4 ++--
 .../other/service/impl/InventoryMoveServiceImpl.java      | 8 ++++----
 .../mapper/automatedWarehouse/WcsIntegrationMapper.xml    | 2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index aeedde1..434d09f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -132,3 +132,7 @@ sourceSets {
 		}
 	}
 }
+
+jar {
+	enabled = false
+}
diff --git a/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java
index b9e3830..4f0d1bc 100644
--- a/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java
@@ -287,9 +287,9 @@ public class IfsCallErrorLogServiceImpl extends ServiceImpl<IfsCallErrorLogMappe
                 params.put("lotBatchNo", errorLog.getLotBatchNo());
                 
                 if (errorLog.getExpiredDate() != null) {
-                    params.put("expiredDate", new SimpleDateFormat("yyyy-MM-dd").format(errorLog.getExpiredDate()));
+                    params.put("expiryDate", new SimpleDateFormat("yyyy-MM-dd").format(errorLog.getExpiredDate()));
                 } else {
-                    params.put("expiredDate", null);
+                    params.put("expiryDate", null);
                 }
                 
                 ObjectMapper objectMapper = new ObjectMapper();
diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
index 61a1a90..edd54e2 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
@@ -1287,7 +1287,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
             throw new Exception("栈板不存在");
         }
 
-        // 根据序列号去修改最新的发货通知单
+
 
         List<PalletDetailData> newDetail=wcsIntegrationMapper.getPalletDetailsNewDetail(site, palletId);
         if(newDetail.isEmpty()){
@@ -1300,7 +1300,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
             }
         }
 
-        //根据序列号去更新最新的
+
 
 
         // 调用pushPalletDetailNew方法推送组托数据
diff --git a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java
index f6b3f26..70228c3 100644
--- a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java
@@ -339,9 +339,9 @@ public class InventoryMoveServiceImpl implements InventoryMoveService {
 
              // 添加过期日期参数
              if (group.expiredDate != null) {
-                 params.put("expiredDate", new SimpleDateFormat("yyyy-MM-dd").format(group.expiredDate));
+                 params.put("expiryDate", new SimpleDateFormat("yyyy-MM-dd").format(group.expiredDate));
              } else {
-                 params.put("expiredDate", null);
+                 params.put("expiryDate", null);
              }
 
              ObjectMapper objectMapper = new ObjectMapper();
@@ -391,9 +391,9 @@ public class InventoryMoveServiceImpl implements InventoryMoveService {
 
             // 添加过期日期参数
             if (group.expiredDate != null) {
-                params.put("expiredDate", new SimpleDateFormat("yyyy-MM-dd").format(group.expiredDate));
+                params.put("expiryDate", new SimpleDateFormat("yyyy-MM-dd").format(group.expiredDate));
             } else {
-                params.put("expiredDate", null);
+                params.put("expiryDate", null);
             }
 
             ObjectMapper objectMapper = new ObjectMapper();
diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
index 0cd992b..142cdfc 100644
--- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
@@ -602,7 +602,7 @@
     </update>
     
     <update id="updatePalletWcsLocation" >
-        update pallet set location_code = #{location},updated_by='wms_sys',updated_time=getdate()
+        update pallet set wcs_location = #{location},updated_by='wms_sys',updated_time=getdate()
         where site = #{site} and pallet_id = #{palletId}
     </update>