From c6e32e5da5d30ce2f74f0e32c3290d421c0951f2 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 13 十二月 2025 17:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 4 +++-
src/main/webapp/static/js/orderPakout/order.js | 2 +-
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 8 ++++----
src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 8 +++++---
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 50cd969..62bf69c 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -69,10 +69,10 @@
Integer number = basArmRulesService.getNumber(mat.getWeight(),mat.getVolume(),mat.getManLength(),mat.getWidth(),mat.getHeight());
if (number == null) {
BasArmRules basArmRules = new BasArmRules();
- basArmRules.setMaterialHeight(orderDetl.getHeight());
- basArmRules.setMaterialWeight(orderDetl.getWeight());
- basArmRules.setMaterialLength(orderDetl.getManLength());
- basArmRules.setMaterialWidth(orderDetl.getWidth());
+ basArmRules.setMaterialHeight(mat.getHeight());
+ basArmRules.setMaterialWeight(mat.getWeight());
+ basArmRules.setMaterialLength(mat.getManLength());
+ basArmRules.setMaterialWidth(mat.getWidth());
basArmRulesService.insert(basArmRules);
return;
} else if (number == 0){
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 2c71823..3ba7620 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
@@ -18,7 +18,7 @@
@Value("${erp.switch.InboundOrderSwitch}")
private boolean InboundOrderSwitch;
- @Scheduled(cron = "0 */30 * * * ?")
+ @Scheduled(cron = "0 */15 * * * ?")
void login(){
if(!InboundOrderSwitch){
return;
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 bd93c82..3c76f7e 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
@@ -107,7 +107,10 @@
SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
JSONArray idArray = new JSONArray();
JSONObject dataObj = new JSONObject();
- switch (kingDeeUtilType.formId) {
+ if(kingDeeUtilType == null){
+ return null;
+ }
+ switch(kingDeeUtilType.formId) {
case "PUR_RECEIVEBIll": // 杩涗粨閫氱煡鍗曟彁浜�
path = imPurinbillBatchAudit;
idArray.add(order.getNumber());
@@ -195,9 +198,8 @@
}
// 瑙ｆ瀽杩斿洖鐨勫搷搴�
JSONObject data = jsonResponse.getJSONObject("data");
- String errorCode = jsonResponse.getString("errorCode");
boolean status = jsonResponse.getBooleanValue("status");
- if ("0".equals(errorCode) && status) {
+ if (status) {
// 鑾峰彇鎴愬姛涓庡け璐ョ殑鏁伴噺
int successCount = data.getInteger("successCount");
int failCount = data.getInteger("failCount");
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
index dcf1509..c8f8fdd 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -82,7 +82,9 @@
private JSONObject buildRequestParams(Order order, KingDeeUtilType kingDeeUtilType, SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",order.getOrderNo()));
-
+ if(kingDeeUtilType == null){
+ return null;
+ }
switch (kingDeeUtilType.formId) {
case "PUR_RECEIVEBIll": // 杩涗粨閫氱煡鍗�
path = imPurinbillAdd;
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index ec96ddb..f6656d4 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -129,7 +129,7 @@
{field: 'standby3', title: '瀹㈡埛SKU'},
{field: 'boxType1', title: '璐т富'},
{field: 'boxType3', title: '閲囪喘鍗曞彿'},
- ,{field: 'standby1', align: 'center',title: '瀹㈡埛PO', hide: false}
+ {field: 'standby1', align: 'center',title: '瀹㈡埛PO', hide: false}
,{field: 'standby2', align: 'center',title: 'UPC', hide: false},
// {field: 'batch', title: '鎵瑰彿'},
// {field: 'anfme', title: '鏁伴噺'},
--
Gitblit v1.9.1