wms / wms4_hunanhongwang · Commits

Commit c86ef6bb34cd9fb2fb9f9460e1fc61be2694655c

Authored by 肖超群
1 parent 1a1a8d71

1. 更新主键 

2. 曾加配置模块
Inline Side-by-side
Showing 46 changed files with 354 additions and 140 deletions
jeecg-boot-master/ant-design-vue-jeecg/src/api/api.js
  View file @c86ef6b
... ... @@ -98,6 +98,12 @@ export const getZoneList = (params)=>getAction('/config/zone/getZoneList', param
98 98 export const getContainerTypeList = (params)=>getAction('/config/containerType/getContainerTypeList', params);
99 99 export const getLocationTypeList = (params)=>getAction('/config/locationType/getLocationTypeList', params);
100 100 export const getLocationHighList = (params)=>postAction('/config/locationHigh/getLocationHighList', params);
  101 +export const getCompanyList = (params)=>getAction('/config/company/getCompanyList', params);
  102 +export const getCarrierList = (params)=>getAction('/config/carrier/getCarrierList', params);
  103 +export const getCustomerList = (params)=>getAction('/config/customer/getCustomerList', params);
  104 +export const getSupplierList = (params)=>getAction('/config/supplier/getSupplierList', params);
  105 +export const getReceiptTypeList = (params)=>getAction('/config/receiptType/getReceiptTypeList', params);
  106 +export const getShipmentTypeList = (params)=>getAction('/config/shipmentType/getShipmentTypeList', params);
101 107  
102 108 // 中转HTTP请求
103 109 export const transitRESTful = {
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
  View file @c86ef6b
... ... @@ -27,8 +27,7 @@
27 27 placeholder="请选择容器类型"
28 28 option-filter-prop="children"
29 29 :filter-option="filterOption"
30   - v-model="queryParam.containerTypeCode"
31   - style="width: 200px">
  30 + v-model="queryParam.containerTypeCode">
32 31 <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
33 32 </a-select>
34 33 </a-form-item>
... ... @@ -198,13 +197,6 @@
198 197 align:"center",
199 198 dataIndex: 'locationCode'
200 199 },
201   - // {
202   - // title:'库区编码',
203   - // align:"center",
204   - // dataIndex: 'zoneCode',
205   - // key: 'zoneCode',
206   - // scopedSlots: { customRender: 'zoneCode' }
207   - // },
208 200 {
209 201 title:'容器类型',
210 202 align:"center",
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ReceiptTypeList.vue
  View file @c86ef6b
... ... @@ -152,11 +152,6 @@
152 152 dataIndex: 'name'
153 153 },
154 154 {
155   - title:'货主',
156   - align:"center",
157   - dataIndex: 'companyCode'
158   - },
159   - {
160 155 title:'创建人',
161 156 align:"center",
162 157 dataIndex: 'createBy'
... ... @@ -191,7 +186,7 @@
191 186 deleteBatch: "/config/receiptType/deleteBatch",
192 187 exportXlsUrl: "/config/receiptType/exportXls",
193 188 importExcelUrl: "config/receiptType/importExcel",
194   -
  189 +
195 190 },
196 191 dictOptions:{},
197 192 superFieldList:[],
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ShipmentTypeList.vue
  View file @c86ef6b
... ... @@ -152,11 +152,6 @@
152 152 dataIndex: 'name'
153 153 },
154 154 {
155   - title:'货主',
156   - align:"center",
157   - dataIndex: 'companyCode'
158   - },
159   - {
160 155 title:'创建人',
161 156 align:"center",
162 157 dataIndex: 'createBy'
... ... @@ -191,7 +186,7 @@
191 186 deleteBatch: "/config/shipmentType/deleteBatch",
192 187 exportXlsUrl: "/config/shipmentType/exportXls",
193 188 importExcelUrl: "config/shipmentType/importExcel",
194   -
  189 +
195 190 },
196 191 dictOptions:{},
197 192 superFieldList:[],
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ReceiptTypeForm.vue
  View file @c86ef6b
... ... @@ -13,11 +13,6 @@
13 13 <a-input v-model="model.name" placeholder="请输入名称" ></a-input>
14 14 </a-form-model-item>
15 15 </a-col>
16   - <a-col :span="24">
17   - <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
18   - <a-input v-model="model.companyCode" placeholder="请输入货主" ></a-input>
19   - </a-form-model-item>
20   - </a-col>
21 16 </a-row>
22 17 </a-form-model>
23 18 </j-form-container>
... ... @@ -112,7 +107,7 @@
112 107 that.confirmLoading = false;
113 108 })
114 109 }
115   -
  110 +
116 111 })
117 112 },
118 113 }
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/ShipmentTypeForm.vue
  View file @c86ef6b
