|
1
2
3
4
|
package com.huaheng.api.erp.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
5
|
import com.huaheng.api.erp.domain.BoxDomain;
|
|
6
|
import com.huaheng.api.erp.domain.BoxInfo;
|
|
7
|
import com.huaheng.api.erp.domain.PDAInventory;
|
|
8
|
import com.huaheng.api.erp.domain.ReturnOfGoods;
|
|
9
|
import com.huaheng.api.erp.service.PDAService;
|
|
10
11
12
13
14
15
|
import com.huaheng.common.constant.QuantityConstant;
import com.huaheng.common.exception.service.ServiceException;
import com.huaheng.common.utils.StringUtils;
import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
import com.huaheng.framework.web.controller.BaseController;
import com.huaheng.framework.web.domain.AjaxResult;
|
|
16
|
import com.huaheng.pc.config.container.domain.Container;
|
|
17
18
|
import com.huaheng.pc.config.container.service.ContainerService;
import com.huaheng.pc.config.location.service.LocationService;
|
|
19
20
21
|
import com.huaheng.pc.config.proPackaging.domain.ProPackaging;
import com.huaheng.pc.config.proPackaging.service.IProPackagingService;
import com.huaheng.pc.inventory.InventoryHistoryDetail.domain.InventoryHistoryDetail;
|
|
22
|
import com.huaheng.pc.inventory.InventoryHistoryDetail.service.impl.InventoryHistoryDetailServiceImpl;
|
|
23
24
|
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
|
|
25
26
|
import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
import com.huaheng.pc.inventory.inventoryHistoryHeader.service.impl.InventoryHistoryHeaderServiceImpl;
|
|
27
28
29
30
|
import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
import com.huaheng.pc.receipt.receiptContainerHeader.controller.ReceiptContainerHeaderController;
import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
|
|
31
|
import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
|
|
32
33
34
35
36
37
38
|
import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
|
|
39
|
import java.util.Map;
|
|
40
41
42
43
44
45
46
47
|
@RestController
@RequestMapping("/API/WMS/v2")
public class PDAController extends BaseController {
@Resource
private InventoryDetailService inventoryDetailService;
@Resource
|
|
48
49
50
51
52
53
54
55
|
private InventoryHeaderService inventoryHeaderService;
@Resource
private InventoryHistoryHeaderServiceImpl inventoryHistoryHeaderService;
@Resource
private InventoryHistoryDetailServiceImpl inventoryHistoryDetailService;
@Resource
private ContainerService containerService;
@Resource
|
|
56
57
|
private ReceiptContainerHeaderService receiptContainerHeaderService;
@Resource
|
|
58
|
private PDAService pdaService;
|
|
59
60
|
@Resource
private IProPackagingService proPackingService;
|
|
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
@PostMapping("/lockInventory")
@ApiOperation("锁定库存")
@ResponseBody
@ApiLogger(apiName = "锁定库存", from="PDA")
public AjaxResult lockInventory(@RequestBody PDAInventory pdaInventory) {
String locationCode = pdaInventory.getLocationCode();
LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getLocationCode, locationCode);
List<InventoryDetail> inventoryDetailList =
inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
if(inventoryDetailService == null) {
throw new ServiceException("");
}
return null;
}
|
|
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
@PostMapping("/complement")
@ApiOperation("补充条码")
@ResponseBody
@ApiLogger(apiName = "补充条码", from="PDA")
public AjaxResult complement(@RequestBody Map<String,String> map) {
String warehouseCode = QuantityConstant.DEFAULT_WAREHOUSE;
String containerCode = map.get("containerCode");
String boxCode = map.get("boxCode");
if(StringUtils.isEmpty(containerCode)) {
return AjaxResult.error("没有容器号");
}
Container containerByCode = containerService.getContainerByCode(containerCode);
if (containerByCode==null)
{
return AjaxResult.error("容器号不存在");
}
|
|
95
|
AjaxResult ajaxResult = handleMultiProcess("complement", new MultiProcessListener() {
|
|
96
97
98
99
100
101
102
103
104
105
106
107
|
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.complement(warehouseCode, containerCode,boxCode);
return ajaxResult;
}
});
return ajaxResult;
}
|
|
108
109
110
111
|
@PostMapping("/clearInventory")
@ApiOperation("释放库存")
@ResponseBody
@ApiLogger(apiName = "释放库存", from="PDA")
|
|
112
|
public AjaxResult clearInventory(@RequestBody Map<String,String> map) {
|
|
113
|
String warehouseCode = QuantityConstant.DEFAULT_WAREHOUSE;
|
|
114
|
String contaienrCode = map.get("containerCode");
|
|
115
116
|
if(StringUtils.isEmpty(contaienrCode)) {
return AjaxResult.error("没有容器号");
|
|
117
|
}
|
|
118
|
AjaxResult ajaxResult = handleMultiProcess("clearInventory", new MultiProcessListener() {
|
|
119
120
|
@Override
public AjaxResult doProcess() {
|
|
121
|
AjaxResult ajaxResult = pdaService.clearInventory(warehouseCode, contaienrCode);
|
|
122
123
124
125
|
return ajaxResult;
}
});
return ajaxResult;
|
|
126
127
|
}
|
|
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
@PostMapping("/bufferStorage")
@ApiOperation("入库缓存区入库")
@ResponseBody
@ApiLogger(apiName = "入库缓存区入库", from="PDA")
public AjaxResult bufferStorage(@RequestBody Map<String,String> map) {
String containerCode = map.get("containerCode");
LambdaQueryWrapper<Container> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(Container::getCode, containerCode);
Container container = containerService.getOne(queryWrapper);
String location=container.getLocationCode();
if (StringUtils.isEmpty(location))
{
return AjaxResult.error("这个容器没有库位,出问题了");
}
if(container == null) {
return AjaxResult.error("没有这个容器");
}
|
|
150
|
AjaxResult ajaxResult = handleMultiProcess("bufferStorage", new MultiProcessListener() {
|
|
151
152
153
154
155
156
157
158
159
160
|
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.bufferStorage(containerCode,location);
return ajaxResult;
}
});
return ajaxResult;
}
|
|
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
@PostMapping("/abnormalFeedback")
@ApiOperation("缓存区异常信息扫码反馈显示出来")
@ResponseBody
@ApiLogger(apiName = "缓存区异常信息扫码反馈显示出来", from="PDA")
public AjaxResult abnormalFeedback(@RequestBody Map<String,String> map) {
String containerCode = map.get("containerCode");
LambdaQueryWrapper<Container> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(Container::getCode, containerCode);
Container container = containerService.getOne(queryWrapper);
if(container == null) {
return AjaxResult.error("没有这个容器");
}
|
|
175
|
AjaxResult ajaxResult = handleMultiProcess("abnormalFeedback",new MultiProcessListener() {
|
|
176
177
178
179
180
181
182
183
184
185
|
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.abnormalFeedback(containerCode);
return ajaxResult;
}
});
return ajaxResult;
}
|
|
186
187
188
189
190
191
192
|
@PostMapping("/deleteReceiptDetails")
@ApiOperation("删除入库单明细")
@ResponseBody
@ApiLogger(apiName = "删除入库单明细", from="PDA")
public AjaxResult deleteReceiptDetails(@RequestBody Map<String,String> map) {
String containerCode = map.get("containerCode");
String boxCode = map.get("boxCode");
|
|
193
194
195
196
|
if (StringUtils.isEmpty(containerCode)&&StringUtils.isEmpty(boxCode))
{
return AjaxResult.error("容器跟箱码。必填项不能为空");
}
|
|
197
|
AjaxResult ajaxResult = handleMultiProcess("deleteReceiptDetails",new MultiProcessListener() {
|
|
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.deleteReceiptDetails(boxCode, containerCode);
return ajaxResult;
}
});
return ajaxResult;
}
@PostMapping("/supplementaryWarehousingOrder")
@ApiOperation("补充入库单明细")
@ResponseBody
@ApiLogger(apiName = "补充入库单明细", from="PDA")
public AjaxResult supplementaryWarehousingOrder(@RequestBody Map<String,String> map) {
String containerCode = map.get("containerCode");
|
|
215
216
217
218
219
220
|
String boxCode = map.get("boxCode");
String chipBarcode1 = map.get("chipBarcode1");
if (StringUtils.isEmpty(containerCode)&&StringUtils.isEmpty(boxCode)&&StringUtils.isEmpty(chipBarcode1))
{
return AjaxResult.error("容器跟箱码。必填项不能为空");
}
|
|
221
|
AjaxResult ajaxResult = handleMultiProcess("supplementaryWarehousingOrder",new MultiProcessListener() {
|
|
222
223
224
225
226
227
228
|
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.supplementaryWarehousingOrder(boxCode, containerCode,chipBarcode1);
return ajaxResult;
}
});
return ajaxResult;
|
|
229
230
231
|
}
|
|
232
|
|
|
233
|
|
|
234
235
236
237
238
239
240
|
@PostMapping("/compositePatching")
@ApiOperation("合盘补入箱码")
@ResponseBody
@ApiLogger(apiName = "合盘补入箱码", from="PDA")
public AjaxResult compositePatching(@RequestBody Map<String, String> param) {
String boxCode = param.get("boxCode");
String containerCode= param.get("containerCode");
|
|
241
242
243
244
245
246
247
248
|
AjaxResult ajaxResult = handleMultiProcess("compositePatching",new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.compositePatching(boxCode, containerCode);
return ajaxResult;
}
});
return ajaxResult;
|
|
249
250
251
|
}
|
|
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
|
@PostMapping("/queryContainer")
@ApiOperation("根据箱码查虚拟容器号")
@ResponseBody
@ApiLogger(apiName = "根据箱码查虚拟容器号", from="PDA")
public AjaxResult queryContainer(@RequestBody Map<String, String> param) {
String boxCode = param.get("boxCode");
AjaxResult ajaxResult = handleMultiProcess("queryContainer",new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.queryContainer(boxCode);
return ajaxResult;
}
});
return ajaxResult;
}
|
|
267
|
|
|
268
|
|
|
269
270
271
272
273
274
|
@PostMapping("/createShipment")
@ApiOperation("创建销售出库单")
@ResponseBody
@ApiLogger(apiName = "创建销售出库单", from="PDA")
public AjaxResult createShipment(@RequestBody PDAInventory pdaInventory) {
String platformCode = pdaInventory.getPlatformCode();
|
|
275
|
List<String> refereCodeList = pdaInventory.getReferCodeList();
|
|
276
277
278
|
if(StringUtils.isEmpty(platformCode)) {
return AjaxResult.error("没有月台号");
}
|
|
279
280
|
if (!(refereCodeList != null && refereCodeList.size() > 0)){
return AjaxResult.error("没有订单");
|
|
281
|
}
|
|
282
|
AjaxResult ajaxResult = handleMultiProcess("createShipment",new MultiProcessListener() {
|
|
283
284
285
286
|
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.createShipment(platformCode, refereCodeList);
return ajaxResult;
|
|
287
|
}
|
|
288
289
|
});
return ajaxResult;
|
|
290
|
}
|
|
291
|
|
|
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
|
@PostMapping("/getBoxInfoFromBoxCode")
@ApiOperation("根据箱码获取整箱信息")
@ResponseBody
@ApiLogger(apiName = "根据箱码获取整箱信息", from="PDA")
public AjaxResult getBoxInfoFromBoxCode(@RequestBody Map<String, String> param) {
String boxCode = param.get("boxCode");
if (StringUtils.isEmpty(boxCode)) {
return AjaxResult.error("根据箱码获取整箱信息, 没有箱号");
}
LambdaQueryWrapper<InventoryHistoryDetail> inventoryHistoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
inventoryHistoryDetailLambdaQueryWrapper.eq(InventoryHistoryDetail::getBoxCode, boxCode);
List<InventoryHistoryDetail> inventoryHistoryDetailList =
inventoryHistoryDetailService.list(inventoryHistoryDetailLambdaQueryWrapper);
if(inventoryHistoryDetailList.size() == 0) {
return AjaxResult.error("根据箱码没有找到整箱信息");
}
InventoryHistoryDetail inventoryHistoryDetail = inventoryHistoryDetailList.get(0);
String proPackagingStr = inventoryHistoryDetail.getProPackaing();
if(StringUtils.isEmpty(proPackagingStr)) {
return AjaxResult.error("没有包装字段");
}
LambdaQueryWrapper<ProPackaging> proPackagingLambdaQueryWrapper = Wrappers.lambdaQuery();
proPackagingLambdaQueryWrapper.eq(ProPackaging::getNumber, proPackagingStr);
ProPackaging proPackaging = proPackingService.getOne(proPackagingLambdaQueryWrapper);
if(proPackaging == null) {
return AjaxResult.error("没有包装信息");
}
int pieceBox = proPackaging.getPieceBox();
List<InventoryHistoryDetail> subinventoryHistoryDetailList = inventoryHistoryDetailList.subList(0, pieceBox);
return AjaxResult.success(subinventoryHistoryDetailList);
}
@PostMapping("/returnOfGoodsReceipt")
|
|
325
|
@ApiOperation("销售退货通知单入库")
|
|
326
|
@ResponseBody
|
|
327
|
@ApiLogger(apiName = "销售退货通知单入库", from="PDA")
|
|
328
329
330
331
|
public AjaxResult returnOfGoodsReceipt(@RequestBody ReturnOfGoods returnOfGoods) {
String containerCode = returnOfGoods.getContainerCode();
List<BoxInfo> listBoxInfos = returnOfGoods.getListBoxInfo();
String receiptCode = returnOfGoods.getReceiptCode();
|
|
332
|
String receiptDetailId=returnOfGoods.getReceiptDetailId();
|
|
333
334
335
336
337
338
339
340
341
342
|
String orderCode = returnOfGoods.getOrderCode();
if (StringUtils.isEmpty(containerCode)) {
return AjaxResult.error("退货通知单入库, 没有托盘号");
}
if (StringUtils.isEmpty(receiptCode)) {
return AjaxResult.error("退货通知单入库, 没有入库单号");
}
if (StringUtils.isEmpty(orderCode)) {
return AjaxResult.error("退货通知单入库, 没有订单号");
}
|
|
343
|
if (!(listBoxInfos != null && listBoxInfos.size() > 0)) {
|
|
344
345
|
return AjaxResult.error("退货通知单入库, 没有箱码信息");
}
|
|
346
|
AjaxResult ajaxResult = handleMultiProcess("returnOfGoodsReceipt",new MultiProcessListener() {
|
|
347
348
349
|
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.returnOfGoodsReceipt(containerCode,
|
|
350
|
receiptCode, listBoxInfos, orderCode,receiptDetailId);
|
|
351
352
353
354
355
356
|
return ajaxResult;
}
});
return ajaxResult;
}
|
|
357
|
|
|
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
|
@PostMapping("/qualityInspectionReceipt")
@ApiOperation("质检其他入库单重新入库")
@ResponseBody
@ApiLogger(apiName = "质检其他入库单重新入库", from="PDA")
public AjaxResult qualityInspectionReceipt(@RequestBody ReturnOfGoods returnOfGoods) {
String containerCode = returnOfGoods.getContainerCode();
List<BoxInfo> listBoxInfos = returnOfGoods.getListBoxInfo();
String receiptCode = returnOfGoods.getReceiptCode();
String receiptDetailId=returnOfGoods.getReceiptDetailId();
String orderCode = returnOfGoods.getOrderCode();
if (StringUtils.isEmpty(containerCode)) {
return AjaxResult.error("质检重新入库, 没有托盘号");
}
if (StringUtils.isEmpty(receiptCode)) {
return AjaxResult.error("质检重新入库, 没有入库单号");
}
if (StringUtils.isEmpty(orderCode)) {
return AjaxResult.error("质检重新入库, 没有订单号");
}
if (!(listBoxInfos != null && listBoxInfos.size() > 0)) {
return AjaxResult.error("质检重新入库, 没有箱码信息");
}
AjaxResult ajaxResult = handleMultiProcess("returnOfGoodsReceipt",new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.qualityInspectionReceipt(containerCode,
receiptCode, listBoxInfos, orderCode,receiptDetailId);
return ajaxResult;
}
});
return ajaxResult;
}
|
|
391
392
393
394
395
396
397
398
399
|
@PostMapping("/supplementaryWarehousing")
@ApiOperation("销售尾托补充入库")
@ResponseBody
@ApiLogger(apiName = "销售尾托补充入库", from="PDA")
public AjaxResult supplementaryWarehousing(@RequestBody ReturnOfGoods returnOfGoods) {
String containerCode = returnOfGoods.getContainerCode();
List<BoxInfo> listBoxInfos = returnOfGoods.getListBoxInfo();
String receiptCode = returnOfGoods.getReceiptCode();
|
|
400
|
String receiptDetailId=returnOfGoods.getReceiptDetailId();
|
|
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
|
String orderCode = returnOfGoods.getOrderCode();
String orderName = returnOfGoods.getOrderCode();
if (StringUtils.isEmpty(containerCode)) {
return AjaxResult.error("退货通知单入库, 没有托盘号");
}
if (StringUtils.isEmpty(receiptCode)) {
return AjaxResult.error("退货通知单入库, 没有入库单号");
}
if (StringUtils.isEmpty(orderCode)) {
return AjaxResult.error("退货通知单入库, 没有订单号");
}
if (StringUtils.isEmpty(orderName)) {
return AjaxResult.error("退货通知单入库, 没有订单名称");
}
if (!(listBoxInfos != null && listBoxInfos.size() > 0)) {
return AjaxResult.error("退货通知单入库, 没有箱码信息");
}
|
|
418
|
AjaxResult ajaxResult = handleMultiProcess("supplementaryWarehousing",new MultiProcessListener() {
|
|
419
420
421
|
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.supplementaryWarehousing(containerCode,
|
|
422
|
receiptCode, listBoxInfos, orderCode, orderName,receiptDetailId);
|
|
423
424
425
426
427
428
429
430
431
432
|
return ajaxResult;
}
});
return ajaxResult;
}
|
|
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
|
@PostMapping("/containerQuery")
@ApiOperation("查询同型号的托盘")
@ResponseBody
@ApiLogger(apiName = "查询同型号的托盘", from="PDA")
public AjaxResult containerQuery(@RequestBody Map<String,String> map) {
String materialCode = map.get("materialCode");
String level = map.get("level");
String color = map.get("color");
String proPackaging = map.get("proPackaging");
String productSchedule = map.get("productSchedule");
String batch = map.get("batch");
String boxQty =map.get("boxQty");
if (StringUtils.isEmpty(materialCode)||StringUtils.isEmpty(materialCode)&&
StringUtils.isEmpty(level)||
StringUtils.isEmpty(color)||
StringUtils.isEmpty(proPackaging)||
StringUtils.isEmpty(productSchedule)||
StringUtils.isEmpty(batch)||
StringUtils.isEmpty(boxQty))
{
return AjaxResult.error("各项参数不能为空");
}
AjaxResult ajaxResult = handleMultiProcess("containerQuery",new MultiProcessListener() {
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.containerQuery(materialCode,
level, color, proPackaging, productSchedule,batch,Integer.valueOf(boxQty));
return ajaxResult;
}
});
return ajaxResult;
}
|
|
470
471
472
473
|
@PostMapping("/shipmentContainer")
@ApiOperation("整托出库")
@ResponseBody
@ApiLogger(apiName = "整托出库", from="PDA")
|
|
474
475
|
public AjaxResult shipmentContainer(@RequestBody BoxDomain boxDomain) {
String containerCode = boxDomain.getContainerCode();
|
|
476
|
if(StringUtils.isEmpty(containerCode)) {
|
|
477
478
|
return AjaxResult.error("整托出库, 托盘号为空");
}
|
|
479
|
AjaxResult ajaxResult = handleMultiProcess("shipmentContainer",new MultiProcessListener() {
|
|
480
481
482
483
484
485
486
487
|
@Override
public AjaxResult doProcess() {
AjaxResult ajaxResult = pdaService.shipmentContainer(containerCode);
return ajaxResult;
}
});
return ajaxResult;
}
|
|
488
489
490
491
492
|
@PostMapping("/shipmentBox")
@ApiOperation("整箱出库")
@ResponseBody
@ApiLogger(apiName = "整箱出库", from="PDA")
|
|
493
|
public AjaxResult shipmentBox(@RequestBody BoxDomain boxDomain) {
|
|
494
495
|
String containerCode = boxDomain.getContainerCode();
String boxCode = boxDomain.getBoxCode();
|
|
496
|
if(StringUtils.isEmpty(containerCode)) {
|
|
497
498
|
return AjaxResult.error("整箱出库, 托盘号为空");
}
|
|
499
|
if(StringUtils.isEmpty(boxCode)) {
|
|
500
501
|
return AjaxResult.error("整箱出库, 箱码为空");
}
|
|
502
|
AjaxResult ajaxResult = handleMultiProcess("shipmentBox", new MultiProcessListener() {
|
|
503
504
|
@Override
public AjaxResult doProcess() {
|
|
505
|
AjaxResult ajaxResult = pdaService.shipmentBox(containerCode, boxCode);
|
|
506
507
508
509
510
|
return ajaxResult;
}
});
return ajaxResult;
}
|
|
511
|
}
|