From b6d9def4be8e1178d89a4d8756ac843bc0c3ba3a Mon Sep 17 00:00:00 2001
From: xiaosuonian <913474402@qq.com>
Date: Fri, 27 Jun 2025 19:52:14 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=98=9F=E7=A9=BA=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PoundBillServiceImpl.java    | 20 +++++++++----------
 .../java/com/ruoyi/webApi/ApiPostBack.java    |  9 +++++----
 .../billHandlerUtil/impl/PURHandler.java      |  4 ++--
 .../billHandlerUtil/impl/SALHandler.java      |  4 ++--
 .../billHandlerUtil/impl/SPHandler.java       |  4 ++--
 .../billHandlerUtil/impl/STKHandler.java      |  4 ++--
 .../billHandlerUtil/impl/STKTDHandler.java    |  4 ++--
 7 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java
index 569a1b5..7bf95f3 100644
--- a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java
+++ b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java
@@ -181,11 +181,11 @@ public class PoundBillServiceImpl extends ServiceImpl<PoundBillMapper, PoundBill
         poundBill.initAddFields(poundBill);
         boolean save = save(poundBill);
         //调用磅单回调接口。
-//        try {
-//            apiPostBack.makePoundBillFormData(poundBill.getId());
-//        } catch (IOException e) {
-//            throw new RuntimeException("磅单:" + poundBill.getUsrcode() + "推送星空时，出现异常："+e.getMessage());
-//        }
+        try {
+            apiPostBack.makePoundBillFormData(poundBill.getId());
+        } catch (IOException e) {
+            throw new RuntimeException("磅单:" + poundBill.getUsrcode() + "推送星空时，出现异常："+e.getMessage());
+        }
         if(save){
             return 1;
         }else{
@@ -330,11 +330,11 @@ public class PoundBillServiceImpl extends ServiceImpl<PoundBillMapper, PoundBill
         boolean b = updateById(byId);
         //推送榜单信息到星空系统
         //调用磅单回调接口。
-//        try {
-//            apiPostBack.makePoundBillFormData(poundBill.getId());
-//        } catch (IOException e) {
-//            throw new RuntimeException("磅单:" + poundBill.getUsrcode() + "推送星空时，出现异常："+e.getMessage());
-//        }
+        try {
+            apiPostBack.makePoundBillFormData(poundBill.getId());
+        } catch (IOException e) {
+            throw new RuntimeException("磅单:" + poundBill.getUsrcode() + "推送星空时，出现异常："+e.getMessage());
+        }
         if(b){
             return 1;
         }else{
diff --git a/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java b/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java
index 7c040a6..308c632 100644
--- a/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java
+++ b/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java
@@ -62,7 +62,7 @@ public class ApiPostBack {
         if ("SAL_DELIVERYNOTICE".equals(srcblltype) || "PUR_ReceiveBill".equals(srcblltype)){
             String fid = poundBill.getFid();
             if(!"0".equals(fid)){
-                if(checkOaBillExist(srcblltype,id)) throw new RuntimeException("磅单在星空已经存在下游单据，不允许修改，如需修改请前往星空平台删除下游单据！");
+                if(checkOaBillExist(srcblltype,fid)) throw new RuntimeException("磅单在星空已经存在下游单据，不允许修改，如需修改请前往星空平台删除下游单据！");
             }
         }
 
@@ -102,7 +102,7 @@ public class ApiPostBack {
         }
         poundBill.setFid(fid);
         poundBill.setFentity_fentryid(fEntryID);
-        poundBillService.updatePoundBill(poundBill);
+        poundBillService.updateById(poundBill);
     }
 
     //单据下推
@@ -216,8 +216,9 @@ public class ApiPostBack {
         JSONArray dataList = JSONArray.parseArray(oaData);
         for (int i = 0; i < dataList.size(); i++) {
             JSONArray row = dataList.getJSONArray(i);
-            Integer joinQty = row.getInteger(0);
-            if (joinQty > 0) {
+            if (row.size() < 1) continue;
+            String joinQty = row.getString(0);
+            if (Double.parseDouble(joinQty) > 0) {
                 result = true;
                 break;
             }
diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java
index d13fbc5..f9e249c 100644
--- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java
+++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java
@@ -5,9 +5,9 @@ import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler;
 import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest;
 import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData;
 import com.ruoyi.webApi.saveRequestBody.requestbody.model.PURModel;
-import com.sun.tools.javac.util.List;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
  * @author 16358
@@ -19,7 +19,7 @@ public class PURHandler implements BillHandler {
     public DynamicFormRequest buildRequest(PoundBill bill) {
         DynamicFormRequest request = new DynamicFormRequest("PUR_ReceiveBill");
         RequestData data = new RequestData();
-        data.setNeedReturnFields(new ArrayList<>(List.of("FID","FDetailEntity.FEntryid")));
+        data.setNeedReturnFields(Arrays.asList("FID", "FDetailEntity.FEntryid"));
         PURModel model = new PURModel(bill);
         data.setModel(model);
         request.setData(data);
diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java
index 44a9c9e..c8114b4 100644
--- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java
+++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java
@@ -5,9 +5,9 @@ import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler;
 import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest;
 import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData;
 import com.ruoyi.webApi.saveRequestBody.requestbody.model.SALModel;
-import com.sun.tools.javac.util.List;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
  * @author 16358
@@ -19,7 +19,7 @@ public class SALHandler implements BillHandler {
     public DynamicFormRequest buildRequest(PoundBill bill) {
         DynamicFormRequest request = new DynamicFormRequest("SAL_DELIVERYNOTICE");
         RequestData data = new RequestData();
-        data.setNeedReturnFields(new ArrayList<>(List.of("FID","FEntity.FEntryid")));
+        data.setNeedReturnFields(Arrays.asList("FID", "FEntity.FEntryid"));
         SALModel model = new SALModel(bill);
         data.setModel(model);
         request.setData(data);
diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java
index 496dc67..ad09d26 100644
--- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java
+++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java
@@ -6,9 +6,9 @@ import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest;
 import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData;
 import com.ruoyi.webApi.saveRequestBody.requestbody.model.PURModel;
 import com.ruoyi.webApi.saveRequestBody.requestbody.model.SPModel;
-import com.sun.tools.javac.util.List;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
  * @author 16358
@@ -20,7 +20,7 @@ public class SPHandler implements BillHandler {
     public DynamicFormRequest buildRequest(PoundBill bill) {
         DynamicFormRequest request = new DynamicFormRequest("SP_InStock");
         RequestData data = new RequestData();
-        data.setNeedReturnFields(new ArrayList<>(List.of("FID","FEntity.FEntryid")));
+        data.setNeedReturnFields(Arrays.asList("FID", "FEntity.FEntryid"));
         SPModel model = new SPModel(bill);
         data.setModel(model);
         request.setData(data);
diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java
index a9530b5..1606a1c 100644
--- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java
+++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java
@@ -5,9 +5,9 @@ import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler;
 import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest;
 import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData;
 import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKModel;
-import com.sun.tools.javac.util.List;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
  * @author 16358
@@ -19,7 +19,7 @@ public class STKHandler implements BillHandler {
     public DynamicFormRequest buildRequest(PoundBill bill) {
         DynamicFormRequest request = new DynamicFormRequest("STK_TRANSFERAPPLY");
         RequestData data = new RequestData();
-        data.setNeedReturnFields(new ArrayList<>(List.of("FID","FEntity.FEntryid")));
+        data.setNeedReturnFields(Arrays.asList("FID", "FEntity.FEntryid"));
         STKModel model = new STKModel(bill);
         data.setModel(model);
         request.setData(data);
diff --git a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKTDHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKTDHandler.java
index de4595f..0bfce42 100644
--- a/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKTDHandler.java
+++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKTDHandler.java
@@ -6,9 +6,9 @@ import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest;
 import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData;
 import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKModel;
 import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKTDModel;
-import com.sun.tools.javac.util.List;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
  * @author 16358
@@ -19,7 +19,7 @@ public class STKTDHandler implements BillHandler {
     public DynamicFormRequest buildRequest(PoundBill bill) {
         DynamicFormRequest request = new DynamicFormRequest("STK_TransferDirect");
         RequestData data = new RequestData();
-        data.setNeedReturnFields(new ArrayList<>(List.of("FID","FBillEntry.FEntryid")));
+        data.setNeedReturnFields(Arrays.asList("FID", "FBillEntry.FEntryid"));
         STKTDModel model = new STKTDModel(bill);
         data.setModel(model);
         request.setData(data);