From 1d4a81efcb1640c55d0bb4400ac3219e1f66187e Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Fri, 4 Nov 2022 17:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E7=8A=B6=E6=80=81=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sch/service/impl/PointServiceImpl.java    |   2 +-
 .../views/wms/sch/point/MaterialDialog.vue    |   2 +-
 .../src/views/wms/sch/point/ViewDialog.vue    | 188 ++++++++++++------
 .../views/wms/sch/point/WorkOrderDialog.vue   |   2 +-
 .../src/views/wms/sch/point/index.vue         |  34 ++--
 5 files changed, 149 insertions(+), 79 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
index 7ea2ffe..752734a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
@@ -179,7 +179,7 @@ public class PointServiceImpl implements PointService {
             dto.setMaterial_id(null);
             dto.setInstorage_time(now);
             dto.setStanding_time(BigDecimal.valueOf(0));
-        } else { // 有料
+        } else if (pointStatus.equals("3")) { // 有料
             if (ObjectUtil.isEmpty(dto.getMaterial_id())) throw new BadRequestException("物料不能为空");
             if (ObjectUtil.isEmpty(dto.getIvt_qty())) throw new BadRequestException("库存数不能为空");
             JSONObject materialObj = materialBaseTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0);
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
index 39e6a41..b5f8400 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="生产任务选择"
+    title="物料选择"
     append-to-body
     :visible.sync="dialogVisible"
     destroy-on-close
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 d3fe046..d8321dc 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
@@ -8,100 +8,178 @@
     @close="close"
   >
     <el-card class="box-card" shadow="never">
+      <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-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-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-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-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-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-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-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-input v-model="form.lock_type_name" style="width: 200px;"/>
         </el-form-item>
         <el-form-item label="载具编码">
-          <el-input v-model="form.vehicle_code" style="width: 200px;" />
+          <el-input v-model="form.vehicle_code" style="width: 200px;"/>
         </el-form-item>
         <el-form-item label="载具数量">
-          <el-input v-model="form.vehicle_qty" style="width: 200px;" />
+          <el-input v-model="form.vehicle_qty" style="width: 200px;"/>
         </el-form-item>
 
       </el-form>
     </el-card>
 
-    <el-card class="box-card" shadow="never">
+    <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-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-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-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-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-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-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-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-input v-model="form.lock_type_name" style="width: 200px;"/>
         </el-form-item>
       </el-form>
     </el-card>
 
-    <div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
-      <span class="role-span">更新记录</span>
-      <span class="crud-opts-right2">
-        <!--左侧插槽-->
-        <slot name="left" />
-      </span>
+    <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>
 
-    </div>
     <!--表格渲染-->
-    <el-table
-      ref="table"
-      :data="tableData"
-      style="width: 100%;"
-      max-height="300"
-      border
-      :highlight-current-row="true"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-    >
-      <el-table-column prop="device_code" label="设备编码" align="center" />
-      <el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip />
-      <el-table-column prop="produce_qty" label="生产数量" align="center" />
-      <el-table-column prop="init_qty" label="期初数量" align="center" />
-      <el-table-column prop="finish_qty" label="期末数量" align="center" />
-      <el-table-column prop="finishproduct_qty" label="完成数量" align="center" />
-      <el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip />
-      <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 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-table
+        ref="table"
+        :data="tableData"
+        style="width: 100%;"
+        max-height="300"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column prop="device_code" label="设备编码" align="center"/>
+        <el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip/>
+        <el-table-column prop="produce_qty" label="生产数量" align="center"/>
+        <el-table-column prop="init_qty" label="期初数量" align="center"/>
+        <el-table-column prop="finish_qty" label="期末数量" align="center"/>
+        <el-table-column prop="finishproduct_qty" label="完成数量" align="center"/>
+        <el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip/>
+        <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>
     <!--<span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">取 消</el-button>
       <el-button type="primary" @click="dialogVisible = false">确定</el-button>
@@ -191,20 +269,12 @@ export default {
 }
 </script>
 
