From b9a180dabfba7d3029a587a3a45c07d3b92d4d58 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Thu, 14 Jul 2022 09:57:12 +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

---
 .../src/main/java/org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql     | 2 ++
 .../nl/pda/st/set/service/impl/EndProductServiceImpl.java   | 6 +++---
 .../java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql
index 9e3345a7..0cd1f4c5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPDM_WORK_TASK.wql
@@ -140,6 +140,7 @@
                 wt.workprocedure_name,
                 device.device_code,
                 device.device_id,
+                producmaterialext.standard_weight,
                 wt.workprocedure_id AS workprocedure_uuid,
                 device.device_name,
                 (
@@ -159,6 +160,7 @@
                     LEFT JOIN md_me_materialbase mb ON mb.material_id = wt.material_id
                     LEFT JOIN em_bi_deviceinfo device ON device.device_id = wt.device_id
                     LEFT JOIN pdm_bi_workorder wo ON wo.workorder_id = wt.workorder_id
+                    LEFT JOIN md_me_producmaterialext producmaterialext ON producmaterialext.material_id = wt.material_id
                 WHERE
                     wt.workorder_id = 输入.workorder_id
                 AND
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 7fc7ed3a..6c4d02dc 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
@@ -138,8 +138,8 @@ public class EndProductServiceImpl implements EndProductService {
 
             }
             //假如没记录就插入
+            JSONObject bucketObj = new JSONObject();
             if (ObjectUtil.isEmpty(bucketJo)) {
-                JSONObject bucketObj = new JSONObject();
                 bucketObj.put("bucket_record_id", IdUtil.getSnowflake(1, 1).nextId());
                 if (StrUtil.isEmpty(bucketunique)) {
                     bucketunique = CodeUtil.getNewCode("PRODUCT_BUCKET_CODE");
@@ -202,7 +202,7 @@ public class EndProductServiceImpl implements EndProductService {
                 offlinejo.put("material_id", material_id);
                 offlinejo.put("pcsn", pcsn);
                 offlinejo.put("bucketunique", bucketunique);
-                offlinejo.put("ordernum", changeObj.getString("record_order"));
+                offlinejo.put("ordernum", bucketObj.getString("record_order"));
                 offlinejo.put("qty", result_qty);
                 offlinejo.put("qty_unit_id", materDto.getBase_unit_id());
                 offlinejo.put("qty_unit_name", materDto.getBase_unit_name());
@@ -219,7 +219,7 @@ public class EndProductServiceImpl implements EndProductService {
                 map.put("material_id", material_id);
                 map.put("pcsn", pcsn);
                 map.put("bucketunique", bucketunique);
-                map.put("ordernum", changeObj.getString("record_order"));
+                map.put("ordernum", bucketObj.getString("record_order"));
                 map.put("qty", result_qty+"");
                 map.put("qty_unit_id", materDto.getBase_unit_id()+"");
                 map.put("qty_unit_name", materDto.getBase_unit_name());
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql
index bd356aa3..f869ee48 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql
@@ -48,7 +48,7 @@
             	class.class_code,
             	class.class_name,
             	unit_name,
-            	'50' as standard_weight,
+            	producmaterialext.standard_weight,
             	unit_name as base_unit_id_name,
             	producmaterialext.product_series
             FROM