From 6ef5d115862da9aa5e8028315c8ee2ed9de087ac Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 10 九月 2024 13:30:28 +0800
Subject: [PATCH] #
---
license.lic | 0
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 27 +++-----
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 4
src/main/java/com/zy/asrs/controller/OpenController.java | 39 ------------
src/main/java/com/zy/asrs/entity/param/GTOrderParam.java | 4
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2
src/main/java/com/zy/common/model/DetlDto.java | 14 ++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 38 +++++++-----
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java | 16 +++-
9 files changed, 57 insertions(+), 87 deletions(-)
diff --git a/license.lic b/license.lic
new file mode 100644
index 0000000..c42fa89
--- /dev/null
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a2f9051..e273006 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -180,44 +180,7 @@
}
}
- public static void main(String[] args) {
- // 1
- System.out.println("======================================");
- OpenOrderPakinParam param = new OpenOrderPakinParam();
- param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
- param.setOrderType("鎵撳寘涓婄嚎鍗�");
- param.setOrderTime(DateUtils.convert(new Date()));
- List<DetlDto> orderDetails = new ArrayList<>();
- param.setOrderDetails(orderDetails);
- for (int i = 0; i < 3; i++) {
- DetlDto detlDto = new DetlDto();
- switch (i) {
- case 0:
- detlDto.setMatnr("MDH020030530");
- detlDto.setBatch("500");
- detlDto.setAnfme(18.0);
- break;
- case 1:
- detlDto.setMatnr("MDH020016416");
- detlDto.setBatch("500");
- detlDto.setAnfme(32.0);
- break;
- case 2:
- detlDto.setMatnr("LSH90152025");
- detlDto.setAnfme(50.0);
- break;
- default:
- break;
- }
- orderDetails.add(detlDto);
- }
- System.out.println(JSON.toJSONString(param));
- // 2
- System.out.println("======================================");
- OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
- param1.setOrderNo("963001846497017856");
- System.out.println(JSON.toJSONString(param1));
- }
+
/**
diff --git a/src/main/java/com/zy/asrs/entity/param/GTOrderParam.java b/src/main/java/com/zy/asrs/entity/param/GTOrderParam.java
index 79219e7..6f78b21 100644
--- a/src/main/java/com/zy/asrs/entity/param/GTOrderParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/GTOrderParam.java
@@ -6,11 +6,11 @@
@Data
public class GTOrderParam {
- private Integer orderId; // 鍗曟嵁id
- private Integer orderName; //鍗曟嵁鍚嶇О
+ private String orderType; //鍗曟嵁鍚嶇О
private String inboundDate; //鏃ユ湡
private String orderNo; // 鍗曟嵁鍙�
private String warehouse; //浠撳簱
+ private String originWarehouse; //鏉ユ簮浠撳簱
private String suppliers; // 渚涘簲鍟�
private String salesman; //涓氬姟鍛�
private String department; //閮ㄩ棬
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
index 965a9d1..20d2d32 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -11,12 +11,18 @@
@Data
public class OpenOrderPakinParam {
- private String orderNo;
+ private String orderType; //鍗曟嵁鍚嶇О
+ private String inboundDate; //鏃ユ湡
+ private String orderNo; // 鍗曟嵁鍙�
+ private String warehouse; //浠撳簱
+ private String originWarehouse; //鏉ユ簮浠撳簱
+ private String suppliers; // 渚涘簲鍟�
+ private String salesman; //涓氬姟鍛�
+ private String department; //閮ㄩ棬
+ private String businessType; //涓氬姟绫诲瀷
+ private String user; //鍒跺崟浜�
- private String orderType;
- private String orderTime;
-
- private List<DetlDto> orderDetails;
+ private List<DetlDto> orderDetails; //鐗╂枡鍒楄〃
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index 96cad9c..f2c9068 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -15,26 +15,21 @@
@Data
public class OpenOrderPakoutParam {
- private String orderNo;
-
- private String orderType;
-
- private String orderTime;
+ private String orderType; //鍗曟嵁鍚嶇О
+ private String inboundDate; //鏃ユ湡
+ private String orderNo; // 鍗曟嵁鍙�
+ private String warehouse; //浠撳簱
+ private String originWarehouse; //鏉ユ簮浠撳簱
+ private String suppliers; // 渚涘簲鍟�
+ private String salesman; //涓氬姟鍛�
+ private String department; //閮ㄩ棬
+ private String businessType; //涓氬姟绫诲瀷
+ private String user; //鍒跺崟浜�
private List<DetlDto> orderDetails;
private String lgort;
- public static void main(String[] args) {
- OpenOrderPakoutParam param = new OpenOrderPakoutParam();
- param.setOrderNo("LXT12321321");
- param.setOrderType("浜よ揣鍗�");
- param.setOrderTime(DateUtils.convert(new Date()));
- List<DetlDto> orderDetails = new ArrayList<>();
- param.setOrderDetails(orderDetails);
- DetlDto detlDto = new DetlDto("15099-10000", 3.0);
- orderDetails.add(detlDto);
- System.out.println(JSON.toJSONString(param));
- }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2cd706e..3b0146a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -431,7 +431,7 @@
String orderNo = "PACK" + snowflakeIdWorker.nextId();
OpenOrderPakinParam openParam = new OpenOrderPakinParam();
openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(now));
+ openParam.setInboundDate(DateUtils.convert(now));
openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
openParam.setOrderDetails(detlDtos);
openService.pakinOrderCreate(openParam);
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8e74b99..34b6159 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -64,30 +64,30 @@
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ param.getInboundDate(), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getWarehouse(), //浠撳簱 itemName
null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
+ param.getOriginWarehouse(), // 鍒濆绁ㄦ嵁鍙� 鏉ユ簮浠撳簱
+ param.getDepartment(), // 绁ㄦ嵁鍙�
null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ param.getSuppliers(), // 渚涘簲鍟� cstmrName
null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
+ param.getUser(), // 鍒跺崟浜�
null, // 鍚堣閲戦
null, // 浼樻儬鐜�
null, // 浼樻儬閲戦
null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
+ param.getSalesman(), // 涓氬姟鍛�
null, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
+ param.getBusinessType(), // 鐗╂祦鍚嶇О
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
@@ -130,6 +130,9 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setThreeCode(detlDto.getOrderNo());
+ orderDetl.setSuppCode(detlDto.getFromOrderNo());
+ orderDetl.setMemo(detlDto.getMemo());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -199,30 +202,30 @@
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ param.getInboundDate(), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getWarehouse(), //浠撳簱 itemName
null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
+ param.getOriginWarehouse(), // 鍒濆绁ㄦ嵁鍙� 鏉ユ簮浠撳簱
+ param.getDepartment(), // 绁ㄦ嵁鍙�
null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ param.getSuppliers(), // 渚涘簲鍟� cstmrName
null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
+ param.getUser(), // 鍒跺崟浜�
null, // 鍚堣閲戦
null, // 浼樻儬鐜�
null, // 浼樻儬閲戦
null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
+ param.getSalesman(), // 涓氬姟鍛�
null, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
+ param.getBusinessType(), // 鐗╂祦鍚嶇О
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
@@ -265,6 +268,9 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setThreeCode(detlDto.getOrderNo());
+ orderDetl.setSuppCode(detlDto.getFromOrderNo());
+ orderDetl.setMemo(detlDto.getMemo());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index ce2a799..f03b136 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -114,7 +114,7 @@
// 鐢熸垚鍏ュ簱鍗曟嵁
OpenOrderPakinParam openParam = new OpenOrderPakinParam();
openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+ openParam.setInboundDate(DateUtils.convert(wrkMast.getModiTime()));
openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
openParam.setOrderDetails(detlDtos);
openService.pakinOrderCreate(openParam);
@@ -122,7 +122,7 @@
// 鐢熸垚鍑哄簱鍗曟嵁
OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
+ openParam.setInboundDate(DateUtils.convert(wrkMast.getModiTime()));
openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
openParam.setOrderDetails(detlDtos);
openService.pakoutOrderCreate(openParam);
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 650e884..f31c475 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -13,13 +13,13 @@
@Data
public class DetlDto {
- private String orderNo;
-
- private String matnr;
-
- private String batch;
-
- private Double anfme;
+ private String matnr; //鐗╂枡缂栫爜
+ private String maktx; //鐗╂枡鍚嶇О
+ private String batch; //鎵规
+ private Double anfme; //鏁伴噺
+ private String orderNo; //璁㈠崟鍙�
+ private String fromOrderNo; //鏉ユ簮鍗曞彿
+ private String memo; //澶囨敞
public DetlDto() {
}
--
Gitblit v1.9.1