From 4414177cac814bccb26ffeee9cb3a246263fbe67 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Mon, 13 May 2024 13:25:34 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E8=BF=94=E6=A3=80=E3=80=81=E6=94=B9?=
 =?UTF-8?q?=E5=88=87=E5=9B=9E=E4=BC=A0MES=E6=96=B0=E5=A2=9E=E5=9B=9E?=
 =?UTF-8?q?=E4=BC=A0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../returns/service/impl/InAndOutRetrunServiceImpl.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
index 70b964b6c..00422dfce 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
@@ -264,6 +264,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                         JSONObject json = disArr.getJSONObject(j);
                         param.put("PackageBoxSN", json.getString("box_no"));
                         param.put("Attribute1", "ReCheck");
+                        param.put("Attribute2", jo_mst.getString("confirm_time"));
+                        param.put("Attribute3", DateUtil.now());
 
                         JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0);
                         for (int k = 0; k < container_jo.size(); k++) {
@@ -373,6 +375,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                         JSONObject json = disArr.getJSONObject(j);
                         param.put("PackageBoxSN", json.getString("box_no"));
                         param.put("Attribute1", "ReCut");
+                        param.put("Attribute2", jo_mst.getString("confirm_time"));
+                        param.put("Attribute3", DateUtil.now());
 
                         JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0);
                         for (int k = 0; k < container_jo.size(); k++) {
@@ -1493,6 +1497,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     JSONObject json = disArr.getJSONObject(j);
                     param.put("PackageBoxSN", json.getString("box_no"));
                     param.put("Attribute1", "ReCut");
+                    param.put("Attribute2", jo_mst.getString("confirm_time"));
+                    param.put("Attribute3", DateUtil.now());
 
                     JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0);
                     for (int k = 0; k < container_jo.size(); k++) {
@@ -1528,6 +1534,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     JSONObject json = disArr.getJSONObject(j);
                     param.put("PackageBoxSN", json.getString("box_no"));
                     param.put("Attribute1", "ReCheck");
+                    param.put("Attribute2", jo_mst.getString("confirm_time"));
+                    param.put("Attribute3", DateUtil.now());
 
                     JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0);
                     for (int k = 0; k < container_jo.size(); k++) {