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

nladmin-ui/src/views/wms/pm_manage/demand/index.vue

@@ -35,6 +35,7 @@
             <el-col :span="12"><el-form-item label="物料编码" prop="skuCode"><el-input v-model.trim="form.skuCode" style="width: 280px;" /></el-form-item></el-col>
             <el-col :span="12"><el-form-item label="物料名称" prop="skuName"><el-input v-model.trim="form.skuName" style="width: 280px;" /></el-form-item></el-col>
             <el-col :span="12"><el-form-item label="数量" prop="qty"><el-input-number v-model="form.qty" :min="0" :precision="4" :step="1" style="width: 280px;" /></el-form-item></el-col>
+            <el-col :span="12"><el-form-item label="已分配数量" prop="assignQty"><el-input-number v-model="form.assignQty" :min="0" :precision="4" :step="1" style="width: 280px;" /></el-form-item></el-col>
             <el-col :span="12"><el-form-item label="单位" prop="unit"><el-input v-model.trim="form.unit" style="width: 280px;" /></el-form-item></el-col>
             <el-col :span="12"><el-form-item label="目标库存地点" prop="targetArea"><el-input v-model.trim="form.targetArea" style="width: 280px;" /></el-form-item></el-col>
             <el-col :span="12"><el-form-item label="产线" prop="productionLine"><el-input v-model.trim="form.productionLine" style="width: 280px;" /></el-form-item></el-col>
@@ -84,6 +85,7 @@
         <el-table-column prop="skuCode" label="物料编码" min-width="140" show-overflow-tooltip />
         <el-table-column prop="skuName" label="物料名称" min-width="180" show-overflow-tooltip />
         <el-table-column prop="qty" label="数量" width="100" />
+        <el-table-column prop="assignQty" label="已分配数量" width="100" />
         <el-table-column prop="unit" label="单位" width="80" />
         <el-table-column prop="targetArea" label="目标库存地点" min-width="140" show-overflow-tooltip />
         <el-table-column prop="productionLine" label="产线" min-width="100" show-overflow-tooltip />
@@ -126,6 +128,8 @@ export default {
         { value: '01', label: '分配' },
         { value: '10', label: '下发' },
         { value: '20', label: '执行' },
+        { value: '50', label: '待回传' },
+        { value: '70', label: '回传失败' },
         { value: '80', label: '完成' },
         { value: '90', label: '取消' }
       ],

nladmin-ui/src/views/wms/sch/point/schBasePoint.js

@@ -47,5 +47,12 @@ export function changeLock(data) {
     data: data
   })
 }
+export function getRegionPoints(param) {
+  return request({
+    url: 'api/schBasePoint/getRegionPoints',
+    method: 'get',
+    params: param
+  })
+}
 
-export default { add, edit, del, changeUsed, getPointList, changeLock }
+export default { add, edit, del, changeUsed, getPointList, changeLock, getRegionPoints }

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
       })
     },