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/task/kingdee/handler/InboundOrderHandler.java |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

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 722bf5e..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
@@ -156,11 +156,14 @@
                     path = orgAddress;
                     break;
                 case "PUR_RECEIVEBIll": //宸插鏍告敹鏂欏崟鏌ヨ
-                    jsonObject.put("start_biztime",  "2025-01-01 00:00:00");//涓氬姟璧峰鏃ユ湡
+                    jsonObject.put("start_biztime",  latestUpdateTime);//涓氬姟璧峰鏃ユ湡
+//                    jsonObject.put("start_biztime",  "2025-01-01 00:00:00");//涓氬姟璧峰鏃ユ湡
+//                    jsonObject.put("start_auditdate",  "2025-01-01 00:00:00";
+
                     jsonObject.put("end_biztime", sdf1.format(now));//涓氬姟缁撴潫鏃ユ湡
                     jsonObject.put("billno", null);
                     jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
-                    jsonObject.put("start_auditdate", "2025-11-25 00:00:00");
+                    jsonObject.put("start_auditdate", latestUpdateTime);
                     jsonObject.put("end_auditdate", sdf1.format(now));
                     jsonObject.put("org_number", null);
                     jsonObject.put("supplier_number", null);
@@ -182,7 +185,7 @@
                     path = imMdcMftproorder;
 //                    jsonObject.put("start_modifytime",  "2025-11-25 00:00:00");
 //                    jsonObject.put("start_auditdate", "2025-11-25 00:00:00");
-                    jsonObject.put("start_createtime", "2025-11-25 00:00:00");
+                    jsonObject.put("start_createtime", latestUpdateTime);
                     jsonObject.put("end_createtime", sdf1.format(now));
 //                    jsonObject.put("end_auditdate", sdf1.format(now));
 //                    jsonObject.put("end_modifytime", sdf1.format(now));
@@ -197,7 +200,7 @@
                     jsonObject.put("billno", null);
                     jsonObject.put("org_number", null);
                     jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
-                    jsonObject.put("start_createtime", "2025-11-25 00:00:00");
+                    jsonObject.put("start_createtime", latestUpdateTime);
                     jsonObject.put("end_createtime", sdf1.format(now));
 //                    jsonObject.put("start_modifytime",  "2025-11-25 00:00:00");
 //                    jsonObject.put("end_modifytime", sdf1.format(now));
@@ -210,7 +213,7 @@
                     jsonObject.put("billno", null);
                     jsonObject.put("org_number", null);
                     jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
-                    jsonObject.put("start_createtime", "2025-11-25 00:00:00");
+                    jsonObject.put("start_createtime", latestUpdateTime);
                     jsonObject.put("end_createtime", sdf1.format(now));
 //                    jsonObject.put("start_modifytime",  "2025-11-25 00:00:00");
 //                    jsonObject.put("end_modifytime", sdf1.format(now));
@@ -220,13 +223,13 @@
                 case "PRD_MORPT"://鐢熶骇杩涗粨鍗�
                     path = imProductinbill;
                     jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
-                    jsonObject.put("modifytime_start", "2025-11-25 00:00:00");
+                    jsonObject.put("modifytime_start", latestUpdateTime);
                     jsonObject.put("modifytime_end", sdf1.format(now));
                     break;
                 case "STK_InspectionForm"://浜у搧妫�楠�
                     path = qcppManuinspec;
                     jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
-                    jsonObject.put("auditdate_start", "2025-11-25 00:00:00");
+                    jsonObject.put("auditdate_start", latestUpdateTime);
                     jsonObject.put("auditdate_end", sdf1.format(now));
                     break;
             }
@@ -297,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;
+
                             // 鐢熸垚鍟嗗搧妗f
                             Double height1 = height*10;
                             Double width1 = width*10;
@@ -309,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);
@@ -328,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);
@@ -466,6 +474,9 @@
                                         .doPost();
                                 JSONObject detailJson = JSON.parseObject(detailResp);
                                 JSONObject detData = detailJson.getJSONObject("data");
+                                if(detData == null){
+                                    continue;
+                                }
                                 JSONArray rows = detData.getJSONArray("rows");
                                 // ====== 澶勭悊鏄庣粏 ======
                                 for (int i = 0; i < rows.size(); i++) {
@@ -608,6 +619,7 @@
                                 }
                             }
                         }
+                        docType.setUpdateTime(now);
                         docTypeService.updateById(docType);
                     }
                 }
@@ -961,6 +973,7 @@
                                 }
                             }
                         }
+                        docType.setUpdateTime(now);
                         docTypeService.updateById(docType);
                     }
                 }

--
Gitblit v1.9.1