Merge branch 'develop' of http://172.16.29.40:8010/wms/wms4.git into develop

谭毅彬
2 parents d8be24e3 8a6fe39a
Showing 8 changed files with 43 additions and 14 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptDetailModal.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/modules/ReduceInventoryBySnModal.vue
ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentDetailModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -90,7 +90,7 @@
       </a-table>
     </div>
-    <receiptDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></receiptDetail-modal>
+    <receiptDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId" @dataSearch="dataSearch"></receiptDetail-modal>
     <receipt-detail-edit-modal ref="modalEditForm" @ok="modalFormOk" :mainId="mainId"></receipt-detail-edit-modal>
   </a-card>
 </template>
@@ -269,7 +269,9 @@ export default {
         this.searchQuery();
       });
     },
-
+    dataSearch() {
+      this.$emit('dataSearch');
+    },
     batchPrint() {
       if (this.selectedRowKeys.length <= 0) {
         this.$message.warning('请选择一条记录！');
@@ -222,7 +222,7 @@
     <a-tabs defaultActiveKey="1">
       <a-tab-pane tab="入库单详情" key="1">
-        <ReceiptDetailList :mainId="selectedMainId"/>
+        <ReceiptDetailList :mainId="selectedMainId" @dataSearch="dataSearch"/>
       </a-tab-pane>
     </a-tabs>
@@ -510,6 +510,21 @@ export default {
       this.selectedRowKeys = selectedRowKeys;
       this.selectionRows = selectionRows;
     },
+    dataSearch(){
+      //加载数据 若传入参数1则加载第一页的内容
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records;
+          this.ipagination.total = res.result.total;
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+        this.loading = false;
+      })
+    },
     loadData(arg) {
       if (!this.url.list) {
         this.$message.error("请设置url.list属性!")
@@ -138,7 +138,8 @@ export default {
             .then(res => {
               if (res.success) {
                 that.$message.success(res.message)
-                that.$emit('ok')
+                that.$emit('ok');
+                this.$emit('dataSearch');
               } else {
                 that.$message.warning(res.message)
               }
@@ -70,7 +70,7 @@
       </a-table>
     </div>
-    <shipmentDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></shipmentDetail-modal>
+    <shipmentDetail-modal ref="modalForm" @ok="modalFormOk" @dataSearch="dataSearch" :mainId="mainId"></shipmentDetail-modal>
     <shipment-detail-edit-modal ref="modalEditForm" @ok="modalFormOk" @close="searchQuery" :mainId="mainId"></shipment-detail-edit-modal>
     <shipment-detail-combine-modal ref="modalCombineForm" @ok="modalFormOk" @close="searchQuery" :mainId="mainId"></shipment-detail-combine-modal>
@@ -275,6 +275,9 @@ export default {
       this.$refs.modalEditForm.title = "编辑";
       this.$refs.modalEditForm.disableSubmit = false;
     },
+    dataSearch() {
+      this.$emit('dataSearch');
+    }
   }
 }
 </script>
@@ -247,7 +247,7 @@
     <a-tabs defaultActiveKey="1">
       <a-tab-pane tab="出库单详情" key="1">
-        <ShipmentDetailList :mainId="selectedMainId" :flowStatus="flowStatus" :flowOff="flowOff"/>
+        <ShipmentDetailList :mainId="selectedMainId" :flowStatus="flowStatus" :flowOff="flowOff" @dataSearch="dataSearch"/>
       </a-tab-pane>
     </a-tabs>
@@ -691,6 +691,21 @@ export default {
         this.searchQuery();
       });
     },
+    dataSearch(){
+      //加载数据 若传入参数1则加载第一页的内容
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records;
+          this.ipagination.total = res.result.total;
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+        this.loading = false;
+      })
+    },
     loadData(arg) {
       if (!this.url.list) {
         this.$message.error("请设置url.list属性!")
@@ -108,11 +108,9 @@ export default {
       this.close()
     },
     getPortList(record) {
-      console.log("getPortList");
       selectSortingPort(record).then((res) => {
         if (res.success) {
           this.portList = res.result;
-          console.log("getPortList11");
           this.model = Object.assign({}, record);
           this.visible = true;
         }
@@ -140,6 +140,7 @@ export default {
             if (res.success) {
               that.$message.success(res.message);
               that.$emit('ok');
+              that.$emit('dataSearch');
             } else {
               that.$message.warning(res.message);
             }
@@ -1446,14 +1446,8 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
         if (!success) {
             throw new JeecgBootException("生成出库任务时, 创建任务详情失败");
         }
-        value = parameterConfigurationService.getValueByZoneCode(QuantityConstant.RULE_TASK_LOCATION, container.getZoneCode());
-        int taskLocationRule = Integer.parseInt(value);
         int shipmentContainerHeaderId = shipmentContainerHeader.getId();
         shipmentContainerHeader = new ShipmentContainerHeader();
-        if (taskLocationRule == QuantityConstant.RULE_TASK_SET_LOCATION) {
-            toLocationCode = fromLocationCode;
-            shipmentContainerHeader.setToLocationCode(toLocationCode);
-        }
         shipmentContainerHeader.setToPort(toPort);
         shipmentContainerHeader.setId(shipmentContainerHeaderId);
         shipmentContainerHeader.setTaskType(taskType);