|
1
2
3
4
5
|
package com.huaheng.mobile.receipt;
import com.alibaba.fastjson.JSONException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
6
|
import com.huaheng.common.constant.QuantityConstant;
|
|
7
|
import com.huaheng.api.general.domain.ReceiptDomain;
|
|
8
9
10
|
import com.huaheng.common.exception.service.ServiceException;
import com.huaheng.common.utils.StringUtils;
import com.huaheng.common.utils.security.ShiroUtils;
|
|
11
|
import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
|
|
12
13
14
15
16
17
18
19
20
21
|
import com.huaheng.framework.aspectj.lang.annotation.Log;
import com.huaheng.framework.aspectj.lang.constant.BusinessType;
import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.pc.config.company.service.CompanyService;
import com.huaheng.pc.config.container.domain.Container;
import com.huaheng.pc.config.container.service.ContainerService;
import com.huaheng.pc.config.location.domain.Location;
import com.huaheng.pc.config.location.service.LocationService;
import com.huaheng.pc.config.material.domain.Material;
import com.huaheng.pc.config.material.service.MaterialService;
|
|
22
23
|
import com.huaheng.pc.config.materialType.domain.MaterialType;
import com.huaheng.pc.config.materialType.service.MaterialTypeService;
|
|
24
25
|
import com.huaheng.pc.config.receiptType.domain.ReceiptType;
import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
|
|
26
27
|
import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
|
易文鹏
authored
|
28
29
|
import com.huaheng.pc.monitor.apilog.domain.ApiLog;
import com.huaheng.pc.monitor.apilog.service.IApiLogService;
|
|
30
|
import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
|
|
31
32
33
34
35
36
37
|
import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerView;
import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
|
|
38
|
import com.huaheng.pc.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
|
|
39
|
import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
|
|
40
41
|
import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
|
|
42
43
|
import com.huaheng.pc.system.dict.domain.DictData;
import com.huaheng.pc.system.dict.service.IDictDataService;
|
|
44
45
46
47
48
49
50
51
52
53
54
55
|
import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
|
|
56
57
|
import java.text.SimpleDateFormat;
import java.util.*;
|
|
58
|
import java.util.stream.Collectors;
|
|
59
60
61
62
63
64
65
66
|
/**
* @author Enzo Cotter
* @date 2019/12/15
*/
@CrossOrigin
@RestController
@RequestMapping("/mobile/receipt/batch")
|
|
67
|
@Api(tags = {"移动端收货"}, value = "移动端收货MobileBatchReceiptController")
|
|
68
69
70
|
public class MobileBatchReceiptController {
@Resource
|
|
71
72
|
private ShipmentContainerHeaderService shipmentContainerHeaderService;
@Resource
|
|
73
74
75
76
77
78
79
80
81
82
83
84
|
private ReceiptContainerHeaderService receiptContainerHeaderService;
@Resource
private ReceiptHeaderService receiptHeaderService;
@Resource
private ReceiptDetailService receiptDetailService;
@Resource
private ReceiptContainerDetailService receiptContainerDetailService;
@Resource
private ContainerService containerService;
@Resource
private MaterialService materialService;
@Resource
|
|
85
86
|
private MaterialTypeService materialTypeService;
@Resource
|
|
87
88
89
90
91
92
93
|
private LocationService locationService;
@Resource
private TaskHeaderService taskHeaderService;
@Resource
private TaskDetailService taskDetailService;
@Resource
private CompanyService companyService;
|
|
94
95
|
@Resource
private IDictDataService dictDataService;
|
|
96
97
|
@Resource
private ReceiptTypeService receiptTypeService;
|
|
98
99
|
@Resource
private ReceiptHeaderMapper receiptHeaderMapper;
|
|
100
|
|
|
101
102
103
|
@Resource
private InventoryHeaderService inventoryHeaderService;
|
|
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
@PostMapping("/scanContainer")
@ApiOperation("移动端入库扫描容器")
@Log(title = "移动端入库扫描容器", action = BusinessType.OTHER)
public AjaxResult scanContainer(@RequestBody @ApiParam(value = "容器号") Map<String, String> param) throws Exception {
if (param.get("code") == null || param.get("code").trim().length() < 1) {
throw new JSONException("容器号(code)不能为空");
}
ReceiptContainerView receiptContainerView = new ReceiptContainerView();
receiptContainerView.setReceiptContainerCode(param.get("code"));
receiptContainerView.setTaskType((short) 100);
AjaxResult result = receiptContainerHeaderService.checkContainer(receiptContainerView);
LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
containerLambdaQueryWrapper.eq(Container::getCode, param.get("code"));
Container container = containerService.getOne(containerLambdaQueryWrapper);
if (container == null) {
return AjaxResult.error("托盘编码错误");
}
|
|
123
|
if (!QuantityConstant.STATUS_CONTAINER_EMPTY.equals(container.getStatus())) {
|
|
124
125
|
return AjaxResult.error("托盘状态不为空");
}
|
|
126
|
if (!"".equals(container.getLocationCode())) {
|
|
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
return AjaxResult.error("");
}
return result;
}
@PostMapping("/save")
@ApiOperation("移动端收货保存")
@Log(title = "移动端收货保存", action = BusinessType.OTHER)
public AjaxResult save(@RequestBody @ApiParam(value = "收货单") List<ReceiptContainerView> record) throws Exception {
AjaxResult result = receiptContainerHeaderService.batchSave(record);
return result;
}
@PostMapping("/getMaterial")
@ApiOperation("移动端获取物料信息")
@Log(title = "移动端获取物料信息", action = BusinessType.OTHER)
public AjaxResult getMaterial(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
if (param.get("code") == null || param.get("code").trim().length() < 1) {
throw new JSONException("容器号(code)不能为空");
}
|
|
147
|
Material material = materialService.getMaterialByCode(param.get("code"));
|
|
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
if (material == null) {
return AjaxResult.error("没有该物料");
}
MaterialInfo materialInfo = new MaterialInfo();
materialInfo.setMaterialCode(material.getCode());
materialInfo.setMaterialName(material.getName());
materialInfo.setType(material.getSpec());
return AjaxResult.success(materialInfo);
}
@PostMapping("/getLatestMaterial")
@ApiOperation("移动端获取物料信息")
@Log(title = "移动端获取物料信息", action = BusinessType.OTHER)
public AjaxResult getLatestMaterial(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
List<Material> materials = materialService.findLatest();
if (materials == null) {
return AjaxResult.error("没有找到物料");
}
return AjaxResult.success(materials);
}
|
|
171
|
@PostMapping("/getLatestReceipt")
|
|
172
173
174
|
@ApiOperation("移动端获取入库单")
@Log(title = "移动端获取入库单", action = BusinessType.OTHER)
public AjaxResult getLatestReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
|
|
175
|
List<ReceiptHeader> receiptHeaders = receiptHeaderService.getLatestReceipt(ShiroUtils.getWarehouseCode(), param.get("companyCode"));
|
|
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
|
if (receiptHeaders == null) {
return AjaxResult.error("没有找到入库单");
}
return AjaxResult.success(receiptHeaders);
}
@PostMapping("/checkLocation")
@ApiOperation("移动端验证库位")
@Log(title = "移动端验证库位", action = BusinessType.OTHER)
public AjaxResult checkLocation(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
if (param.get("code") == null || param.get("code").trim().length() < 1) {
throw new JSONException("容器号(code)不能为空");
}
boolean result = locationService.checkLocation(param.get("code"));
if (!result) {
return AjaxResult.error("没有该库位");
}
return AjaxResult.success(result);
}
@PostMapping("/getFreeLocation")
@ApiOperation("移动端获得空闲库位")
@Log(title = "移动端获得空闲库位", action = BusinessType.OTHER)
public AjaxResult getFreeLocation(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
if (param.get("materialCode") == null || param.get("materialCode").trim().length() < 1) {
throw new JSONException("materialCode不能为空");
}
if (param.get("batch") == null || param.get("batch").trim().length() < 1) {
throw new JSONException("batch不能为空");
}
String materialCode = param.get("materialCode");
String batch = param.get("batch");
boolean result = locationService.getFreeLocation(materialCode, batch);
if (!result) {
return AjaxResult.error("没有空闲的分区库位");
}
return AjaxResult.success(result);
}
@PostMapping("/getContainerCode")
@ApiOperation("移动端验证库位")
@Log(title = "移动端验证库位", action = BusinessType.OTHER)
public AjaxResult getContainerCode(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
if (param.get("code") == null || param.get("code").trim().length() < 1) {
throw new JSONException("容器号(code)不能为空");
}
LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(Location::getCode, param.get("code"))
.eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode())
.eq(Location::getDeleted, false);
Location location = locationService.getOne(queryWrapper);
if (location == null) {
return AjaxResult.error("没有该库位");
}
return AjaxResult.success("成功", location.getContainerCode());
}
@PostMapping("/quickReceipt")
@ApiOperation("移动端收货保存")
@Log(title = "移动端收货保存", action = BusinessType.OTHER)
@Transactional(rollbackFor = Exception.class)
|
|
240
241
|
public AjaxResult quickReceipt(@RequestBody @ApiParam(value = "收货单") List<ReceiptBill> receiptBills) throws Exception {
if (receiptBills == null || receiptBills.size() <= 0) {
|
|
242
243
244
245
246
247
248
249
250
251
|
throw new JSONException("没有收货信息");
}
String containerCode = receiptBills.get(0).receiptContainerCode;
String locationCode = receiptBills.get(0).locationCode;
String companyCode = receiptBills.get(0).getCompanyCode();
String receiptDetailId = receiptBills.get(0).getReceiptDetailId();
LambdaQueryWrapper<Container> containerQueryWrapper = Wrappers.lambdaQuery();
containerQueryWrapper.eq(Container::getCode, containerCode);
Container container = containerService.getOne(containerQueryWrapper);
|
|
252
|
if (container == null) {
|
|
253
254
|
throw new JSONException("不存在这个托盘");
}
|
|
255
256
|
//pda入库增加托盘任务校验
|
|
257
|
List<TaskHeader> unfinishTask = taskHeaderService.getUnCompleteTaskList().stream().filter((t) -> {
|
|
258
259
260
|
return t.getContainerCode().equals(container.getCode());
}).collect(Collectors.toList());
|
|
261
|
if (unfinishTask.size() > 0) {
|
|
262
263
264
265
266
267
|
TaskHeader t = unfinishTask.get(0);
String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(t.getCreated());
throw new ServiceException(container.getCode() + "托盘已经有未完成的任务,请不要重复下发\n该托盘任务创建于:" + time);
}
|
|
268
|
if (locationCode != null && locationCode.equals(container.getLocationCode())) {
|
|
269
270
271
272
273
|
/* 查询未完成的入库任务*/
LambdaQueryWrapper<TaskHeader> taskQueryWrapper = Wrappers.lambdaQuery();
taskQueryWrapper.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
.in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT,
QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)
|
|
274
|
.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
|
|
275
276
|
.eq(TaskHeader::getContainerCode, containerCode);
TaskHeader taskHeader = taskHeaderService.getOne(taskQueryWrapper);
|
|
277
|
if (taskHeader == null) {
|
|
278
279
280
281
282
|
throw new JSONException("没有找到托盘对应的任务");
}
LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
receiptDetailQueryWrapper.eq(ReceiptDetail::getId, receiptDetailId);
ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailQueryWrapper);
|
|
283
|
if (receiptDetail == null) {
|
|
284
285
286
287
288
289
|
throw new JSONException("没有找到入库单详情");
}
LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
receiptHeaderQueryWrapper.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptHeaderQueryWrapper);
|
|
290
|
if (receiptHeader == null) {
|
|
291
292
293
|
throw new JSONException("没有找到入库单");
}
|
|
294
295
296
297
|
LambdaQueryWrapper<ReceiptContainerHeader> lambda = Wrappers.lambdaQuery();
lambda.eq(ReceiptContainerHeader::getContainerCode, containerCode)
.lt(ReceiptContainerHeader::getStatus, QuantityConstant.RECEIPT_CONTAINER_FINISHED);
List<ReceiptContainerHeader> list = receiptContainerHeaderService.list(lambda);
|
|
298
|
if (list.size() >= 1) {
|
|
299
300
301
302
303
304
305
|
throw new ServiceException("容器已经生成任务,不能放物料了!");
}
ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
//如果不存在记录则新建记录
receiptContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
receiptContainerHeader.setCompanyCode(companyCode);
receiptContainerHeader.setContainerCode(containerCode);
|
|
306
|
Container container2 = containerService.getContainerByCode(containerCode);
|
|
307
|
receiptContainerHeader.setContainerType(container2.getContainerType());
|
|
308
|
receiptContainerHeader.setTaskType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
|
|
309
310
|
receiptContainerHeader.setFromLocation(container2.getLocationCode());
receiptContainerHeader.setToLocation(locationCode);
|
|
311
312
|
receiptContainerHeader.setCreatedBy(ShiroUtils.getName());
receiptContainerHeader.setLastUpdatedBy(ShiroUtils.getName());
|
|
313
|
receiptContainerHeader.setStatus(10);
|
|
314
|
|
|
315
|
if (!receiptContainerHeaderService.save(receiptContainerHeader)) {
|
|
316
317
318
319
320
321
322
|
throw new ServiceException("入库组盘头表保存失败");
}
receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RECEIVING);
receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RECEIVING);
receiptHeaderService.update(receiptHeader, receiptHeaderQueryWrapper);
|
|
323
324
|
taskHeader.setAllocationHeadId(receiptContainerHeader.getId());
taskHeaderService.updateById(taskHeader);
|
|
325
|
for (ReceiptBill receiptBill : receiptBills) {
|
|
326
|
|
|
327
328
329
|
LambdaQueryWrapper<ReceiptDetail> receiptDetail2QueryWrapper = Wrappers.lambdaQuery();
receiptDetail2QueryWrapper.eq(ReceiptDetail::getId, receiptBill.getReceiptDetailId());
ReceiptDetail receiptDetail2 = receiptDetailService.getOne(receiptDetail2QueryWrapper);
|
|
330
|
if (receiptDetail2 == null) {
|
|
331
332
333
|
throw new JSONException("没有找到入库单详情");
}
|
|
334
335
|
BigDecimal openQty = receiptDetail2.getTaskQty();
BigDecimal totalQty = receiptDetail2.getQty();
|
|
336
|
BigDecimal qty = openQty.add(receiptBill.getQty());
|
|
337
|
if (totalQty.subtract(qty).compareTo(BigDecimal.ZERO) < 0) {
|
|
338
339
340
|
throw new Exception("配盘数量大于表单数量");
}
|
|
341
|
receiptDetail2.setTaskQty(qty);
|
|
342
|
receiptDetailService.update(receiptDetail2, receiptDetail2QueryWrapper);
|
|
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
|
ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
receiptContainerDetail.setReceiptContainerId(receiptContainerHeader.getId());
receiptContainerDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
receiptContainerDetail.setReceiptId(receiptHeader.getId());
receiptContainerDetail.setReceiptDetailId(receiptDetail2.getId());
receiptContainerDetail.setReceiptCode(receiptHeader.getCode());
receiptContainerDetail.setReceiptType(receiptHeader.getReceiptType());
receiptContainerDetail.setLocationCode(locationCode);
receiptContainerDetail.setContainerCode(containerCode);
receiptContainerDetail.setContainerType(container.getContainerType());
receiptContainerDetail.setCompanyCode(companyCode);
LambdaQueryWrapper<Material> materialQueryWrapper = Wrappers.lambdaQuery();
materialQueryWrapper.eq(Material::getCode, receiptBill.getMaterialCode())
.eq(Material::getDeleted, 0);
Material material = materialService.getOne(materialQueryWrapper);
receiptContainerDetail.setMaterialCode(material.getCode());
receiptContainerDetail.setMaterialName(material.getName());
receiptContainerDetail.setMaterialSpec(material.getSpec());
receiptContainerDetail.setMaterialUnit(material.getUnit());
receiptContainerDetail.setQty(receiptBill.getQty());
receiptContainerDetail.setStatus(10);
|
|
367
368
|
receiptContainerDetail.setCreatedBy(ShiroUtils.getName());
receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getName());
|
|
369
|
receiptContainerDetailService.save(receiptContainerDetail);
|
|
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
|
TaskDetail taskDetail = new TaskDetail();
taskDetail.setTaskId(taskHeader.getId());
taskDetail.setContainerCode(containerCode);
taskDetail.setTaskType(taskHeader.getTaskType());
taskDetail.setInternalTaskType(taskHeader.getInternalTaskType());
taskDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
taskDetail.setCompanyCode(companyCode);
taskDetail.setBillCode(receiptHeader.getCode());
taskDetail.setBillDetailId(Integer.parseInt(receiptBill.getReceiptDetailId()));
taskDetail.setMaterialCode(receiptBill.getMaterialCode());
taskDetail.setMaterialName(receiptBill.getMaterialName());
taskDetail.setQty(receiptBill.getQty());
taskDetail.setFromLocation(taskHeader.getFromLocation());
taskDetail.setToLocation(taskHeader.getToLocation());
taskDetail.setAllocationId(receiptContainerDetail.getId());
taskDetail.setStatus(taskHeader.getStatus());
taskDetail.setBatch(receiptBill.getBatch());
taskDetail.setCompanyCode(taskHeader.getCompanyCode());
taskDetailService.save(taskDetail);
|
|
390
391
392
|
}
} else {
|
|
393
|
ReceiptContainerView record = new ReceiptContainerView();
|
|
394
395
|
record.setReceiptContainerCode(containerCode);
record.setLocationCode(locationCode);
|
|
396
|
record.setTaskType((short) 100);
|
|
397
398
|
record.setCompanyCode(receiptBills.get(0).getCompanyCode());
receiptContainerHeaderService.checkContainer(record);
|
|
399
|
if (locationCode != null) {
|
|
400
401
|
receiptContainerHeaderService.mobileCheckLocationCode(record);
}
|
|
402
403
404
|
int receiptHeaderId = receiptHeaderService.createTodayHeader(companyCode);
ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptHeaderId);
List<Integer> receiptDetailIds = receiptDetailService.insertTodayReceiptDetail(receiptHeaderId, receiptBills, true, companyCode);
|
|
405
|
if (receiptDetailIds != null && receiptDetailIds.size() > 0) {
|
|
406
|
int containerHeaderId = receiptContainerHeaderService.insertTodayReceiptContainerHeader(receiptBills.get(0), receiptHeader.getCode());
|
|
407
|
if (containerHeaderId > 0) {
|
|
408
|
List<Integer> receiptContainerDetailIds = receiptContainerDetailService.insertTodayReceiptcContainerDetail(containerHeaderId, receiptHeaderId, receiptDetailIds, receiptBills);
|
|
409
|
if (receiptContainerDetailIds != null && receiptContainerDetailIds.size() > 0) {
|
|
410
411
412
413
414
415
416
417
418
|
} else {
return AjaxResult.error("入库组盘失败");
}
} else {
return AjaxResult.error("插入入库容器表单头失败");
}
} else {
return AjaxResult.error("插入入库明细表单失败");
|
|
419
|
}
|
|
420
|
}
|
|
421
|
|
|
422
423
424
|
return AjaxResult.success("收货成功");
}
|
|
425
426
427
428
|
@PostMapping("/listReceipt")
@ApiOperation("移动端根据表单整盘入库")
@Log(title = "移动端根据表单整盘入库", action = BusinessType.OTHER)
@Transactional(rollbackFor = Exception.class)
|
|
429
430
|
public AjaxResult listReceipt(@RequestBody @ApiParam(value = "收货单") List<ReceiptBill> receiptBills) throws Exception {
if (receiptBills == null || receiptBills.size() <= 0) {
|
|
431
432
433
434
435
436
437
438
439
440
|
throw new JSONException("没有收货信息");
}
String containerCode = receiptBills.get(0).receiptContainerCode;
String companyCode = receiptBills.get(0).getCompanyCode();
String receiptDetailId = receiptBills.get(0).getReceiptDetailId();
String locationCode = receiptBills.get(0).locationCode;
LambdaQueryWrapper<Container> containerQueryWrapper = Wrappers.lambdaQuery();
containerQueryWrapper.eq(Container::getCode, containerCode);
Container container = containerService.getOne(containerQueryWrapper);
|
|
441
442
|
if (container == null) {
if (locationCode != null) {
|
|
443
444
445
|
LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
locationLambdaQueryWrapper.eq(Location::getCode, locationCode);
Location location = locationService.getOne(locationLambdaQueryWrapper);
|
|
446
|
if (location != null && location.getLocationType().equals("PK")) {
|
|
447
|
containerCode = location.getContainerCode();
|
|
448
|
if (StringUtils.isEmpty(containerCode)) {
|
|
449
450
|
LambdaQueryWrapper<Container> containerQueryWrapper2 = Wrappers.lambdaQuery();
containerQueryWrapper2.eq(Container::getEnable, true)
|
|
451
452
|
.eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_EMPTY)
.eq(Container::getContainerType, "DM");
|
|
453
454
455
456
457
458
459
460
461
|
List<Container> containerList = containerService.list(containerQueryWrapper2);
containerCode = containerList.get(0).getCode();
}
} else {
return AjaxResult.error("不存在这个托盘");
}
} else {
return AjaxResult.error("不存在这个托盘");
}
|
|
462
463
|
}
|
|
464
|
if (locationCode != null) {
|
|
465
466
467
|
LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
locationLambdaQueryWrapper.eq(Location::getCode, locationCode);
Location location = locationService.getOne(locationLambdaQueryWrapper);
|
|
468
|
if (location == null) {
|
|
469
470
471
|
throw new JSONException("不存在这个托盘");
}
|
|
472
|
if (!QuantityConstant.STATUS_LOCATION_EMPTY.equals(location.getStatus())) {
|
|
473
474
475
476
477
478
479
|
throw new JSONException("库位状态不是空闲");
}
}
LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
receiptDetailQueryWrapper.eq(ReceiptDetail::getId, receiptDetailId);
ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailQueryWrapper);
|
|
480
|
if (receiptDetail == null) {
|
|
481
482
483
484
485
486
|
throw new JSONException("没有找到入库单详情");
}
LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
receiptHeaderQueryWrapper.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptHeaderQueryWrapper);
|
|
487
|
if (receiptHeader == null) {
|
|
488
489
490
491
|
throw new JSONException("没有找到入库单");
}
List<ReceiptContainerView> receiptContainerViewList = new ArrayList<>();
|
|
492
493
|
for (ReceiptBill receiptBill : receiptBills) {
if (receiptBill.getQty().compareTo(BigDecimal.ZERO) == 0) {
|
|
494
495
|
continue;
}
|
|
496
497
498
|
ReceiptContainerView receiptContainerView = new ReceiptContainerView();
receiptContainerView.setLocationCode(receiptBill.getLocationCode());
receiptContainerView.setCompanyCode(receiptBill.getCompanyCode());
|
|
499
|
receiptContainerView.setReceiptContainerCode(containerCode);
|
|
500
501
|
receiptContainerView.setReceiptDetailId(Integer.parseInt(receiptBill.getReceiptDetailId()));
receiptContainerView.setQty(receiptBill.getQty());
|
|
502
|
receiptContainerView.setTaskType((short) 100);
|
|
503
504
505
506
507
508
509
|
receiptContainerViewList.add(receiptContainerView);
}
receiptContainerHeaderService.batchSave(receiptContainerViewList);
AjaxResult retResult = taskHeaderService.createQuickTask(containerCode);
return retResult;
}
|
|
510
511
512
|
@PostMapping("/findReceipt")
@ApiOperation("移动端查询入库单")
@Log(title = "移动端查询入库单", action = BusinessType.OTHER)
|
|
513
|
public AjaxResult findReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
514
515
|
String receiptCode = param.get("receiptCode");
String companyCode = param.get("companyCode");
|
|
516
|
if (StringUtils.isNull(receiptCode)) {
|
|
517
|
return AjaxResult.error("上游系统关联单号为空");
|
|
518
|
} else if (StringUtils.isNull(companyCode)) {
|
|
519
520
521
522
|
return AjaxResult.error("公司编码为空");
}
/* 查询入库单,如果数据库中不存在,则调用ERP接口拉取单据,成功后再次查询返回结果*/
|
|
523
|
LambdaQueryWrapper<ReceiptHeader> receiptLambdaQueryWrapper = Wrappers.lambdaQuery();
|
|
524
525
526
|
receiptLambdaQueryWrapper.eq(ReceiptHeader::getCode, receiptCode)
.eq(ReceiptHeader::getCompanyCode, companyCode);
ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptLambdaQueryWrapper);
|
|
527
|
if (receiptHeader == null) {
|
|
528
529
|
return AjaxResult.error("没有找到入库单");
}
|
|
530
|
ReceiptDomain receipt = new ReceiptDomain();
|
|
531
532
533
534
535
536
537
538
539
|
receipt.setReceiptHeader(receiptHeader);
LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
receiptDetailQueryWrapper.eq(ReceiptDetail::getReceiptId, receiptHeader.getId());
List<ReceiptDetail> receiptDetailList = receiptDetailService.list(receiptDetailQueryWrapper);
receipt.setReceiptDetails(receiptDetailList);
return AjaxResult.success(receipt);
}
|
|
540
|
|
|
541
|
@PostMapping("/callBox")
|
易文鹏
authored
|
542
543
544
|
@ApiOperation("PDA呼叫料盒")
@ApiLogger(apiName = "PDA呼叫料盒", from = "PDA")
@Log(title = "PDA呼叫料盒", action = BusinessType.OTHER)
|
|
545
|
public AjaxResult callBox(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
546
547
548
549
|
String containerCode = param.get("containerCode");
String destinationLocation = param.get("destinationLocation");
int type = Integer.parseInt(param.get("type"));
String companyCode = param.get("companyCode");
|
|
550
|
|
|
551
552
553
|
if (StringUtils.isEmpty(destinationLocation) && StringUtils.isEmpty(containerCode)) {
return AjaxResult.error("库位和容器不能都为空");
}
|
易文鹏
authored
|
554
|
return taskHeaderService.callBox(containerCode, destinationLocation, type, companyCode);
|
|
555
|
}
|
|
556
|
|
|
557
|
|
|
558
559
560
|
@PostMapping("/searchReceipt")
@ApiOperation("移动端查询入库单")
@Log(title = "移动端查询入库单", action = BusinessType.OTHER)
|
|
561
|
public AjaxResult searchReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
562
563
564
565
566
567
568
569
570
571
572
|
String companyCode = param.get("companyCode");
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String now = df.format(new Date());
Calendar c = Calendar.getInstance();
c.setTime(new Date());
c.add(Calendar.DATE, -7);
Date first = c.getTime();
String start = df.format(first);//前一天
LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
receiptHeaderQueryWrapper.eq(ReceiptHeader::getCompanyCode, companyCode)
.eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
|
|
573
|
.ne(ReceiptHeader::getReceiptType, "PPI")
|
|
574
|
.le(ReceiptHeader::getCreated, now)
|
|
575
576
|
.gt(ReceiptHeader::getCreated, start)
.orderByDesc(ReceiptHeader::getCreated);
|
|
577
578
579
580
|
List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderQueryWrapper);
return AjaxResult.success(receiptHeaderList);
}
|
|
581
582
583
|
@PostMapping("/searchReceiptInCondition")
@ApiOperation("移动端查询入库单")
@Log(title = "移动端查询入库单", action = BusinessType.OTHER)
|
|
584
|
public AjaxResult searchReceiptInCondition(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
|
String companyCode = param.get("companyCode");
String code = param.get("code");
String receiptType = param.get("receiptType");
String lastStatus = param.get("lastStatus");
String startTime = param.get("startTime");
String endTime = param.get("endTime");
LambdaQueryWrapper<ReceiptHeader> receiptQueryWrapper = Wrappers.lambdaQuery();
receiptQueryWrapper.eq(ReceiptHeader::getCompanyCode, companyCode)
.eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
.like(StringUtils.isNotEmpty(code), ReceiptHeader::getCode, code)
.eq(StringUtils.isNotEmpty(receiptType), ReceiptHeader::getReceiptType, receiptType)
.eq(StringUtils.isNotEmpty(lastStatus), ReceiptHeader::getLastStatus, lastStatus)
.gt(StringUtils.isNotEmpty(startTime), ReceiptHeader::getCreated, startTime)
.le(StringUtils.isNotEmpty(endTime), ReceiptHeader::getCreated, endTime)
.orderByDesc(ReceiptHeader::getCreated);
|
|
600
|
if (lastStatus.equals("200")) {
|
|
601
602
603
604
605
606
607
608
609
610
|
receiptQueryWrapper = Wrappers.lambdaQuery();
receiptQueryWrapper.lt(ReceiptHeader::getLastStatus, 900);
receiptQueryWrapper.eq(ReceiptHeader::getCompanyCode, companyCode)
.eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
.like(StringUtils.isNotEmpty(code), ReceiptHeader::getCode, code)
.eq(StringUtils.isNotEmpty(receiptType), ReceiptHeader::getReceiptType, receiptType)
.gt(StringUtils.isNotEmpty(startTime), ReceiptHeader::getCreated, startTime)
.le(StringUtils.isNotEmpty(endTime), ReceiptHeader::getCreated, endTime)
.orderByDesc(ReceiptHeader::getCreated);
}
|
|
611
|
List<ReceiptHeader> receiptDetailList = receiptHeaderService.list(receiptQueryWrapper);
|
|
612
613
614
|
return AjaxResult.success(receiptDetailList);
}
|
|
615
616
617
|
@PostMapping("/getDictListData")
@ApiOperation("移动端查询字典信息")
@Log(title = "移动端查询字典信息", action = BusinessType.OTHER)
|
|
618
|
public AjaxResult getDictListData(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
619
620
621
622
623
|
String dictType = param.get("dictType");
List<DictData> dictDataList = dictDataService.selectDictDataByType(dictType);
return AjaxResult.success(dictDataList);
}
|
|
624
625
626
|
@PostMapping("/getReceiptType")
@ApiOperation("移动端查询入库类型")
@Log(title = "移动端查询字典信息", action = BusinessType.OTHER)
|
|
627
|
public AjaxResult getReceiptType(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
628
|
String companyCode = param.get("companyCode");
|
|
629
|
LambdaQueryWrapper<ReceiptType> receiptTypeLambda = Wrappers.lambdaQuery();
|
|
630
631
|
receiptTypeLambda.eq(ReceiptType::getCompanyCode, companyCode);
receiptTypeLambda.eq(ReceiptType::getWarehouseCode, ShiroUtils.getWarehouseCode());
|
|
632
633
634
|
List<ReceiptType> receiptType = receiptTypeService.list(receiptTypeLambda);
return AjaxResult.success(receiptType);
}
|
|
635
|
|
|
636
637
638
|
@PostMapping("/createReceiptCode")
@ApiOperation("移动端创建入库单号")
@Log(title = "移动端创建入库单号", action = BusinessType.OTHER)
|
|
639
|
public AjaxResult createReceiptCode(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
640
|
String companyCode = param.get("companyCode");
|
|
641
|
String receiptType = param.get("receiptType");
|
|
642
643
644
645
646
|
String code = null;
Date now = new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
String maxCode = receiptHeaderMapper.createCode(receiptType);
//如果指定类型的最后的code存在,并且日期一致。那么 code = 入库单类型 + 年月日 + (排序号 + 1)
|
|
647
648
649
|
if (maxCode != null && maxCode.substring(maxCode.length() - 13, maxCode.length() - 5).equals(df.format(now))) {
Integer Count = Integer.valueOf(maxCode.substring(maxCode.length() - 5, maxCode.length()));
code = receiptType + df.format(now) + String.format("%05d", Count + 1);
|
|
650
|
} else {
|
|
651
|
code = receiptType + df.format(now) + "00001";
|
|
652
|
}
|
|
653
|
return AjaxResult.success().setData(code);
|
|
654
|
}
|
|
655
|
|
|
656
657
658
659
|
@PostMapping("/createReceipt")
@ApiOperation("移动端创建入库单")
@Log(title = "移动端创建入库单", action = BusinessType.OTHER)
@Transactional(rollbackFor = Exception.class)
|
|
660
|
public AjaxResult createReceipt(@RequestBody @ApiParam(value = "物料号") List<ReceiptBill> receiptBills) {
|
|
661
662
|
String companyCode = receiptBills.get(0).getCompanyCode();
String receiptCode = receiptBills.get(0).getReceiptCode();
|
|
663
|
String receiptType = receiptBills.get(0).getReceiptType();
|
|
664
665
666
667
668
669
|
ReceiptHeader receiptHeader = new ReceiptHeader();
receiptHeader.setId(null);
receiptHeader.setCode(receiptCode);
receiptHeader.setReceiptType(receiptType);
receiptHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
receiptHeader.setCreated(null);
|
|
670
|
receiptHeader.setCreatedBy(ShiroUtils.getName());
|
|
671
|
receiptHeader.setLastUpdated(null);
|
|
672
|
receiptHeader.setLastUpdatedBy(ShiroUtils.getName());
|
|
673
674
675
676
677
678
|
receiptHeader.setFirstStatus(200);
receiptHeader.setLastStatus(200);
receiptHeader.setCompanyCode(companyCode);
receiptHeaderService.save(receiptHeader);
List<Integer> receiptDetailIds = receiptDetailService.insertTodayReceiptDetail(receiptHeader.getId(), receiptBills, false, companyCode);
receiptDetailService.updateReceiptHeader(receiptHeader);
|
|
679
|
if (receiptDetailIds != null && receiptDetailIds.size() > 0) {
|
|
680
681
682
683
|
return AjaxResult.success("创建入库单成功");
}
return AjaxResult.error("创建入库单失败");
}
|
|
684
|
|
|
685
686
687
688
689
690
691
|
@PostMapping("/findMaterial")
@ApiOperation("移动端查询物料信息")
@Log(title = "移动端查询物料信息", action = BusinessType.OTHER)
public AjaxResult findMaterial(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
materialLambdaQueryWrapper.eq(Material::getDeleted, false)
.orderByDesc(Material::getCreated);
|
|
692
|
List<Material> materialList = materialService.list(materialLambdaQueryWrapper);
|
|
693
694
|
return AjaxResult.success(materialList);
}
|
|
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
|
@PostMapping("/addMaterial")
@ApiOperation("移动端增加物料信息")
@Log(title = "移动端增加物料信息", action = BusinessType.OTHER)
public AjaxResult addMaterial(@RequestBody @ApiParam(value = "物料号") Material material) throws Exception {
AjaxResult result = materialService.addSave(material);
return result;
}
@PostMapping("/searchMaterialInCondition")
@ApiOperation("移动端查询物料信息")
@Log(title = "移动端查询物料信息", action = BusinessType.OTHER)
public AjaxResult searchMaterialInCondition(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
String companyCode = param.get("companyCode");
String code = param.get("code");
String name = param.get("name");
String spec = param.get("spec");
String startTime = param.get("startTime");
String endTime = param.get("endTime");
LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
materialLambdaQueryWrapper.eq(Material::getCompanyCode, companyCode)
.eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode())
|
|
717
|
.eq(Material::getDeleted, false)
|
|
718
719
720
721
722
723
|
.like(StringUtils.isNotEmpty(code), Material::getCode, code)
.like(StringUtils.isNotEmpty(name), Material::getName, name)
.like(StringUtils.isNotEmpty(spec), Material::getSpec, spec)
.gt(StringUtils.isNotEmpty(startTime), Material::getCreated, startTime)
.le(StringUtils.isNotEmpty(endTime), Material::getCreated, endTime)
.orderByDesc(Material::getCreated);
|
|
724
|
List<Material> materialList = materialService.list(materialLambdaQueryWrapper);
|
|
725
726
727
728
729
730
|
return AjaxResult.success(materialList);
}
@PostMapping("/createMaterialCode")
@ApiOperation("移动端创建物料编码")
@Log(title = "移动端创建物料编码", action = BusinessType.OTHER)
|
|
731
|
public AjaxResult createMaterialCode(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
732
733
734
735
736
|
String code = null;
Date now = new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
String day = df.format(now);
LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
|
|
737
738
|
materialLambdaQueryWrapper.like(Material::getCode, day);
;
|
|
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
|
List<Material> materials = materialService.list(materialLambdaQueryWrapper);
int length = materials.size();
//如果指定类型的最后的code存在,并且日期一致。那么 code = 入库单类型 + 年月日 + (排序号 + 1)
if (length > 0) {
code = day + String.format("%03d", length + 1);
} else {
code = day + "001";
}
return AjaxResult.success().setData(code);
}
@PostMapping("/getMaterialType")
@ApiOperation("移动端获取物料类型")
@Log(title = "移动端获取物料类型", action = BusinessType.OTHER)
public AjaxResult getMaterialType(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
LambdaQueryWrapper<MaterialType> materialTypeLambdaQueryWrapper = Wrappers.lambdaQuery();
List<MaterialType> materialTypes = materialTypeService.list(materialTypeLambdaQueryWrapper);
return AjaxResult.success(materialTypes);
}
|
|
759
|
}
|