... ... @@ -13,11 +13,6 @@
13 13 <a-input v-model="model.name" placeholder="请输入名称" ></a-input>
14 14 </a-form-model-item>
15 15 </a-col>
16   - <a-col :span="24">
17   - <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
18   - <a-input v-model="model.companyCode" placeholder="请输入货主" ></a-input>
19   - </a-form-model-item>
20   - </a-col>
21 16 </a-row>
22 17 </a-form-model>
23 18 </j-form-container>
... ... @@ -112,7 +107,7 @@
112 107 that.confirmLoading = false;
113 108 })
114 109 }
115   -
  110 +
116 111 })
117 112 },
118 113 }
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue
  View file @c86ef6b
... ... @@ -122,21 +122,6 @@
122 122 }
123 123 },
124 124 {
125   - title:'入库单ID',
126   - align:"center",
127   - dataIndex: 'receiptId'
128   - },
129   - {
130   - title:'入库单编码',
131   - align:"center",
132   - dataIndex: 'receiptCode'
133   - },
134   - {
135   - title:'货主编码',
136   - align:"center",
137   - dataIndex: 'companyCode'
138   - },
139   - {
140 125 title:'物料编码',
141 126 align:"center",
142 127 dataIndex: 'materialCode'
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
  View file @c86ef6b
... ... @@ -9,18 +9,35 @@
9 9 <a-input placeholder="请输入编码" v-model="queryParam.code"></a-input>
10 10 </a-form-item>
11 11 </a-col>
  12 +
12 13 <a-col :xl="6" :lg="7" :md="8" :sm="24">
13 14 <a-form-item label="货主">
14   - <a-input placeholder="请输入货主" v-model="queryParam.companyCode"></a-input>
  15 + <a-select
  16 + show-search
  17 + placeholder="请选择货主"
  18 + option-filter-prop="children"
  19 + :filter-option="filterOption"
  20 + v-model="queryParam.companyCode">
  21 + <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
  22 + </a-select>
  23 + </a-form-item>
  24 + </a-col>
  25 +
  26 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
  27 + <a-form-item label="入库单类型">
  28 + <a-select
  29 + show-search
  30 + placeholder="请选择入库单类型"
  31 + option-filter-prop="children"
  32 + :filter-option="filterOption"
  33 + v-model="queryParam.type">
  34 + <a-select-option v-for="item in receiptTypeList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
  35 + </a-select>
15 36 </a-form-item>
16 37 </a-col>
  38 +
17 39 <template v-if="toggleSearchStatus">
18 40 <a-col :xl="6" :lg="7" :md="8" :sm="24">
19   - <a-form-item label="入库单类型">
20   - <a-input placeholder="请输入入库单类型" v-model="queryParam.type"></a-input>
21   - </a-form-item>
22   - </a-col>
23   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
24 41 <a-form-item label="头状态">
25 42 <j-dict-select-tag placeholder="请选择头状态" v-model="queryParam.firstStatus" dictCode="receipt_status"/>
26 43 </a-form-item>
... ... @@ -35,11 +52,20 @@
35 52 <a-input placeholder="请输入上游单号" v-model="queryParam.referCode"></a-input>
36 53 </a-form-item>
37 54 </a-col>
  55 +
38 56 <a-col :xl="6" :lg="7" :md="8" :sm="24">
39   - <a-form-item label="供应商编码">
40   - <a-input placeholder="请输入供应商编码" v-model="queryParam.supplierCode"></a-input>
  57 + <a-form-item label="供应商">
  58 + <a-select
  59 + show-search
  60 + placeholder="请选择供应商"
  61 + option-filter-prop="children"
  62 + :filter-option="filterOption"
  63 + v-model="queryParam.supplierCode">
  64 + <a-select-option v-for="item in supplierList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
  65 + </a-select>
41 66 </a-form-item>
42 67 </a-col>
  68 +
43 69 <a-col :xl="10" :lg="11" :md="12" :sm="24">
44 70 <a-form-item label="创建日期">
45 71 <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 @@
62 88 </a-form>
63 89 </div>
64 90 <!-- 查询区域-END -->
65   -
  91 +
66 92 <!-- 操作按钮区域 -->
67 93 <div class="table-operator">
68 94 <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
... ... @@ -96,6 +122,24 @@
96 122 :customRow="clickThenSelect"
97 123 @change="handleTableChange">
98 124  
  125 + <span slot="companyCode" slot-scope="companyCode">
  126 + <a-tag :key="companyCode" color=blue>
  127 + {{ solutionCompany(companyCode) }}
  128 + </a-tag>
  129 + </span>
  130 +
  131 + <span slot="type" slot-scope="type">
  132 + <a-tag :key="type" color=pink>
  133 + {{ solutionReceiptType(type) }}
  134 + </a-tag>
  135 + </span>
  136 +
  137 + <span slot="supplierCode" slot-scope="supplierCode">
  138 + <a-tag :key="supplierCode" color=pink>
  139 + {{ solutionSupplier(supplierCode) }}
  140 + </a-tag>
  141 + </span>
  142 +
99 143 <template slot="htmlSlot" slot-scope="text">
100 144 <div v-html="text"></div>
101 145 </template>
... ... @@ -153,6 +197,10 @@
153 197 import ReceiptDetailList from './ReceiptDetailList'
154 198 import {initDictOptions,filterMultiDictText} from '@/components/dict/JDictSelectUtil'
155 199 import '@/assets/less/TableExpand.less'
  200 + import {getCompanyList} from '@/api/api'
  201 + import {getReceiptTypeList} from '@/api/api'
  202 + import {getSupplierList} from '@/api/api'
  203 +
156 204  
157 205 export default {
158 206 name: "ReceiptHeaderList",
... ... @@ -164,6 +212,9 @@
164 212 data () {
165 213 return {
166 214 description: '入库表主表管理页面',
  215 + companyList:[],
  216 + receiptTypeList:[],
  217 + supplierList:[],
167 218 // 表头
168 219 columns: [
169 220 {
... ... @@ -174,12 +225,16 @@
174 225 {
175 226 title:'货主',
176 227 align:"center",
177   - dataIndex: 'companyCode'
  228 + dataIndex: 'companyCode',
  229 + key: 'companyCode',
  230 + scopedSlots: { customRender: 'companyCode' }
178 231 },
179 232 {
180 233 title:'入库单类型',
181 234 align:"center",
182   - dataIndex: 'type'
  235 + dataIndex: 'type',
  236 + key: 'type',
  237 + scopedSlots: { customRender: 'type' }
183 238 },
184 239 {
185 240 title:'头状态',
... ... @@ -197,9 +252,11 @@
197 252 dataIndex: 'referCode'
198 253 },
199 254 {
200   - title:'供应商编码',
  255 + title:'供应商',
201 256 align:"center",
202   - dataIndex: 'supplierCode'
  257 + dataIndex: 'supplierCode',
  258 + key: 'supplierCode',
  259 + scopedSlots: { customRender: 'supplierCode' }
203 260 },
204 261 {
205 262 title:'总数量',
... ... @@ -274,6 +331,7 @@
274 331 },
275 332 created() {
276 333 this.getSuperFieldList();
  334 + this.loadFrom();
277 335 },
278 336 computed: {
279 337 importExcelUrl: function(){
... ... @@ -342,7 +400,54 @@
342 400 fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
343 401 fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
344 402 this.superFieldList = fieldList
345   - }
  403 + },
  404 + loadFrom() {
  405 + getCompanyList().then((res) => {
  406 + if (res.success) {
  407 + this.companyList = res.result
  408 + }
  409 + });
  410 + getReceiptTypeList().then((res) => {
  411 + if (res.success) {
  412 + this.receiptTypeList = res.result
  413 + }
  414 + });
  415 + getSupplierList().then((res) => {
  416 + if (res.success) {
  417 + this.supplierList = res.result
  418 + }
  419 + });
  420 + },
  421 + solutionCompany(value) {
  422 + var actions = []
  423 + Object.keys(this.companyList).some((key) => {
  424 + if (this.companyList[key].code == ('' + value)) {
  425 + actions.push(this.companyList[key].name)
  426 + return true
  427 + }
  428 + })
  429 + return actions.join('')
  430 + },
  431 + solutionReceiptType(value) {
  432 + var actions = []
  433 + Object.keys(this.receiptTypeList).some((key) => {
  434 + if (this.receiptTypeList[key].code == ('' + value)) {
  435 + actions.push(this.receiptTypeList[key].name)
  436 + return true
  437 + }
  438 + })
  439 + return actions.join('')
  440 + },
  441 + solutionSupplier(value) {
  442 + var actions = []
  443 + Object.keys(this.supplierList).some((key) => {
  444 + if (this.supplierList[key].code == ('' + value)) {
  445 + actions.push(this.supplierList[key].name)
  446 + return true
  447 + }
  448 + })
  449 + return actions.join('')
  450 + },
346 451 }
347 452 }
348 453 </script>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptDetailModal.vue
  View file @c86ef6b
... ... @@ -12,11 +12,6 @@
12 12 <a-form-model ref="form" :model="model" :rules="validatorRules">
13 13 <a-row>
14 14 <a-col :span="24">
15   - <a-form-model-item label="入库单ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="receiptId">
16   - <a-input v-model="model.receiptId"placeholder="请输入入库单ID" ></a-input>
17   - </a-form-model-item>
18   - </a-col>
19   - <a-col :span="24">
20 15 <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
21 16 <a-input v-model="model.materialCode"placeholder="请输入物料编码" ></a-input>
22 17 </a-form-model-item>
... ... @@ -108,6 +103,7 @@
108 103 methods: {
109 104 add () {
110 105 this.edit(this.modelDefault);
  106 + this.model.inventoryStatus = "good";
111 107 },
112 108 edit (record) {
113 109 this.model = Object.assign({}, record);
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptHeaderModal.vue
  View file @c86ef6b
... ... @@ -11,26 +11,52 @@
11 11 <a-spin :spinning="confirmLoading">
12 12 <a-form-model ref="form" :model="model" :rules="validatorRules">
13 13 <a-row>
  14 +
14 15 <a-col :span="24">
15   - <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
16   - <a-input v-model="model.companyCode" placeholder="请输入货主" ></a-input>
  16 + <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
  17 + <a-select
  18 + show-search
  19 + placeholder="请选择货主"
  20 + option-filter-prop="children"
  21 + :filter-option="filterOption"
  22 + v-model="model.companyCode">
  23 + <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
  24 + </a-select>
17 25 </a-form-model-item>
18 26 </a-col>
  27 +
19 28 <a-col :span="24">
20   - <a-form-model-item label="入库单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
21   - <a-input v-model="model.type" placeholder="请输入入库单类型" ></a-input>
  29 + <a-form-model-item label="入库单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
  30 + <a-select
  31 + show-search
  32 + placeholder="请选择入库单类型"
  33 + option-filter-prop="children"
  34 + :filter-option="filterOption"
  35 + v-model="model.type">
  36 + <a-select-option v-for="item in receiptTypeList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
  37 + </a-select>
22 38 </a-form-model-item>
23 39 </a-col>
  40 +
24 41 <a-col :span="24">
25   - <a-form-model-item label="供应商编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierCode">
26   - <a-input v-model="model.supplierCode" placeholder="请输入供应商编码" ></a-input>
  42 + <a-form-model-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierCode">
  43 + <a-select
  44 + show-search
  45 + placeholder="请选择供应商"
  46 + option-filter-prop="children"
  47 + :filter-option="filterOption"
  48 + v-model="model.supplierCode">
  49 + <a-select-option v-for="item in supplierList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
  50 + </a-select>
27 51 </a-form-model-item>
28 52 </a-col>
  53 +
29 54 <a-col :span="24">
30 55 <a-form-model-item label="入库单备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
31 56 <a-input v-model="model.remark" placeholder="请输入入库单备注" ></a-input>
32 57 </a-form-model-item>
33 58 </a-col>
  59 +
34 60 </a-row>
35 61 </a-form-model>
36 62 </a-spin>
... ... @@ -41,16 +67,22 @@
41 67  
42 68 import { httpAction } from '@/api/manage'
43 69 import { validateDuplicateValue } from '@/utils/util'
  70 + import {getCompanyList} from '@/api/api'
  71 + import {getReceiptTypeList} from '@/api/api'
  72 + import {getSupplierList} from '@/api/api'
44 73  
45 74 export default {
46 75 name: "ReceiptHeaderModal",
47   - components: {
  76 + components: {
48 77 },
49 78 data () {
50 79 return {
51 80 title:"操作",
52 81 width:800,
53 82 visible: false,
  83 + companyList:[],
  84 + receiptTypeList:[],
  85 + supplierList:[],
54 86 model:{
55 87 },
56 88 labelCol: {
... ... @@ -72,16 +104,18 @@
72 104 add: "/config/receiptHeader/add",
73 105 edit: "/config/receiptHeader/edit",
74 106 }
75   -
  107 +
76 108 }
77 109 },
78 110 created () {
79 111 //备份model原始值
80 112 this.modelDefault = JSON.parse(JSON.stringify(this.model));
  113 + this.loadFrom();
81 114 },
82 115 methods: {
83 116 add () {
84 117 this.edit(this.modelDefault);
  118 + this.model.companyCode = this.companyList[0].code;
85 119 },
86 120 edit (record) {
87 121 this.model = Object.assign({}, record);
... ... @@ -126,8 +160,24 @@
126 160 handleCancel () {
127 161 this.close()
128 162 },
  163 + loadFrom() {
  164 + getCompanyList().then((res) => {
  165 + if (res.success) {
  166 + this.companyList = res.result
  167 + }
  168 + });
  169 + getReceiptTypeList().then((res) => {
  170 + if (res.success) {
  171 + this.receiptTypeList = res.result
  172 + }
  173 + });
  174 + getSupplierList().then((res) => {
  175 + if (res.success) {
  176 + this.supplierList = res.result
  177 + }
  178 + });
  179 + },
129 180  
130   -
131 181 }
132 182 }
133 183 </script>
134 184 \ No newline at end of file
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/address/entity/Address.java
  View file @c86ef6b
... ... @@ -32,9 +32,9 @@ public class Address implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34 34 /**主键*/
35   - @TableId(type = IdType.ASSIGN_ID)
  35 + @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/bomHeader/entity/BomDetail.java
  View file @c86ef6b
... ... @@ -26,7 +26,7 @@ import java.io.UnsupportedEncodingException;
26 26 public class BomDetail implements Serializable {
27 27 private static final long serialVersionUID = 1L;
28 28  
29   - /**主键*/
  29 + /**主键*/
30 30 @TableId(type = IdType.AUTO)
31 31 @ApiModelProperty(value = "主键")
32 32 private Integer id;
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/bomHeader/entity/BomHeader.java
  View file @c86ef6b
... ... @@ -26,7 +26,7 @@ import io.swagger.annotations.ApiModelProperty;
26 26 public class BomHeader implements Serializable {
27 27 private static final long serialVersionUID = 1L;
28 28  
29   - /**主键*/
  29 + /**主键*/
30 30 @TableId(type = IdType.AUTO)
31 31 @ApiModelProperty(value = "主键")
32 32 private Integer id;
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/carrier/controller/CarrierController.java
  View file @c86ef6b
... ... @@ -9,6 +9,9 @@ import java.io.UnsupportedEncodingException;
9 9 import java.net.URLDecoder;
10 10 import javax.servlet.http.HttpServletRequest;
11 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  14 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
12 15 import org.jeecg.common.api.vo.Result;
13 16 import org.jeecg.common.system.query.QueryGenerator;
14 17 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -21,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
21 24  
22 25 import org.jeecg.modules.wms.config.carrier.entity.Carrier;
23 26 import org.jeecg.modules.wms.config.carrier.service.ICarrierService;
  27 +import org.jeecg.modules.wms.config.company.entity.Company;
24 28 import org.jeecg.utils.StringUtils;
25 29 import org.jeecgframework.poi.excel.ExcelImportUtil;
26 30 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
... ... @@ -176,4 +180,17 @@ public class CarrierController extends JeecgController&lt;Carrier, ICarrierService&gt;
176 180 return super.importExcel(request, response, Carrier.class);
177 181 }
178 182  
  183 + /**
  184 + * 获得承运商信息
  185 + * @param req
  186 + */
  187 + @RequestMapping(value = "/getCarrierList")
  188 + public Result<?> getCarrierList(HttpServletRequest req) {
  189 + String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
  190 + LambdaQueryWrapper<Carrier> carrierLambdaQueryWrapper = Wrappers.lambdaQuery();
  191 + carrierLambdaQueryWrapper.eq(Carrier::getWarehouseCode, warehouseCode);
  192 + List<Carrier> carrierList = carrierService.list(carrierLambdaQueryWrapper);
  193 + return Result.OK(carrierList);
  194 + }
  195 +
179 196 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/carrier/entity/Carrier.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class Carrier implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java
  View file @c86ef6b
... ... @@ -9,6 +9,9 @@ import java.io.UnsupportedEncodingException;
9 9 import java.net.URLDecoder;
10 10 import javax.servlet.http.HttpServletRequest;
11 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  14 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
12 15 import org.jeecg.common.api.vo.Result;
13 16 import org.jeecg.common.system.query.QueryGenerator;
14 17 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -21,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
21 24  
22 25 import org.jeecg.modules.wms.config.company.entity.Company;
23 26 import org.jeecg.modules.wms.config.company.service.ICompanyService;
  27 +import org.jeecg.modules.wms.config.zone.entity.Zone;
24 28 import org.jeecg.utils.StringUtils;
25 29 import org.jeecgframework.poi.excel.ExcelImportUtil;
26 30 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
... ... @@ -176,4 +180,16 @@ public class CompanyController extends JeecgController&lt;Company, ICompanyService&gt;
176 180 return super.importExcel(request, response, Company.class);
177 181 }
178 182  
  183 + /**
  184 + * 获得货主信息
  185 + * @param req
  186 + */
  187 + @RequestMapping(value = "/getCompanyList")
  188 + public Result<?> getCompanyList(HttpServletRequest req) {
  189 + String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
  190 + LambdaQueryWrapper<Company> companyLambdaQueryWrapper = Wrappers.lambdaQuery();
  191 + companyLambdaQueryWrapper.eq(Company::getWarehouseCode, warehouseCode);
  192 + List<Company> companyList = companyService.list(companyLambdaQueryWrapper);
  193 + return Result.OK(companyList);
  194 + }
179 195 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class Company implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
35   - @TableId(type = IdType.AUTO)
  34 + /**主键*/
  35 + @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**货主编码*/
39 39 @Excel(name = "货主编码", width = 15)
40 40 @ApiModelProperty(value = "货主编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/container/entity/Container.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class Container implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**容器编码*/
39 39 @Excel(name = "容器编码", width = 15)
40 40 @ApiModelProperty(value = "容器编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerCapacity/entity/ContainerCapacity.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class ContainerCapacity implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**容器类型*/
39 39 @Excel(name = "容器类型", width = 15)
40 40 @ApiModelProperty(value = "容器类型")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerType/entity/ContainerType.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class ContainerType implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/customer/controller/CustomerController.java
  View file @c86ef6b
... ... @@ -7,8 +7,12 @@ import java.util.stream.Collectors;
7 7 import java.io.IOException;
8 8 import java.io.UnsupportedEncodingException;
9 9 import java.net.URLDecoder;
  10 +import javax.annotation.Resource;
10 11 import javax.servlet.http.HttpServletRequest;
11 12 import javax.servlet.http.HttpServletResponse;
  13 +
  14 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  15 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
12 16 import org.jeecg.common.api.vo.Result;
13 17 import org.jeecg.common.system.query.QueryGenerator;
14 18 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -19,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
19 23 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
20 24 import lombok.extern.slf4j.Slf4j;
21 25  
  26 +import org.jeecg.modules.wms.config.carrier.entity.Carrier;
22 27 import org.jeecg.modules.wms.config.customer.entity.Customer;
23 28 import org.jeecg.modules.wms.config.customer.service.ICustomerService;
24 29 import org.jeecg.utils.StringUtils;
... ... @@ -49,6 +54,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
49 54 @RequestMapping("/config/customer")
50 55 @Slf4j
51 56 public class CustomerController extends JeecgController<Customer, ICustomerService> {
  57 +
52 58 @Autowired
53 59 private ICustomerService customerService;
54 60  
... ... @@ -176,4 +182,16 @@ public class CustomerController extends JeecgController&lt;Customer, ICustomerServi
176 182 return super.importExcel(request, response, Customer.class);
177 183 }
178 184  
  185 + /**
  186 + * 获得客户信息
  187 + * @param req
  188 + */
  189 + @RequestMapping(value = "/getCustomerList")
  190 + public Result<?> getCustomerList(HttpServletRequest req) {
  191 + String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
  192 + LambdaQueryWrapper<Customer> customerLambdaQueryWrapper = Wrappers.lambdaQuery();
  193 + customerLambdaQueryWrapper.eq(Customer::getWarehouseCode, warehouseCode);
  194 + List<Customer> customerList = customerService.list(customerLambdaQueryWrapper);
  195 + return Result.OK(customerList);
  196 + }
179 197 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/customer/entity/Customer.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class Customer implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/cycleCountPreference/entity/CycleCountPreference.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class CycleCountPreference implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
35   - @TableId(type = IdType.ASSIGN_ID)
  34 + /**主键*/
  35 + @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/entity/Location.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class Location implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**库位编码*/
39 39 @Excel(name = "库位编码", width = 15)
40 40 @ApiModelProperty(value = "库位编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/locationHigh/entity/LocationHigh.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class LocationHigh implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/locationType/entity/LocationType.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class LocationType implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/material/entity/Material.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class Material implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**物料编码*/
39 39 @Excel(name = "物料编码", width = 15)
40 40 @ApiModelProperty(value = "物料编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialArea/entity/MaterialArea.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class MaterialArea implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialMultiple/entity/MaterialMultiple.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class MaterialMultiple implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**物料编码*/
39 39 @Excel(name = "物料编码", width = 15)
40 40 @ApiModelProperty(value = "物料编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialType/entity/MaterialType.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class MaterialType implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialUnit/entity/MaterialUnit.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class MaterialUnit implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**物料编码*/
39 39 @Excel(name = "物料编码", width = 15)
40 40 @ApiModelProperty(value = "物料编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialWarning/entity/MaterialWarning.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class MaterialWarning implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**预警类别代码*/
39 39 @Excel(name = "预警类别代码", width = 15)
40 40 @ApiModelProperty(value = "预警类别代码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/parameterConfiguration/entity/ParameterConfiguration.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class ParameterConfiguration implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
35   - @TableId(type = IdType.ASSIGN_ID)
  34 + /**主键*/
  35 + @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**参数名称*/
39 39 @Excel(name = "参数名称", width = 15)
40 40 @ApiModelProperty(value = "参数名称")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/port/entity/Port.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class Port implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/receiptType/controller/ReceiptTypeController.java
  View file @c86ef6b
... ... @@ -9,6 +9,9 @@ import java.io.UnsupportedEncodingException;
9 9 import java.net.URLDecoder;
10 10 import javax.servlet.http.HttpServletRequest;
11 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  14 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
12 15 import org.jeecg.common.api.vo.Result;
13 16 import org.jeecg.common.system.query.QueryGenerator;
14 17 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -19,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
19 22 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
20 23 import lombok.extern.slf4j.Slf4j;
21 24  
  25 +import org.jeecg.modules.wms.config.customer.entity.Customer;
22 26 import org.jeecg.modules.wms.config.receiptType.entity.ReceiptType;
23 27 import org.jeecg.modules.wms.config.receiptType.service.IReceiptTypeService;
24 28 import org.jeecg.utils.StringUtils;
... ... @@ -174,4 +178,16 @@ public class ReceiptTypeController extends JeecgController&lt;ReceiptType, IReceipt
174 178 return super.importExcel(request, response, ReceiptType.class);
175 179 }
176 180  
  181 + /**
  182 + * 获得入库单类型
  183 + * @param req
  184 + */
  185 + @RequestMapping(value = "/getReceiptTypeList")
  186 + public Result<?> getReceiptTypeList(HttpServletRequest req) {
  187 + String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
  188 + LambdaQueryWrapper<ReceiptType> receiptTypeLambdaQueryWrapper = Wrappers.lambdaQuery();
  189 + receiptTypeLambdaQueryWrapper.eq(ReceiptType::getWarehouseCode, warehouseCode);
  190 + List<ReceiptType> receiptTypeList = receiptTypeService.list(receiptTypeLambdaQueryWrapper);
  191 + return Result.OK(receiptTypeList);
  192 + }
177 193 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/receiptType/entity/ReceiptType.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class ReceiptType implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
35   - @TableId(type = IdType.ASSIGN_ID)
  34 + /**主键*/
  35 + @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/shipmentType/controller/ShipmentTypeController.java
  View file @c86ef6b
... ... @@ -9,6 +9,9 @@ import java.io.UnsupportedEncodingException;
9 9 import java.net.URLDecoder;
10 10 import javax.servlet.http.HttpServletRequest;
11 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  14 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
12 15 import org.jeecg.common.api.vo.Result;
13 16 import org.jeecg.common.system.query.QueryGenerator;
14 17 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -19,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
19 22 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
20 23 import lombok.extern.slf4j.Slf4j;
21 24  
  25 +import org.jeecg.modules.wms.config.receiptType.entity.ReceiptType;
22 26 import org.jeecg.modules.wms.config.shipmentType.entity.ShipmentType;
23 27 import org.jeecg.modules.wms.config.shipmentType.service.IShipmentTypeService;
24 28 import org.jeecg.utils.StringUtils;
... ... @@ -174,4 +178,16 @@ public class ShipmentTypeController extends JeecgController&lt;ShipmentType, IShipm
174 178 return super.importExcel(request, response, ShipmentType.class);
175 179 }
176 180  
  181 + /**
  182 + * 获得出库单类型
  183 + * @param req
  184 + */
  185 + @RequestMapping(value = "/getShipmentTypeList")
  186 + public Result<?> getShipmentTypeList(HttpServletRequest req) {
  187 + String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
  188 + LambdaQueryWrapper<ShipmentType> shipmentTypeLambdaQueryWrapper = Wrappers.lambdaQuery();
  189 + shipmentTypeLambdaQueryWrapper.eq(ShipmentType::getWarehouseCode, warehouseCode);
  190 + List<ShipmentType> shipmentTypeList = shipmentTypeService.list(shipmentTypeLambdaQueryWrapper);
  191 + return Result.OK(shipmentTypeList);
  192 + }
177 193 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/shipmentType/entity/ShipmentType.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class ShipmentType implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
35   - @TableId(type = IdType.ASSIGN_ID)
  34 + /**主键*/
  35 + @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/supplier/controller/SupplierController.java
  View file @c86ef6b
... ... @@ -9,6 +9,9 @@ import java.io.UnsupportedEncodingException;
9 9 import java.net.URLDecoder;
10 10 import javax.servlet.http.HttpServletRequest;
11 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  14 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
12 15 import org.jeecg.common.api.vo.Result;
13 16 import org.jeecg.common.system.query.QueryGenerator;
14 17 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -19,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
19 22 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
20 23 import lombok.extern.slf4j.Slf4j;
21 24  
  25 +import org.jeecg.modules.wms.config.customer.entity.Customer;
22 26 import org.jeecg.modules.wms.config.supplier.entity.Supplier;
23 27 import org.jeecg.modules.wms.config.supplier.service.ISupplierService;
24 28 import org.jeecg.utils.StringUtils;
... ... @@ -176,4 +180,16 @@ public class SupplierController extends JeecgController&lt;Supplier, ISupplierServi
176 180 return super.importExcel(request, response, Supplier.class);
177 181 }
178 182  
  183 + /**
  184 + * 获得供应商信息
  185 + * @param req
  186 + */
  187 + @RequestMapping(value = "/getSupplierList")
  188 + public Result<?> getSupplierList(HttpServletRequest req) {
  189 + String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
  190 + LambdaQueryWrapper<Supplier> supplierLambdaQueryWrapper = Wrappers.lambdaQuery();
  191 + supplierLambdaQueryWrapper.eq(Supplier::getWarehouseCode, warehouseCode);
  192 + List<Supplier> supplierList = supplierService.list(supplierLambdaQueryWrapper);
  193 + return Result.OK(supplierList);
  194 + }
179 195 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/supplier/entity/Supplier.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class Supplier implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/entity/SysUserWarehouse.java
  View file @c86ef6b
... ... @@ -27,10 +27,10 @@ import java.util.Date;
27 27 public class SysUserWarehouse implements Serializable {
28 28 private static final long serialVersionUID = 1L;
29 29  
30   - /**主键*/
31   - @TableId(type = IdType.ASSIGN_ID)
  30 + /**主键*/
  31 + @TableId(type = IdType.AUTO)
32 32 @ApiModelProperty(value = "主键")
33   - private String id;
  33 + private Integer id;
34 34 /**用户名称*/
35 35 @Excel(name = "用户名称", width = 15)
36 36 @ApiModelProperty(value = "用户名称")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/warehouse/entity/Warehouse.java
  View file @c86ef6b
... ... @@ -31,7 +31,7 @@ import lombok.experimental.Accessors;
31 31 public class Warehouse implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37 37 private Integer id;
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/entity/Zone.java
  View file @c86ef6b
... ... @@ -31,10 +31,10 @@ import lombok.experimental.Accessors;
31 31 public class Zone implements Serializable {
32 32 private static final long serialVersionUID = 1L;
33 33  
34   - /**主键*/
  34 + /**主键*/
35 35 @TableId(type = IdType.AUTO)
36 36 @ApiModelProperty(value = "主键")
37   - private String id;
  37 + private Integer id;
38 38 /**编码*/
39 39 @Excel(name = "编码", width = 15)
40 40 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/entity/ReceiptDetail.java
  View file @c86ef6b
... ... @@ -26,10 +26,10 @@ import java.io.UnsupportedEncodingException;
26 26 public class ReceiptDetail implements Serializable {
27 27 private static final long serialVersionUID = 1L;
28 28  
29   - /**主键*/
30   - @TableId(type = IdType.ASSIGN_ID)
  29 + /**主键*/
  30 + @TableId(type = IdType.AUTO)
31 31 @ApiModelProperty(value = "主键")
32   - private String id;
  32 + private Integer id;
33 33 /**入库单ID*/
34 34 @ApiModelProperty(value = "入库单ID")
35 35 private String receiptId;
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/entity/ReceiptHeader.java
  View file @c86ef6b
... ... @@ -26,10 +26,10 @@ import io.swagger.annotations.ApiModelProperty;
26 26 public class ReceiptHeader implements Serializable {
27 27 private static final long serialVersionUID = 1L;
28 28  
29   - /**主键*/
30   - @TableId(type = IdType.ASSIGN_ID)
  29 + /**主键*/
  30 + @TableId(type = IdType.AUTO)
31 31 @ApiModelProperty(value = "主键")
32   - private String id;
  32 + private Integer id;
33 33 /**编码*/
34 34 @Excel(name = "编码", width = 15)
35 35 @ApiModelProperty(value = "编码")
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
  View file @c86ef6b
... ... @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 6 import org.jeecg.common.api.vo.Result;
7 7 import org.jeecg.common.util.DateUtils;
8 8 import org.jeecg.modules.wms.config.receiptType.entity.ReceiptType;
  9 +import org.jeecg.modules.wms.config.receiptType.service.IReceiptTypeService;
9 10 import org.jeecg.modules.wms.config.receiptType.service.impl.ReceiptTypeServiceImpl;
10 11 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
11 12 import org.jeecg.modules.wms.receipt.receiptHeader.mapper.ReceiptDetailMapper;
... ... @@ -39,7 +40,7 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
39 40 @Autowired
40 41 private ReceiptDetailMapper receiptDetailMapper;
41 42 @Resource
42   - private ReceiptTypeServiceImpl receiptTypeService;
  43 + private IReceiptTypeService receiptTypeService;
43 44  
44 45 @Override
45 46 @Transactional
... ...