From 9065015d95322cab085f59a4c9283981993d2141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?=
 <zhangjiangwei2000@outlook.com>
Date: Sat, 17 Dec 2022 09:45:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A1=E9=87=8F=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MaterialbaseServiceImpl.java |  41 +++++++++---------
 .../src/main/java/org/nl/wms/wms.xls          | Bin 272896 -> 272896 bytes
 .../src/views/wms/basedata/material/index.vue |  15 +++----
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java
index beda90d..d1f4ea1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java
@@ -208,7 +208,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
 
         // 进行计量单位与物料的更新
         JSONArray data = response_body.getJSONArray("data");
-        WQLObject unit_table = WQLObject.getWQLObject("md_pb_measureunit");
+//        WQLObject unit_table = WQLObject.getWQLObject("md_pb_measureunit");
         WQLObject material_table = WQLObject.getWQLObject("md_me_materialbase");
         Long user_id = SecurityUtils.getCurrentUserId();
         String nick_name = SecurityUtils.getCurrentNickName();
@@ -216,27 +216,28 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
         for (Object o : data) {
             JSONObject material = (JSONObject) o;
 
+            // 计量单位不管
             // 查询是否存在这个计量单位
-            String unit_code = material.getString("unit_code");
-            JSONObject unit = unit_table
-                    .query("unit_code = '" + unit_code + "'")
-                    .uniqueResult(0);
-            if (ObjectUtil.isEmpty(unit)) {
+//            String unit_code = material.getString("unit_code");
+//            JSONObject unit = unit_table
+//                    .query("unit_code = '" + unit_code + "'")
+//                    .uniqueResult(0);
+//            if (ObjectUtil.isEmpty(unit)) {
                 // 如果不存在则添加
-                material.put("measure_unit_id", IdUtil.getSnowflake(1L, 1L));
-                material.put("is_used", "1");
-                material.put("create_id", user_id);
-                material.put("create_name", nick_name);
-                material.put("create_time", now);
-                unit_table.insert(material);
-            } else {
+//                material.put("measure_unit_id", IdUtil.getSnowflake(1L, 1L));
+//                material.put("is_used", "1");
+//                material.put("create_id", user_id);
+//                material.put("create_name", nick_name);
+//                material.put("create_time", now);
+//                unit_table.insert(material);
+//            } else {
                 // 如果存在则修改
-                unit.put("unit_name", material.getString("unit_name"));
-                unit.put("update_optid", user_id);
-                unit.put("update_optname", nick_name);
-                unit.put("update_time", now);
-                unit_table.update(unit);
-            }
+//                unit.put("unit_name", material.getString("unit_name"));
+//                unit.put("update_optid", user_id);
+//                unit.put("update_optname", nick_name);
+//                unit.put("update_time", now);
+//                unit_table.update(unit);
+//            }
 
             // 查询是否存在这个物料
             String material_code = material.getString("material_code");
@@ -254,7 +255,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
             } else {
                 // 如果存在则修改
                 existMaterial.put("material_name", material.getString("material_name"));
-                existMaterial.put("unit_code", unit_code);
+//                existMaterial.put("unit_code", unit_code);
                 existMaterial.put("update_optid", user_id);
                 existMaterial.put("update_optname", nick_name);
                 existMaterial.put("update_time", now);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
index 4a1f5c4cceb250d91c92e5eb30f27f5e436fc6c7..9638c68964adc983dc303c731e86dad144310a83 100644
GIT binary patch
delta 5932
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
F{x^prFYW*U

delta 5755
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

diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
index 8a28248..81f1c28 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -58,14 +58,14 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
           <el-row>
-            <el-col :span="8">
+            <el-col :span="16">
               <el-form-item label="物料编码" prop="material_code">
                 <el-input v-model="form.material_code" style="width: 200px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="16">
               <el-form-item label="物料名称" prop="material_name">
                 <el-input v-model="form.material_name" style="width: 200px;" />
               </el-form-item>
@@ -79,7 +79,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="false">
             <el-col>
               <el-form-item label="计量单位" prop="unit_code">
                 <el-select
@@ -162,12 +162,12 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="material_code" label="物料编码" width="160" />
-        <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
+        <el-table-column prop="material_code" label="物料编码" width="200" />
+        <el-table-column prop="material_name" label="物料名称" width="200" show-overflow-tooltip />
         <el-table-column v-if="false" prop="material_spec" label="物料规格" width="140" />
         <el-table-column v-if="false" prop="material_model" label="物料型号" />
         <el-table-column v-if="false" prop="class_name" label="物料分类" width="140" />
-        <el-table-column prop="unit_name" label="计量单位" />
+        <el-table-column v-if="false" prop="unit_name" label="计量单位" />
         <el-table-column v-if="false" prop="standing_time" label="静置时间（分钟）" width="130px" />
         <el-table-column v-if="false" prop="product_series_name" label="系列" />
         <el-table-column label="启用" align="center" prop="is_used">
@@ -326,9 +326,6 @@ export default {
         ],
         material_height_type: [
           { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        unit_code: [
-          { required: true, message: '计量单位不能为空', trigger: 'blur' }
         ]
       }
     }