opt: 1.出库管理完善。 2.出入库管理任务完成、取消。

wms/nladmin-ui/src/views/wms/st/inbill/rawassist.js

@@ -24,14 +24,6 @@ export function edit(data) {
   })
 }
 
-export function getBillDtl(params) {
-  return request({
-    url: '/api/in/rawAssist/getBillDtl',
-    method: 'get',
-    params
-  })
-}
-
 export function getIODtl(params) {
   return request({
     url: '/api/in/rawAssist/getIODtl',
@@ -40,14 +32,6 @@ export function getIODtl(params) {
   })
 }
 
-export function insertDtl(data) {
-  return request({
-    url: '/api/in/rawAssist/insertDtl',
-    method: 'post',
-    data
-  })
-}
-
 export function commit(data) {
   return request({
     url: '/api/in/rawAssist/commit',
@@ -55,15 +39,6 @@ export function commit(data) {
     data
   })
 }
-
-export function checkVehicle(data) {
-  return request({
-    url: '/api/in/rawAssist/checkVehicle',
-    method: 'post',
-    data
-  })
-}
-
 export function deleteDisDtl(data) {
   return request({
     url: '/api/in/rawAssist/deleteDisDtl',
@@ -87,15 +62,6 @@ export function divStruct(data) {
     data
   })
 }
-
-export function allDivStruct(data) {
-  return request({
-    url: '/api/in/rawAssist/allDivStruct',
-    method: 'post',
-    data
-  })
-}
-
 export function unDivStruct(data) {
   return request({
     url: '/api/in/rawAssist/unDivStruct',
@@ -111,63 +77,6 @@ export function divPoint(data) {
     data
   })
 }
-
-export function queryTask(data) {
-  return request({
-    url: '/api/in/rawAssist/queryTask',
-    method: 'post',
-    data
-  })
-}
-
-export function bucketDtl(data) {
-  return request({
-    url: '/api/in/rawAssist/bucketDtl',
-    method: 'post',
-    data
-  })
-}
-
-export function updateTask(data) {
-  return request({
-    url: '/api/in/rawAssist/updateTask',
-    method: 'post',
-    data
-  })
-}
-
-export function delTask(data) {
-  return request({
-    url: '/api/in/rawAssist/delTask',
-    method: 'post',
-    data
-  })
-}
-
-export function reIssueTask(data) {
-  return request({
-    url: '/api/in/rawAssist/reIssueTask',
-    method: 'post',
-    data
-  })
-}
-
-export function confirmTask(data) {
-  return request({
-    url: '/api/in/rawAssist/confirmTask',
-    method: 'post',
-    data
-  })
-}
-
-export function cancelTask(data) {
-  return request({
-    url: '/api/in/rawAssist/cancelTask',
-    method: 'post',
-    data
-  })
-}
-
 export function confirm(data) {
   return request({
     url: '/api/in/rawAssist/confirm',
@@ -176,14 +85,6 @@ export function confirm(data) {
   })
 }
 
-export function backConfirm(data) {
-  return request({
-    url: '/api/in/rawAssist/backConfirm',
-    method: 'post',
-    data
-  })
-}
-
 export function getInBillTaskDtl(data) {
   return request({
     url: '/api/in/rawAssist/getInBillTaskDtl',
@@ -192,5 +93,5 @@ export function getInBillTaskDtl(data) {
   })
 }
 
-export default { add, edit, del, insertDtl, getIODtl, commit,
+export default { add, edit, del, getIODtl, commit,
   deleteDisDtl, getDisDtl, divStruct, unDivStruct, divPoint, confirm, getInBillTaskDtl }

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

@@ -149,8 +149,8 @@
       </el-table-column>
       <el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
         <template scope="scope">
-          <el-input-number v-show="!scope.row.edit" v-model="scope.row.qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
-          <span v-show="scope.row.edit">{{ scope.row.qty }}</span>
+          <el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
+          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="qty_unit_name" label="单位" align="center" />
@@ -168,7 +168,7 @@
     </el-table>
 
     <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged" />
-    <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />
+<!--    <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />-->
   </el-dialog>
 </template>
 
@@ -322,6 +322,8 @@ export default {
     },
     tableChanged(rows) {
       rows.forEach((item) => {
+        // 添加plan_qty
+        item.plan_qty = item.qty
         if (this.form.tableData.length !== 0) {
           this.flagnow = false
           for (let i = 0; i < this.form.tableData.length; i++) {
@@ -332,12 +334,12 @@ export default {
           if (!this.flagnow) {
             item.edit = true
             this.form.tableData.splice(-1, 0, item)
-            this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.qty)
+            this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
           }
         } else {
           item.edit = true
           this.form.tableData.splice(-1, 0, item)
-          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.qty)
+          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
         }
       })
       this.form.detail_count = this.form.tableData.length
@@ -359,19 +361,9 @@ export default {
       this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
     },
     deleteRow(index, rows) {
-      const pcsn = rows[index].pcsn
-      let len = rows.length
-      while (len--) {
-        const obj = rows[len]
-        if (pcsn === obj.pcsn) {
-          const index = rows.indexOf(obj)
-          if (index > -1) { // 移除找到的指定元素
-            this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].qty)
-            rows.splice(index, 1)
-            this.form.detail_count = this.form.tableData.length
-          }
-        }
-      }
+      this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
+      rows.splice(index, 1)
+      this.form.detail_count = this.form.tableData.length
     }
   }
 }

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

@@ -67,7 +67,7 @@
               clearable
               style="width: 220px"
               size="mini"
-              :disabled="queryrow.pcsn!=='' && queryrow.pcsn!==null"
+              :disabled="pscnDisabled"
               placeholder="批次号"
               prefix-icon="el-icon-search"
               class="filter-item"
@@ -136,6 +136,7 @@ export default {
       dialogVisible: false,
       dialogVisible2: false,
       fullscreenLoading: false,
+      pscnDisabled: false,
       goal_unassign_qty: 0,
       queryrow: {},
       sects: [],
@@ -156,6 +157,9 @@ export default {
     rowmst: {
       handler(newValue, oldValue) {
         this.queryrow = newValue
+        if (this.queryrow.pcsn !== '' && this.queryrow.pcsn !== null) {
+          this.pscnDisabled = true
+        }
         this.goal_unassign_qty = JSON.parse(JSON.stringify(this.queryrow.unassign_qty))
       }
     }

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

@@ -128,17 +128,12 @@
         <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
         <el-table-column min-width="140" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column prop="pcsn" label="子卷号" width="150px" align="center" show-overflow-tooltip />
-        <el-table-column prop="sap_pcsn" label="sap批次" width="120px" align="center" show-overflow-tooltip />
+        <el-table-column prop="pcsn" label="批次号" width="150px" align="center" show-overflow-tooltip />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column prop="assign_qty" :formatter="crud.formatNum3" label="已分配重量" align="center" width="100px" />
         <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_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />-->
         <el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" />
-        <el-table-column prop="vbeln" label="交货单号" align="center" width="120px" />
-        <el-table-column prop="posnr" label="行号" align="center" width="70px" />
-        <el-table-column prop="width" label="幅宽" align="center" width="110px" />
         <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
       </el-table>
     </el-card>
@@ -160,16 +155,13 @@
       >
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column prop="pcsn" label="子卷批次号" align="center" show-overflow-tooltip />
-        <el-table-column prop="sap_pcsn" label="sap批次号" align="center" show-overflow-tooltip />
-        <el-table-column prop="box_no" label="箱号" align="center" width="250px" show-overflow-tooltip />
+        <el-table-column prop="pcsn" label="批次号" align="center" show-overflow-tooltip />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <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 show-overflow-tooltip prop="is_overdue" width="150px" label="是否超期" align="center" :formatter="formatOverdue" />
-        <!--        <el-table-column prop="next_point_code" label="目的位置" align="center" />-->
-        <!--        <el-table-column prop="task_code" label="任务号" align="center" />-->
+<!--        <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="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>
@@ -182,6 +174,7 @@
 import { crud } from '@crud/crud'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
 import crudBsrealstorattr from '@/views/wms/basedata/bsrealstorattr/bsrealstorattr'
+import { getOutBillTask } from './checkoutbill'
 
 export default {
   name: 'ViewDialog',
@@ -272,7 +265,7 @@ export default {
     },
     queryTableDdis() {
       if (this.currentdtl !== null) {
-        checkoutbill.getOutBillTask2({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
+        checkoutbill.getOutBillTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
           this.tabledis = res
         }).catch(() => {
           this.tabledis = []

wms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js

@@ -38,26 +38,6 @@ export function getOutBillDis(params) {
     params
   })
 }
-export function getOutBillDisDtl(params) {
-  return request({
-    url: '/api/checkoutbill/getOutBillDisDtl',
-    method: 'get',
-    params
-  })
-}
-export function getInvTypes() {
-  return request({
-    url: '/api/checkoutbill/getInvTypes',
-    method: 'get'
-  })
-}
-export function insertDtl(data) {
-  return request({
-    url: '/api/checkoutbill/insertDtl',
-    method: 'post',
-    data
-  })
-}
 export function allDiv(data) {
   return request({
     url: '/api/checkoutbill/allDiv',
@@ -114,85 +94,9 @@ export function confirm(data) {
     data
   })
 }
-export function issueTask(data) {
+export function getOutBillTask(data) {
   return request({
-    url: '/api/checkoutbill/issueTask',
-    method: 'post',
-    data
-  })
-}
-export function finishTask(data) {
-  return request({
-    url: '/api/checkoutbill/finishTask',
-    method: 'post',
-    data
-  })
-}
-export function cancleTaskfinish(data) {
-  return request({
-    url: '/api/checkoutbill/cancleTaskfinish',
-    method: 'post',
-    data
-  })
-}
-export function paramByCodeType(data) {
-  return request({
-    url: '/api/checkoutbill/paramByCodeType',
-    method: 'post',
-    data
-  })
-}
-export function schAreaType(data) {
-  return request({
-    url: '/api/checkoutbill/schAreaType',
-    method: 'post',
-    data
-  })
-}
-export function backConfirm(data) {
-  return request({
-    url: '/api/checkoutbill/backConfirm',
-    method: 'post',
-    data
-  })
-}
-export function getType() {
-  return request({
-    url: '/api/checkoutbill/getType',
-    method: 'get'
-  })
-}
-export function moneySubmit(data) {
-  return request({
-    url: '/api/checkoutbill/moneySubmit',
-    method: 'post',
-    data
-  })
-}
-export function getDisNum(data) {
-  return request({
-    url: '/api/checkoutbill/getDisNum',
-    method: 'post',
-    data
-  })
-}
-export function queryBox(data) {
-  return request({
-    url: '/api/checkoutbill/queryBox',
-    method: 'post',
-    data
-  })
-}
-export function getOutBillTask2(data) {
-  return request({
-    url: '/api/checkoutbill/getOutBillTask2',
-    method: 'post',
-    data
-  })
-}
-export function cancelTask(data) {
-  return request({
-    url: '/api/checkoutbill/cancelTask',
+    url: '/api/checkoutbill/getOutBillTask',
     method: 'post',
     data
   })
@@ -204,13 +108,6 @@ export function allSetPoint(data) {
     data
   })
 }
-export function oneSetPoint2(data) {
-  return request({
-    url: '/api/checkoutbill/oneSetPoint2',
-    method: 'post',
-    data
-  })
-}
 export function outReturn(data) {
   return request({
     url: '/api/checkoutbill/outReturn',
@@ -218,18 +115,5 @@ export function outReturn(data) {
     data
   })
 }
-export function excelImport(data) {
-  return request({
-    url: '/api/checkoutbill/importExcel',
-    method: 'post',
-    data
-  })
-}
-export function saveUpdate(data) {
-  return request({
-    url: '/api/checkoutbill/saveUpdate',
-    method: 'post',
-    data
-  })
-}
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, autoCancel, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2, outReturn, excelImport, saveUpdate }
+
+export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, autoCancel, getStructIvt, manualDiv, confirm, allDivOne, getOutBillTask, oneCancel, allSetPoint, outReturn }