From 5dcb227b035b14da5a706efe1b3263a70ad4b1f7 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 30 Jun 2022 16:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=82=E6=95=B0=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MaterialParametersServiceImpl.java | 5 +++++ .../master/wql/QMT_MATERIALPARAMETERS_001.wql | 1 + .../org/nl/wms/basedata/master/wql/mdme.xls | Bin 169472 -> 170496 bytes .../master/materialParameters/index.vue | 1 + .../materialParameters/view/CpDialog.vue | 11 ++++++++--- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java index 2c244de3..3541a32c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java @@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.exception.BadRequestException; import org.nl.utils.SecurityUtils; import org.nl.wms.basedata.master.constant.MaterOptTypeEnum; import org.nl.wms.basedata.master.service.ClassstandardService; @@ -166,6 +167,8 @@ public class MaterialParametersServiceImpl implements MaterialParametersService if (is_bcp) { //半成品 + String technology_code = MapUtil.getStr(map, "technology_code"); + if (technology_code.length() > 1) throw new BadRequestException("工艺代码长度大于1"); String material_id = (String) map.get("material_id"); JSONObject json = producTab.query("material_id= '" + material_id + "'").uniqueResult(0); if (ObjectUtil.isEmpty(json)) { @@ -192,6 +195,7 @@ public class MaterialParametersServiceImpl implements MaterialParametersService jsonProduc.put("product_ball_code", map.get("product_ball_code")); jsonProduc.put("is_need_move", map.get("is_need_move")); jsonProduc.put("net_rate", map.get("net_rate")); + jsonProduc.put("technology_code", map.get("technology_code")); producTab.insert(jsonProduc); } else { json.put("standard_weight", map.get("standard_weight")); @@ -212,6 +216,7 @@ public class MaterialParametersServiceImpl implements MaterialParametersService json.put("weight_lost_down", map.get("weight_lost_down")); json.put("is_need_move", map.get("is_need_move")); json.put("net_rate", map.get("net_rate")); + json.put("technology_code", map.get("technology_code")); producTab.update(json); } JSONObject jsonMater = materTab.query("material_id = '" + material_id + "' and is_delete = '0'").uniqueResult(0); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql index f27646a8..823e3210 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql @@ -76,6 +76,7 @@ p.standard_weight_pft, p.is_need_move AS product_is_need_move, p.net_rate, + p.technology_code, m.is_used, m.update_optname, m.update_time, diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls index 20c148d8289ac206978b58ee916824aa2e2a5714..246d2502626426ff89c55d4f3a7a3f21b88f7e0a 100644 GIT binary patch delta 36348 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

~6hXmKvz)RU#XaGVFU+2m8#t>VuY@T|r4-eP z`5p_pub`Q`RIYUOud0FsRwH149jFJDvejt%o67gAA&d_IDL^oGxniVm(>G1y9!k?a QQfR%gN@{eeT+?FwKY}yU5&!@I diff --git a/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue b/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue index 5123a05e..a57119d6 100644 --- a/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue +++ b/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue @@ -92,6 +92,7 @@ + diff --git a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue index 3c13d728..57e54a97 100644 --- a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue +++ b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue @@ -194,9 +194,8 @@ - - - + + @@ -219,6 +218,12 @@ + + + + + +