From a006bb4695b29bd0a78ccbf62f6841d08ceb7048 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 22 一月 2026 13:36:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 18 ++++----
src/main/webapp/static/js/common.js | 4 +-
src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java | 1
src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java | 7 +++
src/main/java/com/zy/asrs/entity/BasAgvMast.java | 2 +
src/main/java/com/zy/asrs/entity/BasAgvMastLog.java | 4 ++
src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java | 4 +-
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 29 ++++++++------
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 1
10 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java b/src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java
index 282cd59..e2e0e7e 100644
--- a/src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasAgvMastLogController.java
@@ -39,6 +39,7 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
+ wrapper.orderBy("modi_time", false);
excludeTrash(param);
convert(param, wrapper);
allLike(BasAgvMastLog.class, param.keySet(), wrapper, condition);
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
index f2a4e39..4489c02 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
@@ -97,7 +97,7 @@
final double LENGTH_MIN = 315, LENGTH_MAX = 1150;
final double WIDTH_MIN = 160, WIDTH_MAX = 730;
final double HEIGHT_MIN = 140, HEIGHT_MAX = 810;
-
+ final double WIEGHT_MIN = 0,WIEGHT_MAX = 23;
for (OrderDetlPakin detl : list) {
Mat mat = matService.selectOne(
new EntityWrapper<Mat>().eq("matnr", detl.getMatnr())
@@ -110,6 +110,7 @@
Double len = mat.getManLength();
Double wid = mat.getWidth();
Double hei = mat.getHeight();
+ Double WET = mat.getWeight();
if (len == null || len < LENGTH_MIN || len > LENGTH_MAX) {
errorMessages.add(String.format("鐗╂枡 %s 闀垮害寮傚父锛氬繀椤� %.0f~%.0f mm锛屽綋鍓� %s",
@@ -123,6 +124,10 @@
errorMessages.add(String.format("鐗╂枡 %s 楂樺害寮傚父锛氬繀椤� %.0f~%.0f mm锛屽綋鍓� %s",
detl.getMatnr(), HEIGHT_MIN, HEIGHT_MAX, hei));
}
+ if (hei == null || WET < WIEGHT_MIN || WET > WIEGHT_MAX) {
+ errorMessages.add(String.format("鐗╂枡 %s 姣涢噸寮傚父锛氬繀椤� %.0f~%.0f mm锛屽綋鍓� %s",
+ detl.getMatnr(), WIEGHT_MIN, WIEGHT_MAX, hei));
+ }
}
if (!errorMessages.isEmpty()) {
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMast.java b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
index 22524b2..f29fcc3 100644
--- a/src/main/java/com/zy/asrs/entity/BasAgvMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
@@ -196,6 +196,8 @@
return "瀹屾垚";
case 3:
return "杞巻鍙�";
+ case 4:
+ return "涓婃姤瀹屾垚";
default:
return String.valueOf(this.status);
}
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java b/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java
index 18ab894..73a16db 100644
--- a/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java
@@ -209,6 +209,10 @@
return "浣滀笟涓�";
case 2:
return "瀹屾垚";
+ case 3:
+ return "杞巻鍙�";
+ case 4:
+ return "涓婃姤瀹屾垚";
default:
return String.valueOf(this.status);
}
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 dfe6818..a8c1633 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -925,7 +925,7 @@
if(combMat.getSupplier().equals("1")){
List<OrderDetlPakin> orderDetlPakins2 = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
.eq("matnr", combMat.getMatnr()).eq("box_type3", combMat.getOrderNo())
- .eq("box_type2","BU-00001"));
+ .in("box_type2", "BU-00001", "BU-00002"));
if (orderDetlPakins2.size() > 0) {
orderNo1 = orderDetlPakins2.get(0).getOrderNo();
} else {
diff --git a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
index e404fa7..12e0e3d 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
@@ -27,8 +27,8 @@
inboundOrderHandler.syncMaterialData(); // 鍚屾鐗╂枡妗ｆ
}
- // @Scheduled(cron = "0 */6 * * * ?")
- @Scheduled(cron = "0/5 * * * * ?")
+ @Scheduled(cron = "0 */6 * * * ?")
+// @Scheduled(cron = "0/5 * * * * ?")
void login(){
if(!InboundOrderSwitch){
return;
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 9cdf5dc..322d2d6 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -336,7 +336,7 @@
if (mat.getUpdateTime().compareTo(modifyTime) != 0) {
// 鏇存柊瀛楁
if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
- if (!mat.getMemo().equals(memo)) mat.setMemo(memo);
+ if (mat.getMemo() == null || !mat.getMemo().equals(memo)) mat.setMemo(memo);
if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
if (mat.getUnits().compareTo(netweight) != 0) mat.setUnits(netweight);
if (mat.getSafeQty().compareTo(unit) != 0) mat.setSafeQty(unit);
@@ -489,14 +489,14 @@
JSONObject jsonObjectNew2 = rows.getJSONObject(i);
Order order = orderService.selectByNo(billNo);//妫�绱㈠崟鎹�
LocOwner locOwner = null;
- if (ownerUuid != null) {
- locOwner = locOwnerService.selectByUuid(ownerUuid);
- if (locOwner == null) {
- callApiLogSaveOwner(locOwner,kingDeeUtilType, "璐т富妫�绱㈠け璐ワ紝璇峰厛娣诲姞瀵瑰簲璐т富缂栧彿锛�"+ownerUuid+"鍚嶇О"+owner, false);continue;
- }
- } else{
- callApiLogSaveOwner(locOwner,kingDeeUtilType, "璐т富妫�绱㈠け璐ワ紝鏈煡璇㈠埌璐т富缂栧彿锛�", false);continue;
- }
+// if (ownerUuid != null) {
+// locOwner = locOwnerService.selectByUuid(ownerUuid);
+// if (locOwner == null) {
+// callApiLogSaveOwner(locOwner,kingDeeUtilType, "璐т富妫�绱㈠け璐ワ紝璇峰厛娣诲姞瀵瑰簲璐т富缂栧彿锛�"+ownerUuid+"鍚嶇О"+owner, false);continue;
+// }
+// } else{
+// callApiLogSaveOwner(locOwner,kingDeeUtilType, "璐т富妫�绱㈠け璐ワ紝鏈煡璇㈠埌璐т富缂栧彿锛�", false);continue;
+// }
if (Cools.isEmpty(order)) {
// 鍗曟嵁涓绘。
order = new Order(
@@ -1581,16 +1581,19 @@
for (int k = 0; k < billEntryArray.size(); k++) {
JSONObject entry = billEntryArray.getJSONObject(k);
String matnr = entry.getString("material_number"); //鐗╂枡缂栫爜锛屽唴閮⊿KU
- Double anfmeBox = 0.0;//绠辨暟
+ Double anfmeBox = entry.getDouble("eap7_integerfield");//绠辨暟
Double anfme = entry.getDouble("completqty");//涓暟
Double totalNumItems = entry.getDouble("eap7_decimalfield1");//鎬讳欢鏁�
Double totalVolume = entry.getDouble("eap7_decimalfield2");//鎬讳綋绉�
String warehouse = entry.getString("warehouse_number");//浠撳簱缂栫爜
+ if(kingDeeUtilType.formId.equals("OUI_RECEIVEBIll")){
+
+ }
String pOrderNo = entry.getString("eap7_textfield");//閲囪喘鍗曞彿
- String s3 = entry.getString("eap7_textfield4");//瀹㈡埛sku锛堝鎴风紪鍙凤級
+ String s3 = entry.getString("eap7_textfield2");//瀹㈡埛sku锛堝鎴风紪鍙凤級
String s2 = entry.getString("eap7_textfield1"); //鏉＄爜UPC
- String memo = entry.getString("eap7_textfield6"); //澶囨敞锛堣嫳鏂囨弿杩帮級
- String s1 = entry.getString("eap7_textfield7"); //瀹㈡埛PO
+ String memo = entry.getString("eap7_textfield5"); //澶囨敞锛堣嫳鏂囨弿杩帮級
+ String s1 = entry.getString("eap7_textfield4"); //瀹㈡埛PO
String detlId = entry.getString("id"); //鏄庣粏id
Long seq = entry.getLong("seq"); //鍒嗗綍琛屽彿
Double taxrate = entry.getDouble("taxrate");
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
index 9a15295..8aaef60 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
@@ -250,6 +250,7 @@
orderService.updateOrderStatus4(order1.getOrderNo());
}
order.setSettle(8L); // 鏇存柊鐘舵�佷负宸蹭笂鎶ュ鏍� 9->8
+ orderService.updateById(order);
}
orderService.updateById(order);
} else {
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
index 25ca030..0fdc534 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -4,16 +4,16 @@
BD_MATERIAL(0, "鐗╂枡妗ｆ","BD_MATERIAL","","","",1),
BD_RRGANIZATION(2, "渚涘簲鍟�","BD_RRGANIZATION","","","",1),
PUR_RECEIVEBIll(3, "鏀舵枡鍗�","PUR_RECEIVEBIll","","","",1),
-// SAL_OUTSTOCK(7, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",0),
-// STK_MisDelivery(19, "鍏朵粬鍑哄簱鍗�","STK_MisDelivery","FQty","","",0),
-// STK_MISCELLANEOUS(18, "鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS","FQty","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1),
+ SAL_OUTSTOCK(7, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",0),
+ STK_MisDelivery(19, "鍏朵粬鍑哄簱鍗�","STK_MisDelivery","FQty","","",0),
+ STK_MISCELLANEOUS(18, "鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS","FQty","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1),
-// SAL_RETURNSTOCK(9, "閿�鍞��璐у崟","SAL_RETURNSTOCK","","","",1),
-// PRD_PickMtrl(10, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","","","",0),
-// PRD_ReturnMtrl(12, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","","","",1),
-// PRD_FeedMtrl(14, "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl","","","",0),
-// PRD_MORPT(16, "鐢熶骇姹囨姤鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","",1),
-// OUI_RECEIVEBIll(24, "濮斿鍏ュ簱鍗�","OUI_RECEIVEBIll","","","",1),
+ SAL_RETURNSTOCK(9, "閿�鍞��璐у崟","SAL_RETURNSTOCK","","","",1),
+ PRD_PickMtrl(10, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","","","",0),
+ PRD_ReturnMtrl(12, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","","","",1),
+ PRD_FeedMtrl(14, "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl","","","",0),
+ PRD_MORPT(16, "鐢熶骇姹囨姤鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","",1),
+ OUI_RECEIVEBIll(24, "濮斿鍏ュ簱鍗�","OUI_RECEIVEBIll","","","",1),
// PUR_MRB(2, "閲囪喘閫�鏂欏崟","PUR_MRB","FRMREALQTY","","",1),
// STK_TransferDirect(6, "鐩存帴璋冩嫧鍗�","STK_TransferDirect","","FQty","",1),
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index e9a4aba..754cddc 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -194,14 +194,14 @@
// ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
// ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'standby2', align: 'center',title: '鏉＄爜upc', hide: true}
- ,{field: 'units', align: 'center',title: '鍗曠姣涢噸kg', hide: false}
+ ,{field: 'weight', align: 'center',title: '鍗曠姣涢噸kg', hide: false}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: true}
,{field: 'manu', align: 'center',title: '浠撳簱缂栫爜', hide: true}
// ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
// ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '鎬讳欢鏁�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲峩g', hide: false}
+ ,{field: 'units', align: 'center',title: '鍗曠鍑�閲峩g', hide: false}
,{field: 'manLength', align: 'center',title: '闀匡紙姣背锛�', hide: false}
,{field: 'width', align: 'center',title: '瀹斤紙姣背锛�', hide: false}
,{field: 'height', align: 'center',title: '楂橈紙姣背锛�', hide: false}
--
Gitblit v1.9.1