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 20c148d8..246d2502 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls differ
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 @@
是
+
+
+ 否
+ 是
+
+