From cc4769108b9b98fabf48a91033c8df90a396e061 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 十一月 2025 10:48:37 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 74 +++++++++++++++++++-----------------
src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java | 14 +++---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 3 +
3 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 87c2902..ca83d92 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -391,46 +391,50 @@
@RequestMapping(value = "/synchronize/mes/locDetl/report/auth")
@ManagerAuth(memo = "鍚屾搴撳瓨鑷矼ES")
public R synchronizeLocDetlMes() {
- List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>());
- if (locDetlList.isEmpty()) {
- return R.error("搴撳瓨涓虹┖锛侊紒锛�");
- }
+ try{
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>());
+ if (locDetlList.isEmpty()) {
+ return R.error("搴撳瓨涓虹┖锛侊紒锛�");
+ }
- OrderMesXGHYParam orderMesXGHYParam = new OrderMesXGHYParam(locDetlList,"in","鎴愬搧鍏ュ簱");
- orderMesXGHYParam.setBarcode(String.valueOf(snowflakeIdWorker.nextId()));
- orderMesXGHYParam.setPalletizingNo(1);
+ OrderMesXGHYParam orderMesXGHYParam = new OrderMesXGHYParam(locDetlList,"in","鎴愬搧鍏ュ簱");
+ orderMesXGHYParam.setBarcode(String.valueOf(snowflakeIdWorker.nextId()));
+ orderMesXGHYParam.setPalletizingNo(1);
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(productInventoryUrl)
- .setPath(productInventory)
- .setJson(JSON.toJSONString(orderMesXGHYParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getBoolean("state")) {
- success = true;
- } else {
- return R.error("鍚屾搴撳瓨鑷矼ES");
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(productInventoryUrl)
+ .setPath(productInventory)
+ .setJson(JSON.toJSONString(orderMesXGHYParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getBoolean("state")) {
+ success = true;
+ } else {
+ return R.error("鍚屾搴撳瓨鑷矼ES");
+ }
+ } catch (Exception e) {
+ return R.error("鍚屾搴撳瓨鑷矼ES"+e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鍚屾搴撳瓨鑷矼ES",
+ productInventoryUrl+"/"+productInventory,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(orderMesXGHYParam),
+ response,
+ success
+ );
+ } catch (Exception e) { }
}
} catch (Exception e) {
- return R.error("鍚屾搴撳瓨鑷矼ES"+e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鍚屾搴撳瓨鑷矼ES",
- productInventoryUrl+"/"+productInventory,
- null,
- "127.0.0.1",
- JSON.toJSONString(orderMesXGHYParam),
- response,
- success
- );
- } catch (Exception e) { }
+ return R.error("涓婃姤澶辫触"+e.getMessage()).add("涓婃姤澶辫触"+e.getMessage());
}
return R.error("涓婃姤澶辫触").add("涓婃姤澶辫触");
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java b/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
index 272613f..b1623fb 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.WrkDetl;
@@ -70,10 +71,10 @@
this.boxNo = sampleWrkDetl.getBatch();
this.rollNo = sampleWrkDetl.getModel();
this.specs = sampleWrkDetl.getMatnr();
- this.length = sampleWrkDetl.getPrice().toString();
+ this.length = Cools.isEmpty(sampleWrkDetl.getPrice())? "0" : sampleWrkDetl.getPrice().toString();
this.splices = sampleWrkDetl.getSpecs();
- this.netWeight = sampleWrkDetl.getWeight().toString();
- this.grossWeight = sampleWrkDetl.getVolume().toString();
+ this.netWeight = Cools.isEmpty(sampleWrkDetl.getWeight())? "0" : sampleWrkDetl.getWeight().toString();
+ this.grossWeight = Cools.isEmpty(sampleWrkDetl.getVolume())? "0" : sampleWrkDetl.getVolume().toString();
this.orderSerialNumber = sampleWrkDetl.getOrderNo();
}
@@ -81,10 +82,10 @@
this.boxNo = sampleLocDetl.getBatch();
this.rollNo = sampleLocDetl.getModel();
this.specs = sampleLocDetl.getMatnr();
- this.length = sampleLocDetl.getPrice().toString();
+ this.length = Cools.isEmpty(sampleLocDetl.getPrice())? "0" : sampleLocDetl.getPrice().toString();
this.splices = sampleLocDetl.getSpecs();
- this.netWeight = sampleLocDetl.getWeight().toString();
- this.grossWeight = sampleLocDetl.getVolume().toString();
+ this.netWeight = Cools.isEmpty(sampleLocDetl.getWeight())? "0" : sampleLocDetl.getWeight().toString();
+ this.grossWeight = Cools.isEmpty(sampleLocDetl.getVolume())? "0" : sampleLocDetl.getVolume().toString();
}
@Override
@@ -230,7 +231,6 @@
}
boxPos = sampleWrkDetl.getOrigin();
boxType = sampleWrkDetl.getBrand$();
- stockType = sampleWrkDetl.getManu();
packageGroupNo = sampleWrkDetl.getDeadTime();
OrderMesXGHYParam.Box.Roll roll = new OrderMesXGHYParam.Box.Roll(sampleWrkDetl);
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 22b0c97..9c6225c 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -210,6 +210,7 @@
}
for (WrkDetl wrkDetl : wrkDetls) {
if (outOrIn.equals("out")){
+ wrkDetl.setManu("鎴愬搧鍑哄簱");
if (!Cools.isEmpty(stockType) && stockType.equals("鐩樼偣鍑哄簱")){
wrkDetl.setManu("鐩樼偣鍑哄簱");
} else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && !wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
@@ -228,7 +229,7 @@
} else {
wrkDetl.setManu("鎴愬搧鍑哄簱");
}
- } else if (wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
+ } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
wrkDetl.setManu("涓嶅悎鏍煎搧鍑哄簱");
}
} else {
--
Gitblit v1.9.1