From 12e16a4e48fa33ead5aae7ca065fdea636135527 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 13 八月 2024 12:55:26 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/AbstractHandler.java | 2
zy-asrs-openapi/src/main/resources/application.yml | 2
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 94 ++++++++++++++++++++++++----------------------
zy-asrs-wms/license.lic | 0
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 1
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlLogServiceImpl.java | 2
7 files changed, 54 insertions(+), 49 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index afd169f..d92a820 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -298,7 +298,7 @@
private String tmp3;
//鎸夐渶姹傝ˉ璐�
- @TableField("replenishment_num")
+ @TableField("restock_demand")
private String restockDemand;
//澶辨晥
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index 84bbd7b..4a90791 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -443,6 +443,7 @@
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setBarcode(locMast.getBarcode());
wrkMast.setAppeUser(String.valueOf(userId)); // 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlLogServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlLogServiceImpl.java
index 0ef3518..1ec4df3 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlLogServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlLogServiceImpl.java
@@ -11,6 +11,6 @@
@Override
public boolean saveToHistory(Integer workNo, Long hostId) {
- return this.baseMapper.saveToHistory(workNo, hostId) > 0;
+ return this.baseMapper.saveToHistory(workNo, hostId) >= 0;
}
}
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
index 4f0fd6c..36909a4 100644
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
+++ b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
@@ -168,55 +168,59 @@
@PostMapping("order/execute/auth/v1")
public R wms1(@RequestBody Map<String, Object> map) {
- log.info("order/execute/auth/v1锛�" + JSON.toJSONString(map));
- OrderParam orderParam = JSON.parseObject(JSON.toJSONString(map), OrderParam.class);
- List<DocType> list = apiService.getOrderType();
- DocType type = null;
- for (DocType docType : list) {
- if (docType.getDocName().equals(orderParam.getOrderType())) {
- type = docType;
- break;
+ try {
+ log.info("order/execute/auth/v1锛�" + JSON.toJSONString(map));
+ OrderParam orderParam = JSON.parseObject(JSON.toJSONString(map), OrderParam.class);
+ List<DocType> list = apiService.getOrderType();
+ DocType type = null;
+ for (DocType docType : list) {
+ if (docType.getDocName().equals(orderParam.getOrderType())) {
+ type = docType;
+ break;
+ }
}
- }
- if (type == null) {
- return R.error("鍗曟嵁绫诲瀷涓嶅瓨鍦�");
- }
+ if (type == null) {
+ return R.error("鍗曟嵁绫诲瀷涓嶅瓨鍦�");
+ }
- ArrayList<GenerateOrderMatParam> mats = new ArrayList<>();
- for (MatParam matParam : orderParam.getList()) {
- GenerateOrderMatParam mat = new GenerateOrderMatParam();
- mat.setMatnr(matParam.getMatnr());
- mat.setBatch(matParam.getBatch());
- mat.setAnfme(matParam.getCount());
- mat.setUnit(matParam.getUnit());
- mat.setWarehouse(matParam.getWarehouse());
- mat.setOrigin(matParam.getOrigin());
- mat.setOriginNo(matParam.getOriginNo());
- mats.add(mat);
- }
+ ArrayList<GenerateOrderMatParam> mats = new ArrayList<>();
+ for (MatParam matParam : orderParam.getList()) {
+ GenerateOrderMatParam mat = new GenerateOrderMatParam();
+ mat.setMatnr(matParam.getMatnr());
+ mat.setBatch(matParam.getBatch());
+ mat.setAnfme(matParam.getCount());
+ mat.setUnit(matParam.getUnit());
+ mat.setWarehouse(matParam.getWarehouse());
+ mat.setOrigin(matParam.getOrigin());
+ mat.setOriginNo(matParam.getOriginNo());
+ mats.add(mat);
+ }
- if (orderParam.getInOut() == 1) {
- //鍏ュ簱
- GenerateOrderPakInParam param = new GenerateOrderPakInParam();
- param.setHostId(1L);
- param.setOrderType(type.getDocId().intValue());
- param.setOrderNo(orderParam.getOrderNo());
- param.setMats(mats);
- apiService.generateOrderPakIn(param);
- } else if (orderParam.getInOut() == 2) {
- //鍑哄簱
- GenerateOrderPakOutParam param = new GenerateOrderPakOutParam();
- param.setHostId(1L);
- param.setOrderType(type.getDocId().intValue());
- param.setOrderNo(orderParam.getOrderNo());
- param.setMats(mats);
- apiService.generateOrderPakOut(param);
- }else {
- //鍏朵粬
- return R.error("鍑哄叆搴撶被鍨嬮敊璇�");
- }
+ if (orderParam.getInOut() == 1) {
+ //鍏ュ簱
+ GenerateOrderPakInParam param = new GenerateOrderPakInParam();
+ param.setHostId(1L);
+ param.setOrderType(type.getDocId().intValue());
+ param.setOrderNo(orderParam.getOrderNo());
+ param.setMats(mats);
+ apiService.generateOrderPakIn(param);
+ } else if (orderParam.getInOut() == 2) {
+ //鍑哄簱
+ GenerateOrderPakOutParam param = new GenerateOrderPakOutParam();
+ param.setHostId(1L);
+ param.setOrderType(type.getDocId().intValue());
+ param.setOrderNo(orderParam.getOrderNo());
+ param.setMats(mats);
+ apiService.generateOrderPakOut(param);
+ } else {
+ //鍏朵粬
+ return R.error("鍑哄叆搴撶被鍨嬮敊璇�");
+ }
- return R.ok();
+ return R.ok();
+ } catch (Exception e) {
+ return R.error(e.getMessage());
+ }
}
}
diff --git a/zy-asrs-openapi/src/main/resources/application.yml b/zy-asrs-openapi/src/main/resources/application.yml
index dc86818..5a15aa7 100644
--- a/zy-asrs-openapi/src/main/resources/application.yml
+++ b/zy-asrs-openapi/src/main/resources/application.yml
@@ -28,7 +28,7 @@
# global-config:
# field-strategy: 0
configuration:
- # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
global-config:
diff --git a/zy-asrs-wms/license.lic b/zy-asrs-wms/license.lic
new file mode 100644
index 0000000..4d004a3
--- /dev/null
+++ b/zy-asrs-wms/license.lic
Binary files differ
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/AbstractHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/AbstractHandler.java
index 65bcc7e..575d3ab 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/AbstractHandler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/AbstractHandler.java
@@ -24,7 +24,7 @@
protected void exceptionHandle(String errorMsg, Object... args){
log.error(errorMsg);
- throw new CoolException(MessageFormat.format(errorMsg, args));
+// throw new CoolException(MessageFormat.format(errorMsg, args));
}
}
--
Gitblit v1.9.1