Merge branch 'develop4' into develop

Conflicts: ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptDetailService.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java

Merge branch 'develop4' into develop
Conflicts: ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptDetailService.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
谭毅彬
2 parents 3c37de67 ba1cfadc
Showing 15 changed files with 116 additions and 18 deletions
ant-design-vue-jeecg/src/views/system/config/modules/ContainerEditModal.vue
ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue
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/shipment/ShipmentDetailList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/service/IInventoryTransactionService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/service/impl/InventoryTransactionServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptDetailService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/IShipmentDetailService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentDetailServiceImpl.java
@@ -8,8 +8,7 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <location
-    ="realForm" @ok="submitCallback" :disabled="disableSubmit"></container-edit-form>
+    <container-edit-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></container-edit-form>
   </j-modal>
 </template>
  
@@ -4,6 +4,38 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="货主">
+              <a-input placeholder="请输入货主" v-model="queryParam.companyCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物料编码">
+              <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
+            </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.materialName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="物料规格">
+                <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -40,6 +72,12 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
  
+        <span slot="companyCode" slot-scope="companyCode">
+          <a-tag :key="companyCode" color=blue>
+            {{ solutionCompany(companyCode) }}
+          </a-tag>
+        </span>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -78,6 +116,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {getCompanyList} from '@/api/api'
   import InventoryDetailList from './InventoryDetailList'
   import InventoryDetailSubTable from './subTables/InventoryDetailSubTable'
  
@@ -93,17 +132,18 @@
         selectedMainId: '',
         description: '物料汇总主表管理页面',
         // 表头
