From 3e2b8d0cb7bdeb77b4e5d09c65e5dfbdcece7a99 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Wed, 13 Jul 2022 16:38:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/pda/st/set/service/impl/EndProductServiceImpl.java  | 6 ++++++
 .../nl/pda/st/set/service/impl/PdaBucketServiceImpl.java   | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java
index d9abffc3..7fc7ed3a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/EndProductServiceImpl.java
@@ -210,6 +210,9 @@ public class EndProductServiceImpl implements EndProductService {
                 offlinejo.put("create_id", userDto.getId());
                 offlinejo.put("create_name", userDto.getNickName());
                 offlinejo.put("create_time", DateUtil.now());
+                offlinejo.put("workorder_id", (String) jsonObject.get("workorder_id"));
+                offlinejo.put("workordercard_id", (String) jsonObject.get("workordercard_id"));
+                offlinejo.put("worktaskno_id", (String) jsonObject.get("worktask_id"));
                 WQLObject.getWQLObject("PDM_BI_ProcedureOfflineBucketRecord").insert(offlinejo);
             } else {
                 HashMap<String, String> map = new HashMap<>();
@@ -224,6 +227,9 @@ public class EndProductServiceImpl implements EndProductService {
                 map.put("create_id", userDto.getId()+"");
                 map.put("create_name", userDto.getNickName());
                 map.put("create_time", DateUtil.now());
+                map.put("workorder_id", (String) jsonObject.get("workorder_id"));
+                map.put("workordercard_id", (String) jsonObject.get("workordercard_id"));
+                map.put("worktaskno_id", (String) jsonObject.get("worktask_id"));
                 WQLObject.getWQLObject("PDM_BI_ProcedureOfflineBucketRecord").update(map, "bucketunique = '" + bucketunique + "'");
             }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java
index de007deb..92d3c659 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java
@@ -141,6 +141,7 @@ public class PdaBucketServiceImpl implements PdaBucketService {
         result_qty = BigDecimal.valueOf(mst.getDoubleValue("storage_qty"));
 
         String bucketunique = mst.getString("bucketunique");
+        String is_active = mst.getString("is_active");
         String material_id = mst.getString("material_id");
         MaterialbaseDto materDto = materialbaseService.findById(Long.parseLong(material_id));
         String input_optid = mst.getString("accountId");
@@ -165,7 +166,7 @@ public class PdaBucketServiceImpl implements PdaBucketService {
             bucketJo.put("ivt_level", "01");
             bucketJo.put("quality_scode", "02");
             bucketJo.put("storage_qty", mst.getString("storage_qty"));
-            bucketJo.put("is_active", "0");
+            bucketJo.put("is_active", is_active);
             bucketJo.put("bag_qty", dtl.size());
             bucketJo.put("record_order", "1");
             bucketJo.put("status", "01");
@@ -187,7 +188,7 @@ public class PdaBucketServiceImpl implements PdaBucketService {
             bucketJo.put("ivt_level", "01");
             bucketJo.put("quality_scode", "02");
             bucketJo.put("storage_qty", mst.getString("storage_qty"));
-            bucketJo.put("is_active", "0");
+            bucketJo.put("is_active", is_active);
             bucketJo.put("bag_qty", dtl.size());
             bucketJo.put("record_order", "1");
             bucketJo.put("status", "01");
@@ -231,7 +232,7 @@ public class PdaBucketServiceImpl implements PdaBucketService {
         changeObj.put("material_id", material_id);
         changeObj.put("pcsn", pcsn);
         changeObj.put("ivt_level", "01");
-        changeObj.put("is_active", "0");
+        changeObj.put("is_active", is_active);
         changeObj.put("quality_scode", "02");
         String change_type_scode = "";
         if (change_qty.doubleValue() < 0) {