diff --git a/src/main/java/com/gaotao/modules/warehouse/entity/Pallet.java b/src/main/java/com/gaotao/modules/warehouse/entity/Pallet.java
index fc55505..6831403 100644
--- a/src/main/java/com/gaotao/modules/warehouse/entity/Pallet.java
+++ b/src/main/java/com/gaotao/modules/warehouse/entity/Pallet.java
@@ -28,7 +28,7 @@ public class Pallet {
private String status; // 托盘状态: AVAILABLE=可用, OCCUPIED=使用中, DAMAGED=损坏, DISABLED=禁用
- private String locationCode; // 所在库位编码(可选)
+ private String locationCode; // 所在站点
private String remark; // 备注信息
@@ -38,7 +38,7 @@ public class Pallet {
private Date createdTime; // 创建时间
private String updatedBy; // 最后修改人
- private String warehouseId;
+
private String callingFlag; // 调用标志:Y=正在被调用, N=未被调用
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b8cf2b0..ece3b7d 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,9 +5,11 @@ spring:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
type: com.alibaba.druid.pool.DruidDataSource
#url: jdbc:sqlserver://192.168.1.90:1433;databaseName=ccl_wms
- url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=ccl_wms
+# url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=ccl_wms
+ url: jdbc:sqlserver://localhost:1433;databaseName=ccl_wms
username: sa
- password: XJsoft123
+# password: XJsoft123
+ password: rqRQ123123
initial-size: 10
max-active: 100
min-idle: 10
diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
index 7ced29f..14f77d2 100644
--- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
@@ -66,7 +66,7 @@
@@ -175,9 +175,7 @@
UPDATE pallet_detail
SET position = #{newPosition},
layer = #{newLayer},
- wcs_flag = 1,
- updated_by = #{updatedBy},
- updated_date = GETDATE()
+ wcs_flag = 1
WHERE site = #{site}
AND pallet_id = #{palletId}
AND serial_no = #{serialNo}
@@ -318,8 +316,7 @@
UPDATE pallet_detail
- SET wcs_flag = 0,
- updated_date = GETDATE()
+ SET wcs_flag = 0
WHERE site = #{site}
AND pallet_id = #{palletId}
AND wcs_flag = 1