+        companyList: [],
         columns: [
           // {
           //   title: '库存ID',
           //   align: "center",
           //   dataIndex: 'id'
           // },
-          {
-            title:'仓库',
-            align:"center",
-            dataIndex: 'warehouseCode'
-          },
+          // {
+          //   title:'仓库',
+          //   align:"center",
+          //   dataIndex: 'warehouseCode'
+          // },
           {
             title:'库区',
             align:"center",
@@ -112,7 +152,9 @@
           {
             title:'货主',
             align:"center",
-            dataIndex: 'companyCode'
+            dataIndex: 'companyCode',
+            key: 'companyCode',
+            scopedSlots: {customRender: 'companyCode'}
           },
           {
             title:'物料编码',
@@ -152,6 +194,7 @@
     },
     created() {
     this.getSuperFieldList();
+      this.loadFrom();
     },
     computed: {
       importExcelUrl: function(){
@@ -159,6 +202,14 @@
       },
     },
     methods: {
+      loadFrom() {
+        getCompanyList().then((res) => {
+          if (res.success) {
+            this.companyList = res.result
+          }
+        });
+      },
+
       clickThenSelect(record) {
         return {
           on: {
@@ -180,11 +231,24 @@
       },
       initDictConfig(){
       },
+
+      solutionCompany(value) {
+        debugger
+        var actions = []
+        Object.keys(this.companyList).some((key) => {
+          if (this.companyList[key].code == ('' + value)) {
+            actions.push(this.companyList[key].name)
+            return true
+          }
+        })
+        return actions.join('')
+      },
+
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'warehouseCode',text:'仓库',dictCode:''})
         fieldList.push({type:'string',value:'zoneCode',text:'库区',dictCode:''})
-        fieldList.push({type:'string',value:'companyCode',text:'货主',dictCode:''})
+        fieldList.push({type:'string',value:'companyCode_dec',text:'货主',dictCode:''})
         fieldList.push({type:'string',value:'materialCode',text:'物料编码',dictCode:''})
         fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
         fieldList.push({type:'string',value:'materialSpec',text:'物料规格',dictCode:''})
@@ -220,12 +220,15 @@ export default {
         {
           title: '更新日期',
           align: "center",
-          fixed: "right",
-          dataIndex: 'updateTime',
-          width: 147,
-          scopedSlots: {customRender: 'action'},
-
-        }
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align:"center",
+          fixed:"right",
+          width:147,
+          scopedSlots: { customRender: 'action' }
+        },
       ],
       url: {
         list: "/InventoryMaterialSummary/inventoryMaterialSummary/inventoryMaterialSummaryChild",
@@ -123,6 +123,7 @@ export default {
         {
           title: '单据详情ID',
           align: "center",
+          sorter: true,
           dataIndex: 'id'
         },
         {
@@ -230,6 +230,7 @@ export default {
         {
           title: '单据ID',
           align: "center",
+          sorter: true,
           dataIndex: 'id'
         },
         {
@@ -129,6 +129,7 @@ export default {
         {
           title: '单据详情ID',
           align: "center",
+          sorter: true,
           dataIndex: 'id'
         },
         {
@@ -247,7 +247,8 @@ export default {
         {
           title: '单据ID',
           align: "center",
-          dataIndex: 'id'
+          dataIndex: 'id',
+          sorter: true,
         },
         {
           title: '出库单编码',
@@ -224,11 +224,13 @@ export default {
           title: '任务ID',
           align: "center",
           dataIndex: 'id',
+          sorter: true,
         },
         {
           title: '任务类型',
           align: "center",
           dataIndex: 'taskType_dictText',
+          customFilterDropdown: true,
         },
         {
           title: '容器号',
@@ -3,6 +3,8 @@ package org.jeecg.modules.wms.inventory.inventoryTransaction.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.wms.inventory.inventoryTransaction.entity.InventoryTransaction;
  
+import java.util.List;
+
 /**
  * @Description: 库存交易记录
  * @Author:      jeecg-boot
@@ -11,4 +13,6 @@ import org.jeecg.modules.wms.inventory.inventoryTransaction.entity.InventoryTran
  */
 public interface IInventoryTransactionService extends IService<InventoryTransaction> {
  
+    boolean batchSave(List<InventoryTransaction> inventoryTransactionList);
+    
 }
@@ -7,6 +7,8 @@ import org.springframework.stereotype.Service;
  
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  
+import java.util.List;
+
 /**
  * @Description: 库存交易记录
  * @Author:      jeecg-boot
@@ -16,4 +18,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class InventoryTransactionServiceImpl extends ServiceImpl<InventoryTransactionMapper, InventoryTransaction> implements IInventoryTransactionService {
  
+    @Override
+    public boolean batchSave(List<InventoryTransaction> inventoryTransactionList) {
+        return this.saveBatch(inventoryTransactionList);
+    }
 }
@@ -143,8 +143,10 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @RequiresPermissions("receiptHeader:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        receiptHeaderService.delMain(id, QuantityConstant.WMS_DELETE_RECEIPT);
-        return Result.OK("删除成功!");
+        if (!receiptHeaderService.delMain(id, QuantityConstant.WMS_DELETE_RECEIPT)) {
+            return Result.error("删除失败");
+        }
+        return Result.ok("删除成功");
     }
  
     /**
@@ -22,4 +22,6 @@ public interface IReceiptDetailService extends IService&lt;ReceiptDetail&gt; {
     public Result removeDetailById(String id);
  
     public Result removeDetailListById(List<String> idList);
+
+    boolean batchSave(List<ReceiptDetail> receiptDetailList);
 }
@@ -142,4 +142,9 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         }
         return result;
     }
+
+    @Override
+    public boolean batchSave(List<ReceiptDetail> receiptDetailList) {
+       return  this.saveBatch(receiptDetailList);
+    }
 }
@@ -20,4 +20,6 @@ public interface IShipmentDetailService extends IService&lt;ShipmentDetail&gt; {
     public Result saveShipmentDetail(ShipmentDetail shipmentDetail);
  
     public List<ShipmentDetail> getShipmentDetailListByShipmentId(Integer id);
+
+    boolean batchSave(List<ShipmentDetail> shipmentDetailList);
 }
@@ -94,4 +94,9 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
         List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(shipmentDetailLambdaQueryWrapper);
         return shipmentDetailList;
     }
+
+    @Override
+    public boolean batchSave(List<ShipmentDetail> shipmentDetailList) {
+        return this.saveBatch(shipmentDetailList);
+    }
 }