新增一种快速出库

肖超群
1 parent 6e3918a5
Showing 7 changed files with 27 additions and 16 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiSomeContainer.vue
ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/modules/CallShipmentBoxModal.vue
@@ -310,6 +310,8 @@ export const addInventoryDetail = (params) =&gt; postAction(&#39;/inventory/inventoryDe
 export const reduceInventoryDetail = (params) => postAction('/inventory/inventoryDetail/reduceInventoryDetail', params);
 // 根据库位编码查询库存详情
 export const getInventoryDetailByLocationCode = (params) => getAction('/inventory/inventoryDetail/list', params);
+//快速出库
+export const quickShipment = (params) => postAction("/task/taskHeader/quickShipment", params);
  
 // 中转HTTP请求
 export const transitRESTful = {
@@ -27,17 +27,18 @@ export default {
   },
   data() {
     return {
-      url: {list: '/inventory/inventoryDetail/queryPageListList'},
+      url: {list: '/inventory/inventoryDetail/querySomeInventory'},
       columns: [
         {title: '容器编码', align: 'center', dataIndex: 'containerCode'},
         {title: '库位编码', align: 'center', width: '15%', dataIndex: 'locationCode'},
-        {
-          title: '库区', align: 'center', width: '15%', dataIndex: 'zoneCode', key: 'zoneCode',
-          scopedSlots: {customRender: 'zoneCode'}
-        },
+        // {
+        //   title: '库区', align: 'center', width: '15%', dataIndex: 'zoneCode', key: 'zoneCode',
+        //   scopedSlots: {customRender: 'zoneCode'}
+        // },
         {title: '物料编码', align: 'center', width: '15%', dataIndex: 'materialCode'},
         {title: '物料名称', align: 'center', width: '15%', dataIndex: 'materialName'},
         {title: '物料数量', align: 'center', width: '15%', dataIndex: 'qty'},
+        {title: '托盘填充度', align: 'center', width: '15%', dataIndex: 'fillDensity'},
       ],
       // 定义在这里的参数都是可以在外部传递覆盖的，可以更灵活的定制化使用的组件
       default: {
@@ -191,15 +191,15 @@ export default {
           {required: true, message: '请选择角色!', trigger: "change" , validator: 'click'}
         ],
         password: [
-          {validator: this.validateToNextPassword, trigger: 'change'}],
+          {required: true, message: '请选择仓库!',validator: this.validateToNextPassword, trigger: 'change'}],
         confirmpassword: [{required: true, message: '请重新输入登录密码!',},
           {validator: this.compareToFirstPassword,}],
         realname: [{required: true, message: '请输入用户名称!'}],
-        phone: [{required: true, message: '请输入手机号!'}, {validator: this.validatePhone}],
-        email: [{validator: this.validateEmail}],
+        // phone: [{required: true, message: '请输入手机号!'}, {validator: this.validatePhone}],
+        // email: [{validator: this.validateEmail}],
         roles: {},
-        workNo: [{required: true, message: '请输入工号'},
-          {validator: this.validateWorkNo}],
+        // workNo: [{required: true, message: '请输入工号'},
+        //   {validator: this.validateWorkNo}],
         telephone: [{pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码'},],
       },
       departIdShow: false,
@@ -31,6 +31,7 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <template v-if="toggleSearchStatus">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="入库单类型">
               <a-select
@@ -74,7 +75,6 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <template v-show="toggleSearchStatus">
             <a-col :xl="12" :lg="14" :md="16" :sm="24">
               <a-form-item label="创建日期">
                 <j-date :show-date="true" date-format="YYYY-MM-DD" placeholder="请选择开始时间"
@@ -37,6 +37,7 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <template v-if="toggleSearchStatus">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="出库单类型">
               <a-select
@@ -80,7 +81,6 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="出库单备注">
                 <a-input placeholder="请输入出库单备注" v-model="queryParam.remark"></a-input>
@@ -46,7 +46,7 @@
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
-                <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="起始出入口">
                 <a-input placeholder="请输入起始出入口" v-model="queryParam.fromPortCode"></a-input>
               </a-form-item>
@@ -92,6 +92,7 @@
       <a-button @click="batchCreateEmptyOut()" v-has="'taskHeader:manyEmptyOut'" type="primary">批量空托出库</a-button>
       <a-button @click="createManyEmptyOut()" v-has="'taskHeader:manyEmptyOut'" type="primary">空托组出库</a-button>
       <a-button v-has="'taskHeader:callShipmentBox'" @click="callShipmentBox()" type="primary" >呼叫出库托盘</a-button>
+      <a-button v-has="'taskHeader:quickShipment'" @click="quickShipment()" type="primary">快速出库</a-button>
       <j-super-query :fieldList="superFieldList" v-has="'taskHeader:superQuery'" @handleSuperQuery="handleSuperQuery"/>
       <a-button v-has="'taskHeader:export'" type="primary" icon="download" @click="handleExportXls('任务表')">导出</a-button>
     </div>
@@ -188,6 +189,7 @@
     <many-empty-out-task-modal ref="manyEmptyOutModal" @ok="modalFormOk"></many-empty-out-task-modal>
     <update-priority ref="updatePriority" @ok="modalFormOk"></update-priority>
     <call-shipment-box-modal ref="modalForm5" @ok="modalFormOk"></call-shipment-box-modal>
+    <shipment-material-modal ref="shipmentMaterialModal" @ok="modalFormOk"></shipment-material-modal>
  
   </a-card>
 </template>
@@ -201,18 +203,20 @@ import TaskDetailList from &#39;./TaskDetailList&#39;
 import {initDictOptions, filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 import '@/assets/less/TableExpand.less'
 import {completeTaskByWMS, cancelTask, batchCreateEmptyOut} from '@/api/api'
-import {execute} from '@/api/api'
+import {execute, quickShipment} from '@/api/api'
 import {getZoneList, handleEmptyOut, handlePickupError, handleDoubleIn, switchTask} from '@/api/api'
 import EmptyOutTaskModal from './modules/EmptyOutTaskModal'
 import BatchEmptyOutTaskModal from './modules/BatchEmptyOutTaskModal'
 import ManyEmptyOutTaskModal from "./modules/ManyEmptyOutTaskModal";
 import CallShipmentBoxModal from "@views/system/task/modules/CallShipmentBoxModal";
 import UpdatePriority from "@views/system/task/modules/UpdatePriority.vue";
+import ShipmentMaterialModal from "@views/system/task/modules/ShipmentMaterialModal.vue";
  
 export default {
   name: "ShipmentTaskHeaderList",
   mixins: [JeecgListMixin],
   components: {
+    ShipmentMaterialModal,
     CallShipmentBoxModal,
     ManyEmptyOutTaskModal,
     EmptyOutTaskModal,
@@ -469,6 +473,10 @@ export default {
       this.$refs.modalForm5.edit();
       this.$refs.modalForm5.title = "呼叫出库托盘";
     },
+    quickShipment(){
+      this.$refs.shipmentMaterialModal.edit();
+      this.$refs.shipmentMaterialModal.title = "快速出库";
+    },
     loadFrom() {
       getZoneList().then((res) => {
         if (res.success) {
@@ -68,8 +68,8 @@ export default {
         containerCode: [
           {required: true, message: '请输入容器编码!'},
         ],
-        toPortCode: [
-          {required: true, message: '请选择入库口!'},
+        port: [
+          {required: true, message: '请选择出库口!'},
         ],
       },
       url: {