From b8f03bd597383b31b970e198cc707b40bfab1c02 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 03 七月 2025 17:13:06 +0800
Subject: [PATCH] 完善erp对接
---
src/main/resources/mapper/OrderMapper.xml | 2 +-
src/main/webapp/static/js/locDetl/locDetl.js | 4 ++--
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 5 +++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8 ++++----
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 10 +++++-----
src/main/webapp/static/js/common.js | 2 +-
src/main/java/com/zy/asrs/controller/OutController.java | 2 +-
8 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 31ed7a9..3c43c40 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -133,7 +133,7 @@
// 鑾峰彇鍙敤搴撳瓨璁板綍
List<LocDetl> stocks = locDetlService.queryStock(
- orderDetl.getMatnr(), orderDetl.getBatch(), null,
+ orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getSuppCode(),
processedLocs, orderDetl.getSupp(),
orderDetl.getTemp1(), orderDetl.getTemp2()
);
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 aab373f..cefb935 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -331,7 +331,7 @@
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode())
.eq("io_status", "N")
- .eq("matnr", elem.getMatnr()).eq("three_code",elem.getThreeCode()).eq("batch", elem.getBatch())) > 0) {
+ .eq("matnr", elem.getMatnr()).eq("three_code", elem.getThreeCode()).eq("batch", elem.getBatch())) > 0) {
throw new CoolException(param.getBarcode() + "宸叉湁鐩稿悓鏁版嵁");
}
@@ -401,10 +401,10 @@
if (Cools.isEmpty(orderDetl)) {
throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
}
- if (Cools.isEmpty(codeDataParam.getQuality())){
+ if (Cools.isEmpty(codeDataParam.getQuality())) {
throw new CoolException("鏉＄爜鏈繑鍥炶川閲忕姸鎬�");
}
- if (!codeDataParam.getQuality().equals(orderDetl.getInspect())) {
+ if (Integer.parseInt(codeDataParam.getQuality()) != orderDetl.getInspect()) {
throw new CoolException("鍗曟嵁璐ㄩ噺鐘舵�佸拰缁勬墭鐗╂枡涓嶅尮閰�");
}
if (elem.getAnfme() > orderDetl.getEnableQty()) {
@@ -421,7 +421,7 @@
detlDto.setTemp1(codeDataParam.getQuality());
detlDto.setFromOrderNo(codeDataParam.getBarcode());
if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getFromOrderNo());
+ DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getFromOrderNo());
assert one != null;
one.setAnfme(one.getAnfme() + detlDto.getAnfme());
} else {
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
index adabcae..30ea19d 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -38,7 +38,7 @@
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
.eq("order_no", order.getOrderNo()));
moveBoth(order,orderDetls);
- List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("orderNo", order.getOrderNo()));
+ List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
for (OrderDetlReport orderDetlReport : orderNo){
OrderDetlReportLog log = new OrderDetlReportLog();
log.sync(orderDetlReport);
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 5f7cece..1442b28 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -120,7 +120,7 @@
}
}
// 鍑哄簱瀹屾垚涓婃姤
-// if (docType.getPakout() == 1) {
+ if (docType.getPakout() == 1) {
// MesPakoutParam pakoutParam = new MesPakoutParam();
// pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
// pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
@@ -147,9 +147,9 @@
// if (jsonObject.getInteger("code").equals(200)) {
// success = true;
// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
// } else {
// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
// throw new CoolException("涓婃姤mes绯荤粺澶辫触");
@@ -172,7 +172,7 @@
// );
// } catch (Exception e) { log.error("", e); }
// }
-// }
+ }
return SUCCESS;
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 9deabb8..c219daf 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -245,8 +245,9 @@
</if>
order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
- desc,
+ sku,
+ <!-- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ desc, -->
NEWID(),
case
when (left(a.loc_no, 2) = '01') then 0
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 7e84fb4..83bda3c 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -55,7 +55,7 @@
</update>
<select id="selectComplete" resultMap="BaseResultMap">
- select top 5 *
+ select top 10 *
from man_order
where 1=1
and settle = 4
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 8f725f0..41a2537 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -233,6 +233,6 @@
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '鏉ユ簮鍗曞彿', hide: true}
+ // ,{field: 'suppCode', align: 'center',title: '鏉ユ簮鍗曞彿', hide: true}
]
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 10b349a..2ab13b0 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -5,7 +5,7 @@
,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'sku', align: 'center',title: '鎵瑰彿'}
//,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
@@ -15,7 +15,7 @@
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: false}
,{field: 'sku', align: 'center',title: '鎵瑰彿'}
- ,{field: 'suppCode', align: 'center',title: '鏉ユ簮鍗曞彿', hide: false}
+ // ,{field: 'suppCode', align: 'center',title: '鏉ユ簮鍗曞彿', hide: false}
];
--
Gitblit v1.9.1