From e9679d8f13618109191c0edbd59d0ec47c8022ff Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 9 Jul 2022 11:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MaterialParametersServiceImpl.java | 4 + .../master/wql/QMT_MATERIALPARAMETERS_001.wql | 2 + .../org/nl/wms/basedata/master/wql/mdme.xls | Bin 170496 -> 171008 bytes .../impl/ProductProcessParamServiceImpl.java | 22 ++++- .../master/materialParameters/index.vue | 2 + .../materialParameters/view/CpDialog.vue | 87 +++++++++++------- mes/qd/src/views/wms/pf/flourwork/index.vue | 4 +- 7 files changed, 85 insertions(+), 36 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 3541a32c..e0213911 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 @@ -196,6 +196,8 @@ public class MaterialParametersServiceImpl implements MaterialParametersService 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")); + jsonProduc.put("ball_rate", map.get("ball_rate")); + jsonProduc.put("liquid_rate", map.get("liquid_rate")); producTab.insert(jsonProduc); } else { json.put("standard_weight", map.get("standard_weight")); @@ -217,6 +219,8 @@ public class MaterialParametersServiceImpl implements MaterialParametersService 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")); + json.put("ball_rate", map.get("ball_rate")); + json.put("liquid_rate", map.get("liquid_rate")); 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 823e3210..db44a105 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 @@ -77,6 +77,8 @@ p.is_need_move AS product_is_need_move, p.net_rate, p.technology_code, + p.ball_rate, + p.liquid_rate, 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 246d2502626426ff89c55d4f3a7a3f21b88f7e0a..96a68ced303c601803f3998b2792f579cb9f5e46 100644 GIT binary patch delta 6132 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 ADgXcg delta 5730 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 + + 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 57e54a97..1ac01a29 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 @@ -116,28 +116,49 @@ - + - - - - - - - + + + + + + + - - - - - - - - - @@ -198,20 +199,32 @@ + + + + + + + + + + + + 否 是 - - 否 是 + + 否 @@ -226,13 +239,13 @@ - + @@ -320,6 +333,14 @@ export default { net_rate: [ { required: true, message: '不能为空', trigger: 'blur' } ], + ball_rate: [ + { required: true, message: '不能为空', trigger: 'blur' }, + { validator: numberOne } + ], + liquid_rate: [ + { required: true, message: '不能为空', trigger: 'blur' }, + { validator: numberOne } + ], standard_weight: [ { required: true, message: '不能为空', trigger: 'blur' }, { validator: numberOne } diff --git a/mes/qd/src/views/wms/pf/flourwork/index.vue b/mes/qd/src/views/wms/pf/flourwork/index.vue index 4507d327..e374fa4a 100644 --- a/mes/qd/src/views/wms/pf/flourwork/index.vue +++ b/mes/qd/src/views/wms/pf/flourwork/index.vue @@ -125,8 +125,8 @@ - - +