diff --git a/wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java b/wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java
index d1ef9a4..198c14a 100644
--- a/wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java
+++ b/wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java
@@ -402,10 +402,12 @@ public class TOngoodsshelfController extends BaseController
return "当前入库物料在EBS中没有对应订单！";
}
// 插入ebsOrder表
+ int i = 1;
for (TEbsOrder targetOrder : targetOrders) {
targetOrder.setCreateDate(new Date());
targetOrder.setCreateTime(new Date());
targetOrder.setUpdateTime(new Date());
+ targetOrder.setLocalLineNum(i++);
itEbsOrderService.insertTEbsOrder(targetOrder);
}
}
diff --git a/wms-admin/target/classes/application-druid.yml b/wms-admin/target/classes/application-druid.yml
index 005eb15..abb069e 100644
--- a/wms-admin/target/classes/application-druid.yml
+++ b/wms-admin/target/classes/application-druid.yml
@@ -5,16 +5,19 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
-# master:
-# url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: root
-## password: ntscc@2018
-# password: root
-
master:
- url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: developer
- password: developer
+# url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://39.98.53.180:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: root
+# password: ntscc@2018
+ username: tony
+ password: Tony123
+ # password: root
+
+# master:
+# url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: developer
+# password: developer
# 从库数据源
slave:
# 从数据源开关/默认关闭
@@ -41,7 +44,7 @@ spring:
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
- webStatFilter:
+ webStatFilter:
enabled: true
statViewServlet:
enabled: true
@@ -60,4 +63,4 @@ spring:
merge-sql: true
wall:
config:
- multi-statement-allow: true
\ No newline at end of file
+ multi-statement-allow: true
diff --git a/wms-business/src/main/java/com/ruoyi/business/domain/TEbsOrder.java b/wms-business/src/main/java/com/ruoyi/business/domain/TEbsOrder.java
index b55ccc6..e81e6d4 100644
--- a/wms-business/src/main/java/com/ruoyi/business/domain/TEbsOrder.java
+++ b/wms-business/src/main/java/com/ruoyi/business/domain/TEbsOrder.java
@@ -208,6 +208,18 @@ public class TEbsOrder extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
+ @Excel(name = "本地行号")
+ @TableField("localLineNum")
+ private Integer localLineNum;
+
+ public Integer getLocalLineNum() {
+ return localLineNum;
+ }
+
+ public void setLocalLineNum(Integer localLineNum) {
+ this.localLineNum = localLineNum;
+ }
+
public String getPhaSegment1() {
return phaSegment1;
}
@@ -423,5 +435,39 @@ public class TEbsOrder extends BaseEntity {
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
+
+ @Override
+ public String toString() {
+ return "TEbsOrder{" +
+ "phaSegment1='" + phaSegment1 + '\'' +
+ ", shipmentNum=" + shipmentNum +
+ ", distributionNum=" + distributionNum +
+ ", supplyTypeCode='" + supplyTypeCode + '\'' +
+ ", msQuantity=" + msQuantity +
+ ", poDistributionId=" + poDistributionId +
+ ", poHeaderId=" + poHeaderId +
+ ", poLineId=" + poLineId +
+ ", lineNum=" + lineNum +
+ ", orgId=" + orgId +
+ ", shipToOrganizationId=" + shipToOrganizationId +
+ ", itemId=" + itemId +
+ ", itemDescription='" + itemDescription + '\'' +
+ ", unitMeasLookupCode='" + unitMeasLookupCode + '\'' +
+ ", unitPrice=" + unitPrice +
+ ", quantity=" + quantity +
+ ", quantityReceived=" + quantityReceived +
+ ", closedCode='" + closedCode + '\'' +
+ ", lineLocationId=" + lineLocationId +
+ ", vendorId=" + vendorId +
+ ", vendorName='" + vendorName + '\'' +
+ ", wipEntityId='" + wipEntityId + '\'' +
+ ", receivingRoutingId=" + receivingRoutingId +
+ ", lotControl='" + lotControl + '\'' +
+ ", checkPriority='" + checkPriority + '\'' +
+ ", dueDate=" + dueDate +
+ ", createDate=" + createDate +
+ ", localLineNum=" + localLineNum +
+ '}';
+ }
}
diff --git a/wms-business/src/main/resources/mapper/TEbsOrderMapper.xml b/wms-business/src/main/resources/mapper/TEbsOrderMapper.xml
index 850ed13..86b2a2d 100644
--- a/wms-business/src/main/resources/mapper/TEbsOrderMapper.xml
+++ b/wms-business/src/main/resources/mapper/TEbsOrderMapper.xml
@@ -32,6 +32,7 @@
+
@@ -43,6 +44,7 @@
and phaSegment1 = #{phaSegment1}
and itemId = #{itemId}
+ and local_line_num = #{localLineNum}
order by dueDate;
@@ -78,6 +80,7 @@
dueDate,
createDate,
CREATE_TIME,
+ local_line_num,
#{phaSegment1},
@@ -108,40 +111,11 @@
#{dueDate},
#{createDate},
#{createTime},
+ #{createTime},
+ #{localLineNum},
-
- update t_ebs_order
-
- shipmentNum = #{shipmentNum},
- distributionNum = #{distributionNum},
- supplyTypeCode = #{supplyTypeCode},
- msQuantity = #{msQuantity},
- poDistributionId = #{poDistributionId},
- poHeaderId = #{poHeaderId},
- poLineId = #{poLineId},
- lineNum = #{lineNum},
- orgId = #{orgId},
- shipToOrganizationId = #{shipToOrganizationId},
- itemDescription = #{itemDescription},
- unitMeasLookupCode = #{unitMeasLookupCode},
- unitPrice = #{unitPrice},
- quantity = #{quantity},
- quantityReceived = #{quantityReceived},
- closedCode = #{closedCode},
- lineLocationId = #{lineLocationId},
- vendorId = #{vendorId},
- vendorName = #{vendorName},
- wipEntityId = #{wipEntityId},
- receivingRoutingId = #{receivingRoutingId},
- lotControl = #{lotControl},
- checkPriority = #{checkPriority},
- UPDATE_TIME = #{updateTime},
-
- where id = #{id}
-
-
update t_ebs_order
@@ -170,10 +144,18 @@
checkPriority = #{checkPriority},
UPDATE_TIME = #{updateTime},
- where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
+
+ phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
+ and local_line_num = #{localLineNum}
+
- delete from t_ebs_order where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
+ delete from t_ebs_order
+
+ phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
+ and local_line_num = #{localLineNum}
+
+
diff --git a/wms-business/target/classes/mapper/TEbsOrderMapper.xml b/wms-business/target/classes/mapper/TEbsOrderMapper.xml
index 850ed13..86b2a2d 100644
--- a/wms-business/target/classes/mapper/TEbsOrderMapper.xml
+++ b/wms-business/target/classes/mapper/TEbsOrderMapper.xml
@@ -32,6 +32,7 @@
+
@@ -43,6 +44,7 @@
and phaSegment1 = #{phaSegment1}
and itemId = #{itemId}
+ and local_line_num = #{localLineNum}
order by dueDate;
@@ -78,6 +80,7 @@
dueDate,
createDate,
CREATE_TIME,
+ local_line_num,
#{phaSegment1},
@@ -108,40 +111,11 @@
#{dueDate},
#{createDate},
#{createTime},
+ #{createTime},
+ #{localLineNum},
-
- update t_ebs_order
-
- shipmentNum = #{shipmentNum},
- distributionNum = #{distributionNum},
- supplyTypeCode = #{supplyTypeCode},
- msQuantity = #{msQuantity},
- poDistributionId = #{poDistributionId},
- poHeaderId = #{poHeaderId},
- poLineId = #{poLineId},
- lineNum = #{lineNum},
- orgId = #{orgId},
- shipToOrganizationId = #{shipToOrganizationId},
- itemDescription = #{itemDescription},
- unitMeasLookupCode = #{unitMeasLookupCode},
- unitPrice = #{unitPrice},
- quantity = #{quantity},
- quantityReceived = #{quantityReceived},
- closedCode = #{closedCode},
- lineLocationId = #{lineLocationId},
- vendorId = #{vendorId},
- vendorName = #{vendorName},
- wipEntityId = #{wipEntityId},
- receivingRoutingId = #{receivingRoutingId},
- lotControl = #{lotControl},
- checkPriority = #{checkPriority},
- UPDATE_TIME = #{updateTime},
-
- where id = #{id}
-
-
update t_ebs_order
@@ -170,10 +144,18 @@
checkPriority = #{checkPriority},
UPDATE_TIME = #{updateTime},
- where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
+
+ phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
+ and local_line_num = #{localLineNum}
+
- delete from t_ebs_order where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
+ delete from t_ebs_order
+
+ phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
+ and local_line_num = #{localLineNum}
+
+