rev：出库点根据工单出库点来确认

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java

@@ -110,4 +110,9 @@ public class PdmBomCallMaterial implements Serializable {
      */
     private String confirm_time;
 
+    /**
+     * 出库点位
+     */
+    private String point_code;
+
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml

@@ -94,11 +94,13 @@
             mb.material_name,
             mb.material_spec,
             mst.bill_code,
+            bom.point_code,
             late.storagevehicle_code
         FROM
             st_ivt_iostorinvdtl dtl
             LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
             LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id
+            LEFT JOIN pdm_bom_callmaterial bom ON bom.bom_code = dtl.source_bill_code
             LEFT JOIN md_pb_groupplate late ON mb.material_id = late.material_id
             AND dtl.pcsn = late.pcsn AND late.status = '1' AND dtl.plan_qty = late.qty
         where

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDtlDto.java

@@ -34,4 +34,9 @@ public class IOStorInvDtlDto extends IOStorInvDtl {
      * 载具编号
      */
     private String storagevehicle_code;
+
+    /**
+     * 出库点位
+     */
+    private String point_code;
 }

wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue

@@ -217,6 +217,25 @@
                 </el-select>
               </el-form-item>
             </el-col>
+
+            <el-col :span="8">
+              <el-form-item label="出库点位" prop="point_code">
+                <el-select
+                  v-model="form.point_code"
+                  size="mini"
+                  placeholder="全部"
+                  style="width: 200px"
+                  class="filter-item"
+                >
+                  <el-option
+                    v-for="item in pointList"
+                    :key="item.point_code"
+                    :label="item.point_name"
+                    :value="item.point_code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -249,6 +268,7 @@
         <el-table-column prop="real_qty" label="实际叫料重量" :formatter="crud.formatNum3" :min-width="100" />
         <el-table-column prop="real_weigh_qty" label="实际用料重量" :formatter="crud.formatNum3" :min-width="100" />
         <el-table-column prop="qty_unit_name" label="单位" :min-width="flexWidth('qty_unit_name',crud.data,'单位')" />
+        <el-table-column prop="point_code" label="出库点位" :min-width="flexWidth('point_code',crud.data,'出库点位')" />
         <el-table-column prop="create_name" label="叫料人" :min-width="flexWidth('create_name',crud.data,'叫料人')" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column prop="start_time" label="开始时间" :min-width="flexWidth('start_time',crud.data,'开始时间')" />
@@ -287,6 +307,7 @@ import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
 import crudGroup from '@/views/wms/basedata/group/group'
 import crudDeviceinfo from '@/views/wms/basedata/deviceInfo/deviceinfo'
+import crudPoint from '@/views/wms/sch/point/schBasePoint'
 
 const defaultForm = {
   bom_code: null,
@@ -335,6 +356,7 @@ export default {
       permission: {},
       materList: [],
       deviceList: [],
+      pointList: [],
       rules: {
         material_code: [
           { required: true, message: '物料编码不能为空', trigger: 'blur' }
@@ -345,6 +367,9 @@ export default {
         bom_type: [
           { required: true, message: '工单类型不能为空', trigger: 'blur' }
         ],
+        point_code: [
+          { required: true, message: '出库点位不能为空', trigger: 'blur' }
+        ],
         call_qty: [
           { required: true, message: '叫料重量不能为空', trigger: 'blur' }
         ]
@@ -358,6 +383,10 @@ export default {
     crudDeviceinfo.getDevice({}).then(res => {
       this.deviceList = res
     })
+    const area_type = 'INOUR01'
+    crudPoint.getPointList({ 'region_code': area_type }).then(res => {
+      this.pointList = res
+    })
     this.initQuery()
   },
   methods: {

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

@@ -191,7 +191,7 @@ import crudBsrealstorattr from '@/views/wms/basedata/bsrealstorattr/bsrealstorat
 
 const defaultForm = {
   bill_code: '',
-  stor_id: '',
+  stor_id: '1582991156504039424',
   stor_code: '',
   stor_name: '',
   bill_status: '10',

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

@@ -62,6 +62,7 @@
       <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
       <el-table-column prop="device_code" label="机台编码" :min-width="flexWidth('device_code',crud.data,'机台编码')" />
       <el-table-column prop="call_qty" label="叫料重量" :formatter="crud.formatNum3" :min-width="100" />
+      <el-table-column prop="point_code" label="出库点位" :min-width="flexWidth('point_code',crud.data,'出库点位')" />
       <el-table-column prop="create_name" label="叫料人" :min-width="flexWidth('create_name',crud.data,'叫料人')" />
       <el-table-column prop="qty_unit_name" label="单位" :min-width="flexWidth('qty_unit_name',crud.data,'单位')" />
       <el-table-column prop="create_time" label="叫料时间" :min-width="flexWidth('create_time',crud.data,'叫料时间')" />

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

@@ -163,6 +163,7 @@
             <el-select
               v-model="form2.point_code"
               clearable
+              :disabled="pointCode !== null"
               placeholder="请选择"
               class="filter-item"
               style="width: 150px;"
@@ -259,6 +260,10 @@ export default {
     rowmst: {
       type: Object
     },
+    pointCode: {
+      type: String,
+      default: null
+    },
     openArray: {
       type: Array,
       default: () => { return [] }
@@ -318,6 +323,11 @@ export default {
         this.tableDtl = newValue
       }
     },
+    pointCode: {
+      handler(newValue, oldValue) {
+        this.form2.point_code = newValue
+      }
+    },
     rowmst: {
       handler(newValue, oldValue) {
         this.mstrow = newValue

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

@@ -203,7 +203,7 @@
     </div>
     <AddDialog @AddChanged="querytable" />
     <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
-    <DivDialog :dialog-show.sync="divShow" :open-array="openParam" :stor-id="storId" :rowmst="mstrow" @DivChanged="querytable" />
+    <DivDialog :dialog-show.sync="divShow" :point-code="pointCode" :open-array="openParam" :stor-id="storId" :rowmst="mstrow" @DivChanged="querytable" />
   </div>
 </template>
 
@@ -262,6 +262,7 @@ export default {
       checkrows: [],
       storlist: [],
       billtypelist: [],
+      pointCode: null,
       storId: null
     }
   },
@@ -383,6 +384,7 @@ export default {
       checkoutbill.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
         this.openParam = res
         this.storId = this.currentRow.stor_id
+        this.pointCode = res[0].point_code
         this.divShow = true
         this.mstrow = this.currentRow
       })