From af89a2522bddc492f73328dac945d027a4178ea4 Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Thu, 22 Dec 2022 14:52:43 +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

---
 .../service/impl/WorkorderServiceImpl.java    |  2 +-
 .../resources/config/application-prod.yml     |  2 +-
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/views/wms/sch/point/ViewDialog.vue    | 74 +------------------
 4 files changed, 6 insertions(+), 74 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
index 8addcce..709a886 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
@@ -192,7 +192,7 @@ public class WorkorderServiceImpl implements WorkordeService {
         JSONArray orderArr = wo.query("device_id = '" + param.getString("device_id") + "' and order_status = '02'").getResultJSONArray(0);
         if (ObjectUtil.isNotEmpty(orderArr)) throw new BadRequestException("当前设备正在生产中");
 
-        json.put("order_status", "02");
+        json.put("order_status", "2");
         json.put("update_optid", currentUserId);
         json.put("update_optname", nickName);
         json.put("update_time", now);
diff --git a/lms/nladmin-system/src/main/resources/config/application-prod.yml b/lms/nladmin-system/src/main/resources/config/application-prod.yml
index 1d3bb43..61eaff1 100644
--- a/lms/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml
@@ -162,4 +162,4 @@ sa-token:
 
 loki:
   url: http://localhost:3100/loki/api/v1
-  systemName: lms
+  systemName: lms
\ No newline at end of file
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index 3e68ee7..7684235 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -122,7 +122,7 @@ https://juejin.cn/post/6844903775631572999
 
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
-        <root level="debug">
+        <root level="info">
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="lokiAppender"/>
         </root>
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
index d8321dc..ee122f2 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
@@ -84,81 +84,13 @@
       </el-form>
     </el-card>
 
-    <el-card class="box-card" shadow="always">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;font-size: 15px;">库存信息:</span>
-        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
-      </div>
 
-      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="物料编码">
-          <el-input v-model="form.region_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="物料名称">
-          <el-input v-model="form.region_name" style="width: 200px;"/>
-        </el-form-item>
-
-        <el-form-item label="物料规格">
-          <el-input v-model="form.point_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="物料批次">
-          <el-input v-model="form.point_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="库存量">
-          <el-input v-model="form.point_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="计量单位">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="入库时间">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="静置时间(分)">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <el-card class="box-card" shadow="always">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;font-size: 15px;">库存信息:</span>
-        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
-      </div>
-
-      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="物料编码">
-          <el-input v-model="form.region_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="物料名称">
-          <el-input v-model="form.region_name" style="width: 200px;"/>
-        </el-form-item>
-
-        <el-form-item label="物料规格">
-          <el-input v-model="form.point_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="物料批次">
-          <el-input v-model="form.point_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="库存量">
-          <el-input v-model="form.point_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="计量单位">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="入库时间">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="静置时间(分)">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-      </el-form>
-    </el-card>
 
     <!--表格渲染-->
-    <el-card class="box-card" shadow="always">
+    <!--<el-card class="box-card" shadow="always">
       <div slot="header" class="clearfix">
         <span style="font-weight: bold;font-size: 15px;">更新记录:</span>
-        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
+        &lt;!&ndash;        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>&ndash;&gt;
       </div>
       <el-table
         ref="table"
@@ -179,7 +111,7 @@
         <el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip/>
         <el-table-column prop="nick_name" label="操作人" align="center"/>
       </el-table>
-    </el-card>
+    </el-card>-->
     <!--<span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">取 消</el-button>
       <el-button type="primary" @click="dialogVisible = false">确定</el-button>