opt:优化出库逻辑增加平库判断

nladmin-ui/src/i18n/langs/zh-CN.js

@@ -2,7 +2,7 @@ export default {
   'lang': 'zh',
   // 平台
   'platform': {
-    'title': 'WMS仓储系统',
+    'title': '诺力五期WMS仓储系统',
     'tip1': '用户名不能为空',
     'tip2': '密码不能为空',
     'tip3': '验证码不能为空'

nladmin-ui/src/layout/components/Sidebar/Logo.vue

@@ -26,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: 'WMS系统',
+      title: '诺力五期WMS系统',
       logo: Logo,
       title_param: 'platform'
     }

nladmin-ui/src/views/wms/basedata/sectattr/index.vue

@@ -133,10 +133,16 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
+        <el-table-column prop="stor_name" label="仓库名称" width="150" />
         <el-table-column prop="sect_code" sortable label="库区编码" />
         <el-table-column prop="sect_name" label="库区名称" width="150" />
         <el-table-column prop="simple_name" label="库区简称" width="150" />
-        <el-table-column prop="stor_name" label="仓库名称" width="150" />
+        <el-table-column
+          prop="sect_type_attr"
+          label="库区类型"
+          width="150"
+          :formatter="formatSectType"
+        />
         <el-table-column prop="capacity" label="容量" />
         <el-table-column prop="sect_manager_name" label="负责人" />
         <el-table-column prop="mobile_no" label="联系电话" width="100px" />
@@ -293,6 +299,10 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    formatSectType(row, column, cellValue) {
+      const item = this.dict.st_sect_type.find(d => d.value === cellValue)
+      return item ? item.label : cellValue
+    },
     // 改变状态
     format_is_used(is_used) {
       return is_used === '1'

nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue

@@ -299,6 +299,7 @@ export default {
         '0005': '采购入库',
         '0009': '手工入库',
         '1001': '销售出库',
+        '1004': '库存调拨',
         '1005': '生产出库',
         '1009': '手工出库'
       }

nladmin-ui/src/views/wms/st/outbill/DivDialog.vue

@@ -127,6 +127,8 @@
         <el-table-column prop="bill_status" label="状态" align="center" width="110px" :formatter="bill_statusFormat" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编码" align="center" />
+        <el-table-column show-overflow-tooltip prop="source_load_port" label="指定上料口" align="center" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" width="140px" />
         <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />

nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue

@@ -134,6 +134,7 @@
         <el-table-column prop="unassign_qty" :formatter="crud.formatNum3" label="未分配重量" align="center" width="100px" />
         <el-table-column prop="qty_unit_name" label="单位" align="center" />
         <el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" />
+        <el-table-column prop="source_load_port" label="指定上料口" align="center" width="130px" />
         <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
       </el-table>
     </el-card>
@@ -161,10 +162,10 @@
         <el-table-column prop="struct_code" label="仓位" align="center" show-overflow-tooltip />
         <el-table-column prop="sect_name" label="区域" align="center" show-overflow-tooltip />
 <!--        <el-table-column show-overflow-tooltip prop="instorage_time" width="150px" label="入库时间" align="center" />-->
-        <el-table-column prop="point_code" label="目的位置" align="center" />
+        <el-table-column prop="point_code" label="出库位置" align="center" />
         <el-table-column prop="task_code" label="任务号" align="center" />
         <!--        <el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />-->
-        <el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
+        <el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="work_statusFormat" />
       </el-table>
     </el-card>
   </el-dialog>