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 e0213911..a24068c4 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
@@ -198,6 +198,7 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
jsonProduc.put("technology_code", map.get("technology_code"));
jsonProduc.put("ball_rate", map.get("ball_rate"));
jsonProduc.put("liquid_rate", map.get("liquid_rate"));
+ json.put("standard_mark", map.get("standard_mark"));
producTab.insert(jsonProduc);
} else {
json.put("standard_weight", map.get("standard_weight"));
@@ -221,6 +222,7 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
json.put("technology_code", map.get("technology_code"));
json.put("ball_rate", map.get("ball_rate"));
json.put("liquid_rate", map.get("liquid_rate"));
+ json.put("standard_mark", map.get("standard_mark"));
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 de9cb621..78da4f76 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
@@ -1,10 +1,10 @@
[交易说明]
交易名： 产品参数分页查询
- 所属模块：
- 功能简述：
- 版权所有：
- 表引用：
- 版本经历：
+ 所属模块：
+ 功能简述：
+ 版权所有：
+ 表引用：
+ 版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
@@ -22,26 +22,26 @@
[临时表]
--这边列出来的临时表就会在运行期动态创建
-
+
[临时变量]
--所有中间过程变量均可在此处定义
-
+
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
-
+
##########################################
# 2、主过程前处理 #
##########################################
-
-
+
+
##########################################
# 3、业务主过程 #
##########################################
-
+
IF 输入.flag = "1"
PAGEQUERY
SELECT
@@ -58,6 +58,7 @@
s.is_pure,
s.is_need_move AS stock_is_need_move,
p.old_mark,
+ p.standard_mark,
p.product_mode,
p.is_auto_open,
p.waste_limit_down,
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 96a68ced..838bd298 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/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
index f488e961..ea521e82 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
@@ -688,9 +688,9 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (ObjectUtil.isEmpty(mater)) {
throw new BadRequestException("成品物料扩展信息查询失败！");
}
- String old_mark = mater.getString("old_mark");
- if(StrUtil.isEmpty(old_mark)){
- throw new BadRequestException("成品物料扩展信息表牌号不能为空！");
+ String standard_mark = mater.getString("standard_mark");
+ if(StrUtil.isEmpty(standard_mark)){
+ throw new BadRequestException("成品物料扩展信息表标准牌号不能为空！");
}
WQLObject pdm_bi_productdeptpcsn = WQLObject.getWQLObject("pdm_bi_productdeptpcsn");
JSONObject org = pdm_bi_productdeptpcsn.query("org_id='"+org_id+"'").uniqueResult(0);
@@ -712,7 +712,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
WQLObject PDM_BI_BrandMaxPCSN = WQLObject.getWQLObject("PDM_BI_BrandMaxPCSN");
DateTime now = DateTime.now();
String year = now.year()+"";
- JSONObject jo_pcsn = PDM_BI_BrandMaxPCSN.query("brand_code='"+old_mark+"' and year='"+year+"' and org_id='"+org_id+"'").uniqueResult(0);
+ JSONObject jo_pcsn = PDM_BI_BrandMaxPCSN.query("brand_code='"+standard_mark+"' and year='"+year+"' and org_id='"+org_id+"'").uniqueResult(0);
JSONObject ret = new JSONObject();
if(jo_pcsn==null){
String value = "";
@@ -775,18 +775,18 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (ObjectUtil.isEmpty(mater)) {
throw new BadRequestException("成品物料扩展信息查询失败！");
}
- String old_mark = mater.getString("old_mark");
- if(StrUtil.isEmpty(old_mark)){
- throw new BadRequestException("成品物料扩展信息表牌号不能为空！");
+ String standard_mark = mater.getString("standard_mark");
+ if(StrUtil.isEmpty(standard_mark)){
+ throw new BadRequestException("成品物料扩展信息表标准牌号不能为空！");
}
WQLObject PDM_BI_BrandMaxPCSN = WQLObject.getWQLObject("PDM_BI_BrandMaxPCSN");
DateTime now = DateTime.now();
String year = now.year()+"";
- JSONObject jo_pcsn = PDM_BI_BrandMaxPCSN.query("brand_code='"+old_mark+"' and year='"+year+"' and org_id='"+org_id+"'").uniqueResult(0);
+ JSONObject jo_pcsn = PDM_BI_BrandMaxPCSN.query("brand_code='"+standard_mark+"' and year='"+year+"' and org_id='"+org_id+"'").uniqueResult(0);
if(jo_pcsn == null){
JSONObject ret = new JSONObject();
ret.put("brandmax_id", IdUtil.getSnowflake(1, 1).nextId());
- ret.put("brand_code",old_mark);
+ ret.put("brand_code",standard_mark);
ret.put("year",year);
ret.put("org_id",org_id);
int length = param.getInteger("value");
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 e6a9df3a..073c28ec 100644
--- a/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue
+++ b/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue
@@ -74,6 +74,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 1ac01a29..d7c0b53a 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
@@ -211,20 +211,25 @@
+
+
+
+
+
否
是
+
+
否
是
-
-
否