From c78e0ff5c908de0b15348c9e59db43861a1252c0 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 18 十二月 2025 16:16:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 +++---
src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java | 4 ++--
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 5 +++++
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 3d1f3a2..8ee4377 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -344,9 +344,9 @@
// 鑾峰彇璺緞
StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
- if(ioType.equals(107)){
- staDesc = staDescService.queryCrnStnCheck(ioType, locMast.getCrnNo(), outSta);
- }
+// if(ioType.equals(107)){
+// staDesc = staDescService.queryCrnStnCheck(ioType, locMast.getCrnNo(), outSta);
+// }
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
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 d7d7c24..46985ed 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
@@ -18,8 +18,8 @@
@Value("${erp.switch.InboundOrderSwitch}")
private boolean InboundOrderSwitch;
- @Scheduled(cron = "0 */30 * * * ?")
-// @Scheduled(cron = "0/20 * * * * ?")
+// @Scheduled(cron = "0 */30 * * * ?")
+ @Scheduled(cron = "0/20 * * * * ?")
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 35986a5..37c9926 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
@@ -300,6 +300,8 @@
Double width = jsonObjectNew.get("width") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield8").toString()).doubleValue() : 0.0;
Double length = jsonObjectNew.get("length") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield7").toString()).doubleValue() : 0.0;
Double netweight = jsonObjectNew.get("netweight") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield").toString()).doubleValue() : 0.0;
+ Double unit = jsonObjectNew.get("units") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield2").toString()).doubleValue() : 0.0;
+
// 鐢熸垚鍟嗗搧妗ｆ
Double height1 = height*10;
Double width1 = width*10;
@@ -312,6 +314,7 @@
mat.setTagId(tag.getId());
mat.setWeight(grossweight);//鍑�閲�
mat.setUnits(netweight);//姣涢噸
+ mat.setSafeQty(unit);//
mat.setManLength(length1);
mat.setHeight(height1);
mat.setWidth(width1);
@@ -331,6 +334,8 @@
// 鏇存柊瀛楁
if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
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);
if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length1);
if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height1);
if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width1);
--
Gitblit v1.9.1