add:添加线边库领料，添加MES查询工单bom

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

@@ -82,7 +82,7 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column prop="request_Id" label="回传业务单据号" min-width="170" />
-        <el-table-column prop="request_type" label="回传类型" min-width="120" />
+        <el-table-column prop="request_type" label="回传类型" min-width="120" :formatter="formatRequestType" />
         <el-table-column prop="status" label="状态" min-width="90" :formatter="formatStatus" />
         <el-table-column prop="error_msg" label="ERP处理失败记录" min-width="220" show-overflow-tooltip />
         <el-table-column prop="create_time" label="单据创建时间" min-width="160" />
@@ -158,6 +158,14 @@ export default {
         { value: '1', label: '成功' },
         { value: '2', label: '失败' }
       ],
+      typeStatusMap: {
+        '生产入库': '0001',
+        '采购入库': '0005',
+        '手工入库': '0009',
+        '销售出库': '1001',
+        '生产出库': '1005',
+        '手工出库': '1009'
+      },
       jsonDialog: {
         visible: false,
         edit: false,
@@ -280,6 +288,21 @@ export default {
     formatStatus(row) {
       const item = this.statusOptions.find(option => option.value === row.status)
       return item ? item.label : row.status
+    },
+    formatTypeStatus(row) {
+      const item = this.statusOptions.find(option => option.value === row.status)
+      return item ? item.label : row.status
+    },
+    formatRequestType(row) {
+      const requestTypeMap = {
+        '0001': '生产入库',
+        '0005': '采购入库',
+        '0009': '手工入库',
+        '1001': '销售出库',
+        '1005': '生产出库',
+        '1009': '手工出库'
+      }
+      return requestTypeMap[row.request_type] || row.request_type
     }
   }
 }

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

@@ -107,7 +107,7 @@
           size="mini"
           @click="allSetPointAllDtl"
         >
-          一键设置
+          一键下发
         </el-button>
       </span>
     </div>
@@ -234,9 +234,8 @@ import CRUD, { crud } from '@crud/crud'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
 import StructIvt from '@/views/wms/st/outbill/StructIvt'
 import PointDialog from '@/views/wms/sch/point/PointDialog'
-import crudPoint, { getRegionPoints } from '@/views/wms/sch/point/schBasePoint'
+import crudPoint from '@/views/wms/sch/point/schBasePoint'
 import crudSectattr from '@/views/wms/basedata/sectattr/sectattr'
-import { autoCancel, getOutBillDis } from './checkoutbill'
 
 export default {
   name: 'DivDialog',
@@ -320,7 +319,7 @@ export default {
       crudSectattr.getSectCode({ 'stor_code': this.storCode }).then(res => {
         this.sects = res.content
       })
-      crudPoint.getRegionPoints({ 'region_code': 'CKQ' }).then(res => {
+      crudPoint.getRegionPoints({ 'regionCode': 'CKQ' }).then(res => {
         this.outBoundRegion = res.content
       })
     },