-<style>
-.crud-opts2 {
-  padding: 0 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
+<style scoped>
+::v-deep .el-card__header {
+  padding: 5px 0 5px 10px;
+  background-color: #f8f8f9;
 }
-
-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
-  padding: 4px 4px;
-}
-
-.input-with-select {
-  background-color: #fff;
+::v-deep .el-card__body {
+  padding: 10px 0 10px 0;
 }
 </style>
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
index 831111c..77eb03f 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="生产任务选择"
+    title="工单选择"
     append-to-body
     :visible.sync="dialogVisible"
     destroy-on-close
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index 5dcdfd1..c9761d6 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -225,7 +225,7 @@
           <el-form-item label="点位名称" prop="point_name">
             <el-input v-model="form.point_name" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="点位状态" prop="point_status" v-show="pointStatusDialogList.length > 0">
+          <el-form-item v-show="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
             <el-select
               v-model="form.point_status"
               size="mini"
@@ -256,7 +256,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="点位类型" prop="device_point_type" v-show="pointTypesDialogList.length > 0">
+          <el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
             <el-select
               v-model="form.point_type"
               size="mini"
@@ -271,23 +271,23 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="载具编码" prop="vehicle_code" v-if="form.point_status !== '1'">
+          <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="库存数" prop="ivt_qty" v-if="form.point_status === '3'">
-            <el-input-number v-model="form.ivt_qty" :min="1" :precision="3" :max="999" label="库存数" size="mini"/>
+          <el-form-item v-if="form.point_status === '3'" label="库存数" prop="ivt_qty">
+            <el-input-number :controls="false" class="clear-number-input" v-model="form.ivt_qty" type="number" :min="1" :precision="3" :max="99999" label="库存数" size="mini" />
           </el-form-item>
-          <el-form-item label="物料来源" v-if="form.point_status === '3'">
+          <el-form-item v-if="form.point_status === '3'" label="物料来源">
             <el-radio-group v-model="choose" size="mini">
-              <el-radio-button label="物料"></el-radio-button>
-              <el-radio-button label="工单"></el-radio-button>
+              <el-radio-button label="物料" />
+              <el-radio-button label="工单" />
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="物料名称" prop="vehicle_code" v-if="false">
-            <el-input v-model="form.material_id" clearable style="width: 370px;" @focus="getMaterial"/>
+          <el-form-item v-if="false" label="物料名称" prop="vehicle_code">
+            <el-input suffix-icon="el-icon-date" v-model="form.material_id" clearable style="width: 370px;" @focus="getMaterial" />
           </el-form-item>
-          <el-form-item label="物料名称" prop="vehicle_code" v-if="form.point_status === '3'">
-            <el-input v-model="form.material_name" clearable style="width: 370px;" @focus="getMaterial"/>
+          <el-form-item v-if="form.point_status === '3'" label="物料名称" prop="vehicle_code">
+            <el-input v-model="form.material_name" clearable style="width: 370px;" @focus="getMaterial" />
           </el-form-item>
           <el-form-item label="备注">
             <el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
@@ -308,12 +308,12 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" sortable width="100">
+        <el-table-column prop="point_code" label="点位编码" sortable min-width="120">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.row)">{{ scope.row.point_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip />
+        <el-table-column prop="point_name" label="点位名称" width="150" sortable show-overflow-tooltip />
         <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
         <el-table-column prop="point_type_name" label="点位类型" />
         <el-table-column prop="point_status_name" label="点位状态" />
@@ -351,8 +351,8 @@
       <!--分页组件-->
       <pagination />
     </div>
-    <MaterialDialog :dialog-show.sync="materialDialog" @tableChanged3="tableChanged"/>
-    <WorkOrderDialog :dialog-show.sync="workOrderDialog" @tableChanged4="tableChanged"/>
+    <MaterialDialog :dialog-show.sync="materialDialog" @tableChanged3="tableChanged" />
+    <WorkOrderDialog :dialog-show.sync="workOrderDialog" @tableChanged4="tableChanged" />
     <ViewDialog ref="viewDialog" />
   </div>
 </template>
@@ -391,7 +391,7 @@ const defaultForm = {
 export default {
   name: 'Point',
   dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
-  components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation , ViewDialog},
+  components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation, ViewDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({