add:入库分配

mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue

@@ -222,7 +222,6 @@ import CRUD, { crud } from '@crud/crud'
 import StructDiv from '@/views/wms/pub/StructDialog'
 import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 import crudPoint from '@/api/wms/sch/point'
-import crudRegion from '@/api/wms/sch/region'
 import AddBox from '@/views/wms/storage_manage/product/productIn/AddBox'
 
 export default {
@@ -286,7 +285,7 @@ export default {
   },
   methods: {
     open() {
-      crudRegion.getRegionSelect({ 'stor_id': this.storId }).then(res => {
+      crudProductIn.getSect({ 'stor_id': this.storId }).then(res => {
         this.sects = res.content
       })
       const area_type = 'A1_RK01'
@@ -511,25 +510,25 @@ export default {
         this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
+      if (!this.sect_id) {
+        this.crud.notify('请先选择区域！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
       // 如果勾选了，直接跳后台
       if (this.form.checked) {
-        if (!this.sect_id) {
-          this.crud.notify('请先选择区域！', CRUD.NOTIFICATION_TYPE.INFO)
-          return
-        }
         this.divBtn = true
-        this.form.sect_id = this.sect_id
-        this.form.stor_id = this.stor_id
-        this.form.is_pc = '1'
-        crudProductIn.divStruct(this.form).then(res => {
-          crudProductIn.getIODtl({ 'iostorinv_id': this.form.dtl_row.iostorinv_id, 'open_flag': '1' }).then(res => {
+
+        this.dis_row.stor_id = this.stor_id
+        this.dis_row.sect_id = this.sect_id
+        crudProductIn.divStruct(this.dis_row).then(res => {
+        /*  crudProductIn.getIODtl({ 'iostorinv_id': this.form.dtl_row.iostorinv_id, 'open_flag': '1' }).then(res => {
             this.openParam = res
           })
           crudProductIn.getDisDtl(this.form.dtl_row).then(res => {
             this.form.tableMater = res
             this.divBtn = false
             this.crud.notify('分配货位成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-          })
+          })*/
         }).finally(() => {
           this.divBtn = false
         })

mes/qd/src/views/wms/storage_manage/product/productIn/index.vue

@@ -310,12 +310,12 @@ export default {
     buttonChange(currentRow) {
       if (currentRow !== null) {
         this.currentRow = currentRow
-        if (currentRow.bill_status === '1' || currentRow.bill_status === '2' || currentRow.bill_status === '3') {
+        if (currentRow.bill_status === '10' || currentRow.bill_status === '20' || currentRow.bill_status === '30') {
           this.dis_flag = false
         } else {
           this.dis_flag = true
         }
-        if (currentRow.bill_status === '3') {
+        if (currentRow.bill_status === '30') {
           this.confirm_flag = false
         } else {
           this.confirm_flag = true
@@ -352,7 +352,7 @@ export default {
     divOpen() {
       crudProductIn.getIosInvDtl({ 'bill_code': this.currentRow.bill_code }).then(res => {
         this.openParam = res
-        this.storId = this.currentRow.product_code
+        this.storId = this.currentRow.stor_id
         this.billType = this.currentRow.bill_type
         this.divShow = true
       })

mes/qd/src/views/wms/storage_manage/product/productIn/productin.js

@@ -56,6 +56,22 @@ export function confirmvehicle(data) {
   })
 }
 
+export function getSect(data) {
+  return request({
+    url: '/api/stIvtSectattr/getSect',
+    method: 'post',
+    data
+  })
+}
+
+export function divStruct(data) {
+  return request({
+    url: '/api/stIvtSectattr/divStruct',
+    method: 'post',
+    data
+  })
+}
+
 export default {
   add,
   edit,
@@ -63,5 +79,7 @@ export default {
   getIosInvDtl,
   getIosInvDis,
   vehicleCheck,
-  confirmvehicle
+  confirmvehicle,
+  getSect,
+  divStruct
 }