1. 更新主键

2. 曾加配置模块

1. 更新主键
2. 曾加配置模块
肖超群
1 parent 1a1a8d71
Showing 46 changed files with 354 additions and 140 deletions
jeecg-boot-master/ant-design-vue-jeecg/src/api/api.js
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ReceiptTypeList.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ShipmentTypeList.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ReceiptTypeForm.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ShipmentTypeForm.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptDetailModal.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptHeaderModal.vue
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/address/entity/Address.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/bomHeader/entity/BomDetail.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/bomHeader/entity/BomHeader.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/carrier/controller/CarrierController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/carrier/entity/Carrier.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/container/entity/Container.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerCapacity/entity/ContainerCapacity.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerType/entity/ContainerType.java
@@ -98,6 +98,12 @@ export const getZoneList = (params)=&gt;getAction(&#39;/config/zone/getZoneList&#39;, param
 export const getContainerTypeList = (params)=>getAction('/config/containerType/getContainerTypeList', params);
 export const getLocationTypeList = (params)=>getAction('/config/locationType/getLocationTypeList', params);
 export const getLocationHighList = (params)=>postAction('/config/locationHigh/getLocationHighList', params);
+export const getCompanyList = (params)=>getAction('/config/company/getCompanyList', params);
+export const getCarrierList = (params)=>getAction('/config/carrier/getCarrierList', params);
+export const getCustomerList = (params)=>getAction('/config/customer/getCustomerList', params);
+export const getSupplierList = (params)=>getAction('/config/supplier/getSupplierList', params);
+export const getReceiptTypeList = (params)=>getAction('/config/receiptType/getReceiptTypeList', params);
+export const getShipmentTypeList = (params)=>getAction('/config/shipmentType/getShipmentTypeList', params);
 // 中转HTTP请求
 export const transitRESTful = {
@@ -27,8 +27,7 @@
                   placeholder="请选择容器类型"
                   option-filter-prop="children"
                   :filter-option="filterOption"
-                  v-model="queryParam.containerTypeCode"
-                  style="width: 200px">
+                  v-model="queryParam.containerTypeCode">
                   <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-item>
@@ -198,13 +197,6 @@
             align:"center",
             dataIndex: 'locationCode'
           },
-          // {
-          //   title:'库区编码',
-          //   align:"center",
-          //   dataIndex: 'zoneCode',
-          //   key: 'zoneCode',
-          //   scopedSlots: { customRender: 'zoneCode' }
-          // },
           {
             title:'容器类型',
             align:"center",
@@ -152,11 +152,6 @@
             dataIndex: 'name'
           },
           {
-            title:'货主',
-            align:"center",
-            dataIndex: 'companyCode'
-          },
-          {
             title:'创建人',
             align:"center",
             dataIndex: 'createBy'
@@ -191,7 +186,7 @@
           deleteBatch: "/config/receiptType/deleteBatch",
           exportXlsUrl: "/config/receiptType/exportXls",
           importExcelUrl: "config/receiptType/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -152,11 +152,6 @@
             dataIndex: 'name'
           },
           {
-            title:'货主',
-            align:"center",
-            dataIndex: 'companyCode'
-          },
-          {
             title:'创建人',
             align:"center",
             dataIndex: 'createBy'
@@ -191,7 +186,7 @@
           deleteBatch: "/config/shipmentType/deleteBatch",
           exportXlsUrl: "/config/shipmentType/exportXls",
           importExcelUrl: "config/shipmentType/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -13,11 +13,6 @@
               <a-input v-model="model.name" placeholder="请输入名称"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
-              <a-input v-model="model.companyCode" placeholder="请输入货主"  ></a-input>
-            </a-form-model-item>
-          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -112,7 +107,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }
@@ -13,11 +13,6 @@
               <a-input v-model="model.name" placeholder="请输入名称"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
-              <a-input v-model="model.companyCode" placeholder="请输入货主"  ></a-input>
-            </a-form-model-item>
-          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -112,7 +107,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }
@@ -122,21 +122,6 @@
             }
           },
           {
-            title:'入库单ID',
-            align:"center",
-            dataIndex: 'receiptId'
-          },
-          {
-            title:'入库单编码',
-            align:"center",
-            dataIndex: 'receiptCode'
-          },
-          {
-            title:'货主编码',
-            align:"center",
-            dataIndex: 'companyCode'
-          },
-          {
             title:'物料编码',
             align:"center",
             dataIndex: 'materialCode'
@@ -9,18 +9,35 @@
               <a-input placeholder="请输入编码" v-model="queryParam.code"></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.companyCode"></a-input>
+              <a-select
+                show-search
+                placeholder="请选择货主"
+                option-filter-prop="children"
+                :filter-option="filterOption"
+                v-model="queryParam.companyCode">
+                <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="入库单类型">
+              <a-select
+                show-search
+                placeholder="请选择入库单类型"
+                option-filter-prop="children"
+                :filter-option="filterOption"
+                v-model="queryParam.type">
+                <a-select-option v-for="item in receiptTypeList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
+              </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.type"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="头状态">
                 <j-dict-select-tag placeholder="请选择头状态" v-model="queryParam.firstStatus" dictCode="receipt_status"/>
               </a-form-item>
@@ -35,11 +52,20 @@
                 <a-input placeholder="请输入上游单号" v-model="queryParam.referCode"></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.supplierCode"></a-input>
+              <a-form-item label="供应商">
+                <a-select
+                  show-search
+                  placeholder="请选择供应商"
+                  option-filter-prop="children"
+                  :filter-option="filterOption"
+                  v-model="queryParam.supplierCode">
+                  <a-select-option v-for="item in supplierList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
+                </a-select>
               </a-form-item>
             </a-col>
+
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
               <a-form-item label="创建日期">
                 <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
@@ -62,7 +88,7 @@
       </a-form>
     </div>
     <!-- 查询区域-END -->
-    
+
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
@@ -96,6 +122,24 @@
         :customRow="clickThenSelect"
         @change="handleTableChange">
+         <span slot="companyCode" slot-scope="companyCode">
+          <a-tag :key="companyCode" color=blue>
+            {{ solutionCompany(companyCode) }}
+          </a-tag>
+        </span>
+
+        <span slot="type" slot-scope="type">
+          <a-tag :key="type" color=pink>
+            {{ solutionReceiptType(type) }}
+          </a-tag>
+        </span>
+
+        <span slot="supplierCode" slot-scope="supplierCode">
+          <a-tag :key="supplierCode" color=pink>
+            {{ solutionSupplier(supplierCode) }}
+          </a-tag>
+        </span>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -153,6 +197,10 @@
   import ReceiptDetailList from './ReceiptDetailList'
   import {initDictOptions,filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import '@/assets/less/TableExpand.less'
+  import {getCompanyList} from '@/api/api'
+  import {getReceiptTypeList} from '@/api/api'
+  import {getSupplierList} from '@/api/api'
+
   export default {
     name: "ReceiptHeaderList",
@@ -164,6 +212,9 @@
     data () {
       return {
         description: '入库表主表管理页面',
+        companyList:[],
+        receiptTypeList:[],
+        supplierList:[],
         // 表头
         columns: [
           {
@@ -174,12 +225,16 @@
           {
             title:'货主',
             align:"center",
-            dataIndex: 'companyCode'
+            dataIndex: 'companyCode',
+            key: 'companyCode',
+            scopedSlots: { customRender: 'companyCode' }
           },
           {
             title:'入库单类型',
             align:"center",
-            dataIndex: 'type'
+            dataIndex: 'type',
+            key: 'type',
+            scopedSlots: { customRender: 'type' }
           },
           {
             title:'头状态',
@@ -197,9 +252,11 @@
             dataIndex: 'referCode'
           },
           {
-            title:'供应商编码',
+            title:'供应商',
             align:"center",
-            dataIndex: 'supplierCode'
+            dataIndex: 'supplierCode',
+            key: 'supplierCode',
+            scopedSlots: { customRender: 'supplierCode' }
           },
           {
             title:'总数量',
@@ -274,6 +331,7 @@
     },
     created() {
       this.getSuperFieldList();
+      this.loadFrom();
     },
     computed: {
       importExcelUrl: function(){
@@ -342,7 +400,54 @@
         fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
         fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
         this.superFieldList = fieldList
-      }
+      },
+      loadFrom() {
+        getCompanyList().then((res) => {
+          if (res.success) {
+            this.companyList = res.result
+          }
+        });
+        getReceiptTypeList().then((res) => {
+          if (res.success) {
+            this.receiptTypeList = res.result
+          }
+        });
+        getSupplierList().then((res) => {
+          if (res.success) {
+            this.supplierList = res.result
+          }
+        });
+      },
+      solutionCompany(value) {
+        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('')
+      },
+      solutionReceiptType(value) {
+        var actions = []
+        Object.keys(this.receiptTypeList).some((key) => {
+          if (this.receiptTypeList[key].code == ('' + value)) {
+            actions.push(this.receiptTypeList[key].name)
+            return true
+          }
+        })
+        return actions.join('')
+      },
+      solutionSupplier(value) {
+        var actions = []
+        Object.keys(this.supplierList).some((key) => {
+          if (this.supplierList[key].code == ('' + value)) {
+            actions.push(this.supplierList[key].name)
+            return true
+          }
+        })
+        return actions.join('')
+      },
     }
   }
 </script>
@@ -12,11 +12,6 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="入库单ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="receiptId">
-              <a-input v-model="model.receiptId"placeholder="请输入入库单ID" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
             <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
               <a-input v-model="model.materialCode"placeholder="请输入物料编码" ></a-input>
             </a-form-model-item>
@@ -108,6 +103,7 @@
     methods: {
       add () {
         this.edit(this.modelDefault);
+        this.model.inventoryStatus =  "good";
       },
       edit (record) {
         this.model = Object.assign({}, record);
@@ -11,26 +11,52 @@
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-row>
+
           <a-col :span="24">
-            <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
-              <a-input v-model="model.companyCode" placeholder="请输入货主" ></a-input>
+            <a-form-model-item label="货主"  :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
+              <a-select
+                show-search
+                placeholder="请选择货主"
+                option-filter-prop="children"
+                :filter-option="filterOption"
+                v-model="model.companyCode">
+                <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
+
           <a-col :span="24">
-            <a-form-model-item label="入库单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <a-input v-model="model.type" placeholder="请输入入库单类型" ></a-input>
+            <a-form-model-item label="入库单类型"  :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <a-select
+                show-search
+                placeholder="请选择入库单类型"
+                option-filter-prop="children"
+                :filter-option="filterOption"
+                v-model="model.type">
+                <a-select-option v-for="item in receiptTypeList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
+
           <a-col :span="24">
-            <a-form-model-item label="供应商编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierCode">
-              <a-input v-model="model.supplierCode" placeholder="请输入供应商编码" ></a-input>
+            <a-form-model-item label="供应商"  :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierCode">
+              <a-select
+                show-search
+                placeholder="请选择供应商"
+                option-filter-prop="children"
+                :filter-option="filterOption"
+                v-model="model.supplierCode">
+                <a-select-option v-for="item in supplierList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
+
           <a-col :span="24">
             <a-form-model-item label="入库单备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
               <a-input v-model="model.remark" placeholder="请输入入库单备注" ></a-input>
             </a-form-model-item>
           </a-col>
+
         </a-row>
       </a-form-model>
     </a-spin>
@@ -41,16 +67,22 @@
   import { httpAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
+  import {getCompanyList} from '@/api/api'
+  import {getReceiptTypeList} from '@/api/api'
+  import {getSupplierList} from '@/api/api'
   export default {
     name: "ReceiptHeaderModal",
-    components: { 
+    components: {
     },
     data () {
       return {
         title:"操作",
         width:800,
         visible: false,
+        companyList:[],
+        receiptTypeList:[],
+        supplierList:[],
         model:{
         },
         labelCol: {
@@ -72,16 +104,18 @@
           add: "/config/receiptHeader/add",
           edit: "/config/receiptHeader/edit",
         }
-     
+
       }
     },
     created () {
     //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      this.loadFrom();
     },
     methods: {
       add () {
         this.edit(this.modelDefault);
+        this.model.companyCode =  this.companyList[0].code;
       },
       edit (record) {
         this.model = Object.assign({}, record);
@@ -126,8 +160,24 @@
       handleCancel () {
         this.close()
       },
+      loadFrom() {
+        getCompanyList().then((res) => {
+          if (res.success) {
+            this.companyList = res.result
+          }
+        });
+        getReceiptTypeList().then((res) => {
+          if (res.success) {
+            this.receiptTypeList = res.result
+          }
+        });
+        getSupplierList().then((res) => {
+          if (res.success) {
+            this.supplierList = res.result
+          }
+        });
+      },
-      
     }
   }
 </script>
 \ No newline at end of file
@@ -32,9 +32,9 @@ public class Address implements Serializable {
     private static final long serialVersionUID = 1L;
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -26,7 +26,7 @@ import java.io.UnsupportedEncodingException;
 public class BomDetail implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private Integer id;
@@ -26,7 +26,7 @@ import io.swagger.annotations.ApiModelProperty;
 public class BomHeader implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private Integer id;
@@ -9,6 +9,9 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
@@ -21,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.wms.config.carrier.entity.Carrier;
 import org.jeecg.modules.wms.config.carrier.service.ICarrierService;
+import org.jeecg.modules.wms.config.company.entity.Company;
 import org.jeecg.utils.StringUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -176,4 +180,17 @@ public class CarrierController extends JeecgController&lt;Carrier, ICarrierService&gt;
         return super.importExcel(request, response, Carrier.class);
     }
+	 /**
+	  * 获得承运商信息
+	  * @param req
+	  */
+	 @RequestMapping(value = "/getCarrierList")
+	 public Result<?> getCarrierList(HttpServletRequest req) {
+		 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+		 LambdaQueryWrapper<Carrier> carrierLambdaQueryWrapper = Wrappers.lambdaQuery();
+		 carrierLambdaQueryWrapper.eq(Carrier::getWarehouseCode, warehouseCode);
+		 List<Carrier> carrierList = carrierService.list(carrierLambdaQueryWrapper);
+		 return Result.OK(carrierList);
+	 }
+
 }
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class Carrier implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -9,6 +9,9 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
@@ -21,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.wms.config.company.entity.Company;
 import org.jeecg.modules.wms.config.company.service.ICompanyService;
+import org.jeecg.modules.wms.config.zone.entity.Zone;
 import org.jeecg.utils.StringUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -176,4 +180,16 @@ public class CompanyController extends JeecgController&lt;Company, ICompanyService&gt;
         return super.importExcel(request, response, Company.class);
     }
+	 /**
+	  * 获得货主信息
+	  * @param req
+	  */
+	 @RequestMapping(value = "/getCompanyList")
+	 public Result<?> getCompanyList(HttpServletRequest req) {
+		 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+		 LambdaQueryWrapper<Company> companyLambdaQueryWrapper = Wrappers.lambdaQuery();
+		 companyLambdaQueryWrapper.eq(Company::getWarehouseCode, warehouseCode);
+		 List<Company> companyList = companyService.list(companyLambdaQueryWrapper);
+		 return Result.OK(companyList);
+	 }
 }
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class Company implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(type = IdType.AUTO)
+    /**主键*/
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**货主编码*/
 	@Excel(name = "货主编码", width = 15)
     @ApiModelProperty(value = "货主编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class Container implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**容器编码*/
 	@Excel(name = "容器编码", width = 15)
     @ApiModelProperty(value = "容器编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class ContainerCapacity implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**容器类型*/
 	@Excel(name = "容器类型", width = 15)
     @ApiModelProperty(value = "容器类型")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class ContainerType implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -7,8 +7,12 @@ import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
@@ -19,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.wms.config.carrier.entity.Carrier;
 import org.jeecg.modules.wms.config.customer.entity.Customer;
 import org.jeecg.modules.wms.config.customer.service.ICustomerService;
 import org.jeecg.utils.StringUtils;
@@ -49,6 +54,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 @RequestMapping("/config/customer")
 @Slf4j
 public class CustomerController extends JeecgController<Customer, ICustomerService> {
+
 	@Autowired
 	private ICustomerService customerService;
@@ -176,4 +182,16 @@ public class CustomerController extends JeecgController&lt;Customer, ICustomerServi
         return super.importExcel(request, response, Customer.class);
     }
+	 /**
+	  * 获得客户信息
+	  * @param req
+	  */
+	 @RequestMapping(value = "/getCustomerList")
+	 public Result<?> getCustomerList(HttpServletRequest req) {
+		 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+		 LambdaQueryWrapper<Customer> customerLambdaQueryWrapper = Wrappers.lambdaQuery();
+		 customerLambdaQueryWrapper.eq(Customer::getWarehouseCode, warehouseCode);
+		 List<Customer> customerList = customerService.list(customerLambdaQueryWrapper);
+		 return Result.OK(customerList);
+	 }
 }
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class Customer implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class CycleCountPreference implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键*/
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class Location implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**库位编码*/
 	@Excel(name = "库位编码", width = 15)
     @ApiModelProperty(value = "库位编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class LocationHigh implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class LocationType implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class Material implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**物料编码*/
 	@Excel(name = "物料编码", width = 15)
     @ApiModelProperty(value = "物料编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class MaterialArea implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class MaterialMultiple implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**物料编码*/
 	@Excel(name = "物料编码", width = 15)
     @ApiModelProperty(value = "物料编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class MaterialType implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class MaterialUnit implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**物料编码*/
 	@Excel(name = "物料编码", width = 15)
     @ApiModelProperty(value = "物料编码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class MaterialWarning implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**预警类别代码*/
 	@Excel(name = "预警类别代码", width = 15)
     @ApiModelProperty(value = "预警类别代码")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class ParameterConfiguration implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键*/
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**参数名称*/
 	@Excel(name = "参数名称", width = 15)
     @ApiModelProperty(value = "参数名称")
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class Port implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -9,6 +9,9 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
@@ -19,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.wms.config.customer.entity.Customer;
 import org.jeecg.modules.wms.config.receiptType.entity.ReceiptType;
 import org.jeecg.modules.wms.config.receiptType.service.IReceiptTypeService;
 import org.jeecg.utils.StringUtils;
@@ -174,4 +178,16 @@ public class ReceiptTypeController extends JeecgController&lt;ReceiptType, IReceipt
         return super.importExcel(request, response, ReceiptType.class);
     }
+	 /**
+	  * 获得入库单类型
+	  * @param req
+	  */
+	 @RequestMapping(value = "/getReceiptTypeList")
+	 public Result<?> getReceiptTypeList(HttpServletRequest req) {
+		 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+		 LambdaQueryWrapper<ReceiptType> receiptTypeLambdaQueryWrapper = Wrappers.lambdaQuery();
+		 receiptTypeLambdaQueryWrapper.eq(ReceiptType::getWarehouseCode, warehouseCode);
+		 List<ReceiptType> receiptTypeList = receiptTypeService.list(receiptTypeLambdaQueryWrapper);
+		 return Result.OK(receiptTypeList);
+	 }
 }
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class ReceiptType implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键*/
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -9,6 +9,9 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
@@ -19,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.wms.config.receiptType.entity.ReceiptType;
 import org.jeecg.modules.wms.config.shipmentType.entity.ShipmentType;
 import org.jeecg.modules.wms.config.shipmentType.service.IShipmentTypeService;
 import org.jeecg.utils.StringUtils;
@@ -174,4 +178,16 @@ public class ShipmentTypeController extends JeecgController&lt;ShipmentType, IShipm
         return super.importExcel(request, response, ShipmentType.class);
     }
+	 /**
+	  * 获得出库单类型
+	  * @param req
+	  */
+	 @RequestMapping(value = "/getShipmentTypeList")
+	 public Result<?> getShipmentTypeList(HttpServletRequest req) {
+		 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+		 LambdaQueryWrapper<ShipmentType> shipmentTypeLambdaQueryWrapper = Wrappers.lambdaQuery();
+		 shipmentTypeLambdaQueryWrapper.eq(ShipmentType::getWarehouseCode, warehouseCode);
+		 List<ShipmentType> shipmentTypeList = shipmentTypeService.list(shipmentTypeLambdaQueryWrapper);
+		 return Result.OK(shipmentTypeList);
+	 }
 }
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class ShipmentType implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键*/
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -9,6 +9,9 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
@@ -19,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.wms.config.customer.entity.Customer;
 import org.jeecg.modules.wms.config.supplier.entity.Supplier;
 import org.jeecg.modules.wms.config.supplier.service.ISupplierService;
 import org.jeecg.utils.StringUtils;
@@ -176,4 +180,16 @@ public class SupplierController extends JeecgController&lt;Supplier, ISupplierServi
         return super.importExcel(request, response, Supplier.class);
     }
+	 /**
+	  * 获得供应商信息
+	  * @param req
+	  */
+	 @RequestMapping(value = "/getSupplierList")
+	 public Result<?> getSupplierList(HttpServletRequest req) {
+		 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+		 LambdaQueryWrapper<Supplier> supplierLambdaQueryWrapper = Wrappers.lambdaQuery();
+		 supplierLambdaQueryWrapper.eq(Supplier::getWarehouseCode, warehouseCode);
+		 List<Supplier> supplierList = supplierService.list(supplierLambdaQueryWrapper);
+		 return Result.OK(supplierList);
+	 }
 }
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class Supplier implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -27,10 +27,10 @@ import java.util.Date;
 public class SysUserWarehouse implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键*/
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**用户名称*/
 	@Excel(name = "用户名称", width = 15)
     @ApiModelProperty(value = "用户名称")
@@ -31,7 +31,7 @@ import lombok.experimental.Accessors;
 public class Warehouse implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private Integer id;
@@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
 public class Zone implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
+    /**主键*/
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -26,10 +26,10 @@ import java.io.UnsupportedEncodingException;
 public class ReceiptDetail implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键*/
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**入库单ID*/
     @ApiModelProperty(value = "入库单ID")
     private String receiptId;
@@ -26,10 +26,10 @@ import io.swagger.annotations.ApiModelProperty;
 public class ReceiptHeader implements Serializable {
     private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键*/
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
-    private String id;
+    private Integer id;
 	/**编码*/
     @Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.wms.config.receiptType.entity.ReceiptType;
+import org.jeecg.modules.wms.config.receiptType.service.IReceiptTypeService;
 import org.jeecg.modules.wms.config.receiptType.service.impl.ReceiptTypeServiceImpl;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.receipt.receiptHeader.mapper.ReceiptDetailMapper;
@@ -39,7 +40,7 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
 	@Autowired
 	private ReceiptDetailMapper receiptDetailMapper;
 	@Resource
-	private ReceiptTypeServiceImpl receiptTypeService;
+	private IReceiptTypeService receiptTypeService;
 	@Override
 	@Transactional