|
1
2
3
4
|
package com.huaheng.mobile.receipt;
import com.alibaba.fastjson.JSONException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
5
|
import com.huaheng.api.general.domain.ReceiptDomain;
|
|
6
7
8
|
import com.huaheng.common.constant.QuantityConstant;
import com.huaheng.common.exception.service.ServiceException;
import com.huaheng.common.utils.StringUtils;
|
|
9
|
import com.huaheng.common.utils.Wrappers;
|
|
10
11
12
13
14
15
|
import com.huaheng.common.utils.security.ShiroUtils;
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;
|
|
16
|
import com.huaheng.pc.config.container.mapper.ContainerMapper;
|
|
17
18
19
20
21
|
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
28
29
30
31
32
33
|
import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
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;
|
|
34
|
import com.huaheng.pc.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
|
|
35
|
import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
|
|
36
37
|
import com.huaheng.pc.system.dict.domain.DictData;
import com.huaheng.pc.system.dict.service.IDictDataService;
|
|
38
39
40
41
42
43
44
45
46
47
48
49
|
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;
|
|
50
51
|
import java.text.SimpleDateFormat;
import java.util.*;
|
|
52
|
import java.util.stream.Collectors;
|
|
53
54
55
56
57
58
59
60
|
/**
* @author Enzo Cotter
* @date 2019/12/15
*/
@CrossOrigin
@RestController
@RequestMapping("/mobile/receipt/batch")
|
|
61
|
@Api(tags = {"移动端收货"}, value = "移动端收货MobileBatchReceiptController")
|
|
62
63
64
65
66
67
68
69
70
71
72
73
74
|
public class MobileBatchReceiptController {
@Resource
private ReceiptContainerHeaderService receiptContainerHeaderService;
@Resource
private ReceiptHeaderService receiptHeaderService;
@Resource
private ReceiptDetailService receiptDetailService;
@Resource
private ReceiptContainerDetailService receiptContainerDetailService;
@Resource
private ContainerService containerService;
@Resource
|
|
75
76
|
private ContainerMapper containerMapper;
@Resource
|
|
77
78
|
private MaterialService materialService;
@Resource
|
|
79
80
|
private MaterialTypeService materialTypeService;
@Resource
|
|
81
82
83
84
85
86
87
|
private LocationService locationService;
@Resource
private TaskHeaderService taskHeaderService;
@Resource
private TaskDetailService taskDetailService;
@Resource
private CompanyService companyService;
|
|
88
89
|
@Resource
private IDictDataService dictDataService;
|
|
90
91
|
@Resource
private ReceiptTypeService receiptTypeService;
|
|
92
93
|
@Resource
private ReceiptHeaderMapper receiptHeaderMapper;
|
|
94
95
96
97
98
99
100
101
102
103
104
|
@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();
|
|
105
|
receiptContainerView.setContainerCode(param.get("code"));
|
|
106
107
108
109
110
111
112
113
|
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("托盘编码错误");
}
|
|
114
|
if (!QuantityConstant.STATUS_CONTAINER_EMPTY.equals(container.getStatus())) {
|
|
115
116
|
return AjaxResult.error("托盘状态不为空");
}
|
|
117
|
if (!"".equals(container.getLocationCode())) {
|
|
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
|
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)不能为空");
}
|
|
138
|
String code = param.get("code");
|
|
139
|
String materialCode = null;
|
周鸿
authored
|
140
|
switch (ShiroUtils.getWarehouseCode()) {
|
|
141
142
143
|
case "KS0001":
materialCode = code.substring(0, code.indexOf("||"));
break;
|
周鸿
authored
|
144
145
146
|
case "XZ0001":
materialCode = code.substring(0, code.indexOf("/"));
break;
|
|
147
148
149
|
default:
materialCode = code;
}
|
|
150
|
Material material = materialService.getMaterialByCode(materialCode, ShiroUtils.getWarehouseCode());
|
|
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
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);
}
|
|
174
|
@PostMapping("/getLatestReceipt")
|
|
175
176
177
|
@ApiOperation("移动端获取入库单")
@Log(title = "移动端获取入库单", action = BusinessType.OTHER)
public AjaxResult getLatestReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
|
|
178
|
List<ReceiptHeader> receiptHeaders = receiptHeaderService.getLatestReceipt(ShiroUtils.getWarehouseCode(), param.get("companyCode"));
|
|
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
240
241
242
|
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)
|
|
243
244
|
public AjaxResult quickReceipt(@RequestBody @ApiParam(value = "收货单") List<ReceiptBill> receiptBills) throws Exception {
if (receiptBills == null || receiptBills.size() <= 0) {
|
|
245
246
247
248
249
250
251
252
253
254
|
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);
|
|
255
|
if (container == null) {
|
|
256
257
|
throw new JSONException("不存在这个托盘");
}
|
|
258
259
|
//pda入库增加托盘任务校验
|
|
260
|
List<TaskHeader> unfinishTask = taskHeaderService.getUnCompleteTaskList().stream().filter((t) -> {
|
|
261
262
263
|
return t.getContainerCode().equals(container.getCode());
}).collect(Collectors.toList());
|
|
264
|
if (unfinishTask.size() > 0) {
|
|
265
266
267
268
269
270
|
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);
}
|
|
271
|
if (locationCode != null && locationCode.equals(container.getLocationCode())) {
|
|
272
273
274
275
276
|
/* 查询未完成的入库任务*/
LambdaQueryWrapper<TaskHeader> taskQueryWrapper = Wrappers.lambdaQuery();
taskQueryWrapper.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
.in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT,
QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)
|
|
277
|
.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
|
|
278
279
|
.eq(TaskHeader::getContainerCode, containerCode);
TaskHeader taskHeader = taskHeaderService.getOne(taskQueryWrapper);
|
|
280
|
if (taskHeader == null) {
|
|
281
282
283
284
285
|
throw new JSONException("没有找到托盘对应的任务");
}
LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
receiptDetailQueryWrapper.eq(ReceiptDetail::getId, receiptDetailId);
ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailQueryWrapper);
|
|
286
|
if (receiptDetail == null) {
|
|
287
288
289
290
291
292
|
throw new JSONException("没有找到入库单详情");
}
LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
receiptHeaderQueryWrapper.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptHeaderQueryWrapper);
|
|
293
|
if (receiptHeader == null) {
|
|
294
295
296
|
throw new JSONException("没有找到入库单");
}
|
|
297
298
299
300
|
LambdaQueryWrapper<ReceiptContainerHeader> lambda = Wrappers.lambdaQuery();
lambda.eq(ReceiptContainerHeader::getContainerCode, containerCode)
.lt(ReceiptContainerHeader::getStatus, QuantityConstant.RECEIPT_CONTAINER_FINISHED);
List<ReceiptContainerHeader> list = receiptContainerHeaderService.list(lambda);
|
|
301
|
if (list.size() >= 1) {
|
|
302
303
304
305
306
307
308
|
throw new ServiceException("容器已经生成任务,不能放物料了!");
}
ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
//如果不存在记录则新建记录
receiptContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
receiptContainerHeader.setCompanyCode(companyCode);
receiptContainerHeader.setContainerCode(containerCode);
|
|
309
|
Container container2 = containerService.getContainerByCode(containerCode);
|
|
310
|
receiptContainerHeader.setContainerType(container2.getContainerType());
|
|
311
|
receiptContainerHeader.setTaskType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
|
|
312
313
314
315
|
receiptContainerHeader.setFromLocation(container2.getLocationCode());
receiptContainerHeader.setToLocation(locationCode);
receiptContainerHeader.setCreatedBy(ShiroUtils.getLoginName());
receiptContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
|
|
316
|
receiptContainerHeader.setStatus(10);
|
|
317
|
|
|
318
|
if (!receiptContainerHeaderService.save(receiptContainerHeader)) {
|
|
319
320
321
322
323
324
325
|
throw new ServiceException("入库组盘头表保存失败");
}
receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RECEIVING);
receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RECEIVING);
receiptHeaderService.update(receiptHeader, receiptHeaderQueryWrapper);
|
|
326
327
|
taskHeader.setAllocationHeadId(receiptContainerHeader.getId());
taskHeaderService.updateById(taskHeader);
|
|
328
|
for (ReceiptBill receiptBill : receiptBills) {
|
|
329
|
|
|
330
331
332
|
LambdaQueryWrapper<ReceiptDetail> receiptDetail2QueryWrapper = Wrappers.lambdaQuery();
receiptDetail2QueryWrapper.eq(ReceiptDetail::getId, receiptBill.getReceiptDetailId());
ReceiptDetail receiptDetail2 = receiptDetailService.getOne(receiptDetail2QueryWrapper);
|
|
333
|
if (receiptDetail2 == null) {
|
|
334
335
336
|
throw new JSONException("没有找到入库单详情");
}
|
|
337
338
|
BigDecimal openQty = receiptDetail2.getTaskQty();
BigDecimal totalQty = receiptDetail2.getQty();
|
|
339
|
BigDecimal qty = openQty.add(receiptBill.getQty());
|
|
340
|
if (totalQty.subtract(qty).compareTo(BigDecimal.ZERO) < 0) {
|
|
341
342
343
|
throw new Exception("配盘数量大于表单数量");
}
|
|
344
|
receiptDetail2.setTaskQty(qty);
|
|
345
|
receiptDetailService.update(receiptDetail2, receiptDetail2QueryWrapper);
|
|
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
|
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);
receiptContainerDetail.setCreatedBy(ShiroUtils.getLoginName());
receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
receiptContainerDetailService.save(receiptContainerDetail);
|
|
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
|
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);
|
|
393
394
395
|
}
} else {
|
|
396
|
ReceiptContainerView record = new ReceiptContainerView();
|
|
397
|
record.setContainerCode(containerCode);
|
|
398
|
record.setLocationCode(locationCode);
|
|
399
|
record.setTaskType((short) 100);
|
|
400
401
|
record.setCompanyCode(receiptBills.get(0).getCompanyCode());
receiptContainerHeaderService.checkContainer(record);
|
|
402
|
if (locationCode != null) {
|
|
403
404
|
receiptContainerHeaderService.mobileCheckLocationCode(record);
}
|
|
405
406
407
|
int receiptHeaderId = receiptHeaderService.createTodayHeader(companyCode);
ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptHeaderId);
List<Integer> receiptDetailIds = receiptDetailService.insertTodayReceiptDetail(receiptHeaderId, receiptBills, true, companyCode);
|
|
408
|
if (receiptDetailIds != null && receiptDetailIds.size() > 0) {
|
|
409
|
int containerHeaderId = receiptContainerHeaderService.insertTodayReceiptContainerHeader(receiptBills.get(0), receiptHeader.getCode());
|
|
410
|
if (containerHeaderId > 0) {
|
|
411
|
List<Integer> receiptContainerDetailIds = receiptContainerDetailService.insertTodayReceiptcContainerDetail(containerHeaderId, receiptHeaderId, receiptDetailIds, receiptBills);
|
|
412
|
if (receiptContainerDetailIds != null && receiptContainerDetailIds.size() > 0) {
|
|
413
414
415
416
417
418
419
420
421
|
} else {
return AjaxResult.error("入库组盘失败");
}
} else {
return AjaxResult.error("插入入库容器表单头失败");
}
} else {
return AjaxResult.error("插入入库明细表单失败");
|
|
422
|
}
|
|
423
|
}
|
|
424
|
|
|
425
426
427
|
return AjaxResult.success("收货成功");
}
|
|
428
429
430
431
|
@PostMapping("/listReceipt")
@ApiOperation("移动端根据表单整盘入库")
@Log(title = "移动端根据表单整盘入库", action = BusinessType.OTHER)
@Transactional(rollbackFor = Exception.class)
|
|
432
433
|
public AjaxResult listReceipt(@RequestBody @ApiParam(value = "收货单") List<ReceiptBill> receiptBills) throws Exception {
if (receiptBills == null || receiptBills.size() <= 0) {
|
|
434
435
436
437
438
439
440
441
442
443
|
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);
|
|
444
445
|
if (container == null) {
if (locationCode != null) {
|
|
446
447
448
|
LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
locationLambdaQueryWrapper.eq(Location::getCode, locationCode);
Location location = locationService.getOne(locationLambdaQueryWrapper);
|
|
449
|
if (location != null && location.getLocationType().equals("PK")) {
|
|
450
|
containerCode = location.getContainerCode();
|
|
451
|
if (StringUtils.isEmpty(containerCode)) {
|
|
452
453
|
LambdaQueryWrapper<Container> containerQueryWrapper2 = Wrappers.lambdaQuery();
containerQueryWrapper2.eq(Container::getEnable, true)
|
|
454
455
|
.eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_EMPTY)
.eq(Container::getContainerType, "DM");
|
|
456
457
458
459
460
461
462
463
464
|
List<Container> containerList = containerService.list(containerQueryWrapper2);
containerCode = containerList.get(0).getCode();
}
} else {
return AjaxResult.error("不存在这个托盘");
}
} else {
return AjaxResult.error("不存在这个托盘");
}
|
|
465
466
|
}
|
|
467
|
if (locationCode != null) {
|
|
468
469
470
|
LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
locationLambdaQueryWrapper.eq(Location::getCode, locationCode);
Location location = locationService.getOne(locationLambdaQueryWrapper);
|
|
471
|
if (location == null) {
|
|
472
473
474
|
throw new JSONException("不存在这个托盘");
}
|
|
475
|
if (!QuantityConstant.STATUS_LOCATION_EMPTY.equals(location.getStatus())) {
|
|
476
477
478
479
480
481
482
|
throw new JSONException("库位状态不是空闲");
}
}
LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
receiptDetailQueryWrapper.eq(ReceiptDetail::getId, receiptDetailId);
ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailQueryWrapper);
|
|
483
|
if (receiptDetail == null) {
|
|
484
485
486
487
488
489
|
throw new JSONException("没有找到入库单详情");
}
LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
receiptHeaderQueryWrapper.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptHeaderQueryWrapper);
|
|
490
|
if (receiptHeader == null) {
|
|
491
492
493
494
|
throw new JSONException("没有找到入库单");
}
List<ReceiptContainerView> receiptContainerViewList = new ArrayList<>();
|
|
495
496
|
for (ReceiptBill receiptBill : receiptBills) {
if (receiptBill.getQty().compareTo(BigDecimal.ZERO) == 0) {
|
|
497
498
|
continue;
}
|
|
499
500
501
|
ReceiptContainerView receiptContainerView = new ReceiptContainerView();
receiptContainerView.setLocationCode(receiptBill.getLocationCode());
receiptContainerView.setCompanyCode(receiptBill.getCompanyCode());
|
|
502
|
receiptContainerView.setContainerCode(containerCode);
|
|
503
504
|
receiptContainerView.setReceiptDetailId(Integer.parseInt(receiptBill.getReceiptDetailId()));
receiptContainerView.setQty(receiptBill.getQty());
|
|
505
|
receiptContainerView.setTaskType((short) 100);
|
|
506
507
508
509
510
511
512
|
receiptContainerViewList.add(receiptContainerView);
}
receiptContainerHeaderService.batchSave(receiptContainerViewList);
AjaxResult retResult = taskHeaderService.createQuickTask(containerCode);
return retResult;
}
|
|
513
514
515
|
@PostMapping("/findReceipt")
@ApiOperation("移动端查询入库单")
@Log(title = "移动端查询入库单", action = BusinessType.OTHER)
|
|
516
|
public AjaxResult findReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
517
518
|
String receiptCode = param.get("receiptCode");
String companyCode = param.get("companyCode");
|
|
519
|
if (StringUtils.isNull(receiptCode)) {
|
|
520
|
return AjaxResult.error("上游系统关联单号为空");
|
|
521
|
} else if (StringUtils.isNull(companyCode)) {
|
|
522
523
524
525
|
return AjaxResult.error("公司编码为空");
}
/* 查询入库单,如果数据库中不存在,则调用ERP接口拉取单据,成功后再次查询返回结果*/
|
|
526
|
LambdaQueryWrapper<ReceiptHeader> receiptLambdaQueryWrapper = Wrappers.lambdaQuery();
|
|
527
528
529
|
receiptLambdaQueryWrapper.eq(ReceiptHeader::getCode, receiptCode)
.eq(ReceiptHeader::getCompanyCode, companyCode);
ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptLambdaQueryWrapper);
|
|
530
|
if (receiptHeader == null) {
|
|
531
532
|
return AjaxResult.error("没有找到入库单");
}
|
|
533
|
ReceiptDomain receipt = new ReceiptDomain();
|
|
534
535
536
537
538
539
540
541
542
543
544
545
546
|
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);
}
@PostMapping("/callBox")
@ApiOperation("移动端呼叫料盒")
@Log(title = "移动端呼叫料盒", action = BusinessType.OTHER)
@Transactional(rollbackFor = Exception.class)
|
|
547
|
public AjaxResult callBox(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
548
549
550
551
552
553
554
555
556
|
String containerCode = param.get("containerCode");
String destinationLocation = param.get("destinationLocation");
int type = Integer.parseInt(param.get("type"));
String companyCode = param.get("companyCode");
Container container = new Container();
container.setCode(containerCode);
container.setWarehouseCode(ShiroUtils.getWarehouseCode());
LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(container);
container = containerService.getOne(lambdaQueryWrapper);
|
|
557
|
if (container == null) {
|
|
558
559
|
return AjaxResult.error("容器不存在");
}
|
|
560
|
if (!StringUtils.isNotEmpty(container.getLocationCode())) {
|
|
561
562
|
return AjaxResult.error("容器不在库位[" + container.getLocationCode() + "]上");
}
|
|
563
|
if (!container.getLocationCode().equals(destinationLocation)) {
|
|
564
565
566
567
568
569
570
|
return AjaxResult.error("容器不在目的库位上");
}
Location temp = new Location();
temp.setCode(destinationLocation);
temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
LambdaQueryWrapper lambda = Wrappers.lambdaQuery(temp);
Location loc = locationService.getOne(lambda);
|
|
571
|
if (StringUtils.isNotEmpty(destinationLocation)) {
|
|
572
573
574
575
|
//校验目标地址
if (loc == null) {
return AjaxResult.error("目标库位不存在");
}
|
|
576
|
if (!QuantityConstant.STATUS_LOCATION_EMPTY.equals(loc.getStatus())) {
|
|
577
578
579
580
581
|
return AjaxResult.error("目标库位非空闲");
}
}
//判断托盘是否已经存在任务
LambdaQueryWrapper<TaskHeader> headerQueryWrapper = Wrappers.lambdaQuery();
|
|
582
|
headerQueryWrapper.ne(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
|
|
583
584
|
.eq(TaskHeader::getContainerCode, containerCode);
Integer taskCount = taskHeaderService.count(headerQueryWrapper);
|
|
585
|
if (taskCount != null && taskCount.intValue() > 0) {
|
|
586
587
588
589
590
591
592
|
return AjaxResult.error("容器已存在任务");
}
//创建主任务
TaskHeader taskHeader = new TaskHeader();
taskHeader.setWarehouseCode(loc.getWarehouseCode());
taskHeader.setCompanyCode(companyCode);//货主
|
|
593
|
if (type == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
|
|
594
|
taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
|
|
595
596
|
taskHeader.setTaskType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
} else {
|
|
597
598
|
taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
taskHeader.setTaskType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
|
|
599
600
601
602
603
604
|
}
taskHeader.setContainerCode(container.getCode());
taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
taskHeader.setFromLocation(loc.getCode());
taskHeader.setToLocation(loc.getCode());
taskHeader.setCreated(new Date());
|
|
605
|
taskHeader.setCreatedBy(ShiroUtils.getUserName());
|
|
606
607
|
taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
taskHeader.setLastUpdated(new Date());
|
|
608
|
if (taskHeaderService.save(taskHeader)) {
|
|
609
|
//锁定库位状态
|
|
610
|
locationService.updateStatus(loc.getCode(), QuantityConstant.STATUS_LOCATION_LOCK);
|
|
611
|
} else {
|
|
612
613
614
615
616
|
throw new ServiceException("补充入库主表生成失败!");
}
return AjaxResult.success(taskHeader.getId());
}
|
|
617
618
619
620
|
@PostMapping("/searchReceipt")
@ApiOperation("移动端查询入库单")
@Log(title = "移动端查询入库单", action = BusinessType.OTHER)
|
|
621
|
public AjaxResult searchReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
622
623
624
625
626
627
628
629
630
631
632
|
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())
|
|
633
|
.ne(ReceiptHeader::getReceiptType, QuantityConstant.RECEIPT_TYPE_PPI)
|
|
634
|
.le(ReceiptHeader::getCreated, now)
|
|
635
636
|
.gt(ReceiptHeader::getCreated, start)
.orderByDesc(ReceiptHeader::getCreated);
|
|
637
638
639
640
|
List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderQueryWrapper);
return AjaxResult.success(receiptHeaderList);
}
|
|
641
642
643
|
@PostMapping("/searchReceiptInCondition")
@ApiOperation("移动端查询入库单")
@Log(title = "移动端查询入库单", action = BusinessType.OTHER)
|
|
644
|
public AjaxResult searchReceiptInCondition(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
|
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);
|
|
660
|
if (lastStatus.equals("200")) {
|
|
661
662
663
664
665
666
667
668
669
670
|
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);
}
|
|
671
|
List<ReceiptHeader> receiptDetailList = receiptHeaderService.list(receiptQueryWrapper);
|
|
672
673
674
|
return AjaxResult.success(receiptDetailList);
}
|
|
675
676
677
|
@PostMapping("/getDictListData")
@ApiOperation("移动端查询字典信息")
@Log(title = "移动端查询字典信息", action = BusinessType.OTHER)
|
|
678
|
public AjaxResult getDictListData(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
679
680
681
682
683
|
String dictType = param.get("dictType");
List<DictData> dictDataList = dictDataService.selectDictDataByType(dictType);
return AjaxResult.success(dictDataList);
}
|
|
684
685
686
|
@PostMapping("/getReceiptType")
@ApiOperation("移动端查询入库类型")
@Log(title = "移动端查询字典信息", action = BusinessType.OTHER)
|
|
687
|
public AjaxResult getReceiptType(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
688
|
String companyCode = param.get("companyCode");
|
|
689
|
LambdaQueryWrapper<ReceiptType> receiptTypeLambda = Wrappers.lambdaQuery();
|
|
690
691
|
receiptTypeLambda.eq(ReceiptType::getCompanyCode, companyCode);
receiptTypeLambda.eq(ReceiptType::getWarehouseCode, ShiroUtils.getWarehouseCode());
|
|
692
693
694
|
List<ReceiptType> receiptType = receiptTypeService.list(receiptTypeLambda);
return AjaxResult.success(receiptType);
}
|
|
695
|
|
|
696
697
698
|
@PostMapping("/createReceiptCode")
@ApiOperation("移动端创建入库单号")
@Log(title = "移动端创建入库单号", action = BusinessType.OTHER)
|
|
699
|
public AjaxResult createReceiptCode(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
700
|
String companyCode = param.get("companyCode");
|
|
701
|
String receiptType = param.get("receiptType");
|
|
702
703
704
705
706
|
String code = null;
Date now = new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
String maxCode = receiptHeaderMapper.createCode(receiptType);
//如果指定类型的最后的code存在,并且日期一致。那么 code = 入库单类型 + 年月日 + (排序号 + 1)
|
|
707
708
709
|
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);
|
|
710
|
} else {
|
|
711
|
code = receiptType + df.format(now) + "00001";
|
|
712
|
}
|
|
713
|
return AjaxResult.success().setData(code);
|
|
714
|
}
|
|
715
|
|
|
716
717
718
719
|
@PostMapping("/createReceipt")
@ApiOperation("移动端创建入库单")
@Log(title = "移动端创建入库单", action = BusinessType.OTHER)
@Transactional(rollbackFor = Exception.class)
|
|
720
|
public AjaxResult createReceipt(@RequestBody @ApiParam(value = "物料号") List<ReceiptBill> receiptBills) {
|
|
721
722
|
String companyCode = receiptBills.get(0).getCompanyCode();
String receiptCode = receiptBills.get(0).getReceiptCode();
|
|
723
|
String receiptType = receiptBills.get(0).getReceiptType();
|
|
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
|
ReceiptHeader receiptHeader = new ReceiptHeader();
receiptHeader.setId(null);
receiptHeader.setCode(receiptCode);
receiptHeader.setReceiptType(receiptType);
receiptHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
receiptHeader.setCreated(null);
receiptHeader.setCreatedBy(ShiroUtils.getLoginName());
receiptHeader.setLastUpdated(null);
receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
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);
|
|
739
|
if (receiptDetailIds != null && receiptDetailIds.size() > 0) {
|
|
740
741
742
743
|
return AjaxResult.success("创建入库单成功");
}
return AjaxResult.error("创建入库单失败");
}
|
|
744
|
|
|
745
746
747
748
749
750
751
|
@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);
|
|
752
|
List<Material> materialList = materialService.list(materialLambdaQueryWrapper);
|
|
753
754
|
return AjaxResult.success(materialList);
}
|
|
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
|
@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())
|
|
777
|
.eq(Material::getDeleted, false)
|
|
778
779
780
781
782
783
|
.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);
|
|
784
|
List<Material> materialList = materialService.list(materialLambdaQueryWrapper);
|
|
785
786
787
788
789
790
|
return AjaxResult.success(materialList);
}
@PostMapping("/createMaterialCode")
@ApiOperation("移动端创建物料编码")
@Log(title = "移动端创建物料编码", action = BusinessType.OTHER)
|
|
791
|
public AjaxResult createMaterialCode(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
|
|
792
793
794
795
796
|
String code = null;
Date now = new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
String day = df.format(now);
LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
|
|
797
798
|
materialLambdaQueryWrapper.like(Material::getCode, day);
;
|
|
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
|
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);
}
|
|
818
|
|
|
819
820
821
822
823
|
private String getCode() {
String code = null;
Date now = new Date();
String type = "D";
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
|
|
824
|
Container condition = new Container();
|
|
825
|
condition.setContainerType(type);
|
|
826
827
828
829
|
condition = containerService.selectFirstEntity(condition);
String maxCode = null;
if (condition != null) {
maxCode = condition.getCode();
|
|
830
831
832
|
}
// String maxCode = containerService.getMaxCode(type);
//如果指定类型的最后的code存在,并且日期一致。那么 code = 入库单类型 + 年月日 + (排序号 + 1)
|
|
833
|
if (maxCode != null) {
|
|
834
835
|
Integer count = Integer.valueOf(maxCode.substring(maxCode.length() - 5, maxCode.length()));
code = type + String.format("%05d", count + 1);
|
|
836
|
} else {
|
|
837
838
839
840
|
code = type + "00001";
}
return code;
}
|
|
841
|
|
|
842
843
844
845
846
|
private String insertContainer() {
Container condition = new Container();
condition.setContainerType("D");
condition.setStatus("empty");
Container container = containerService.selectFirstEntity(condition);
|
|
847
|
if (container == null) {
|
|
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
|
condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
condition.setCode(getCode());
condition.setPrintNum(0);
condition.setCreatedBy(ShiroUtils.getLoginName());
condition.setLastUpdatedBy(ShiroUtils.getLoginName());
condition.setEnable(true);
containerService.save(condition);
return condition.getCode();
}
return container.getCode();
}
@PostMapping("/quickSaveGoods")
@ApiOperation("移动端收货保存")
@Log(title = "移动端收货保存", action = BusinessType.OTHER)
|
|
863
|
// @ApiLogger(apiName = "立库整入组盘")
|
|
864
865
|
public AjaxResult quickSaveGoods(@RequestBody @ApiParam(value = "收货单") List<ReceiptBill> receiptBills) throws Exception {
if (receiptBills == null || receiptBills.size() <= 0) {
|
|
866
867
868
869
|
throw new JSONException("没有收货信息");
}
String receiptContainerCode = null;
String locationCode = receiptBills.get(0).getLocationCode();
|
|
870
|
if (locationCode != null && locationCode.contains("DM")) {
|
|
871
872
873
|
receiptBills.get(0).setReceiptContainerCode(insertContainer());
}
receiptContainerCode = receiptBills.get(0).getReceiptContainerCode();
|
|
874
|
if (receiptContainerCode == null) {
|
|
875
876
877
878
879
880
|
return AjaxResult.error("请输入容器号");
}
Container container = new Container();
container.setCode(receiptContainerCode);
container.setWarehouseCode(ShiroUtils.getWarehouseCode());
container = containerService.selectFirstEntity(container);
|
|
881
|
if (container == null) {
|
|
882
883
|
return AjaxResult.error("托盘为空");
}
|
|
884
|
if (!container.getStatus().equals("empty")) {
|
|
885
886
887
888
889
|
return AjaxResult.error("托盘状态不为空");
}
ReceiptContainerView record = new ReceiptContainerView();
record.setContainerCode(receiptContainerCode);
record.setLocationCode(locationCode);
|
|
890
|
record.setTaskType((short) 100);
|
|
891
|
record.setCompanyCode(receiptBills.get(0).getCompanyCode());
|
|
892
|
if (locationCode != null && locationCode.contains("DM")) {
|
|
893
894
895
896
|
record.setZoneCode("PK");
} else {
record.setZoneCode("LK");
}
|
|
897
|
record = containerService.check(record, container);
|
|
898
899
900
|
receiptContainerHeaderService.checkContainer(record);
receiptContainerHeaderService.mobileCheckLocationCode(record);
|
|
901
|
int receiptHeaderId = receiptHeaderService.createTodayHeader(receiptBills.get(0).getCompanyCode(), container.getUWarehouseCode());
|
|
902
|
ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptHeaderId);
|
|
903
904
|
List<Integer> receiptDetailIds = receiptDetailService.insertTodayReceiptDetail(receiptHeaderId, receiptBills, true, receiptBills.get(0).getCompanyCode());
if (receiptDetailIds != null && receiptDetailIds.size() > 0) {
|
|
905
|
int containerHeaderId = receiptContainerHeaderService.insertTodayReceiptContainerHeader(receiptBills.get(0), receiptHeader.getCode());
|
|
906
|
if (containerHeaderId > 0) {
|
|
907
|
List<Integer> receiptContainerDetailIds = receiptContainerDetailService.insertTodayReceiptcContainerDetail(containerHeaderId, receiptHeaderId, receiptDetailIds, receiptBills);
|
|
908
|
if (receiptContainerDetailIds != null && receiptContainerDetailIds.size() > 0) {
|
|
909
910
911
912
913
914
915
916
917
918
|
} else {
return AjaxResult.error("入库组盘失败");
}
} else {
return AjaxResult.error("插入入库容器表单头失败");
}
} else {
return AjaxResult.error("插入入库明细表单失败");
}
|
|
919
|
return AjaxResult.success("快速收货成功", receiptContainerCode);
|
|
920
921
|
}
|
|
922
|
|
|
923
924
925
|
@PostMapping("/replenishWarehouse")
@ApiOperation("移动端补充入库")
@Log(title = "移动端补充入库", action = BusinessType.OTHER)
|
|
926
|
// @ApiLogger(apiName = "非立库无表单入组盘")
|
|
927
928
|
public AjaxResult replenishWarehouse(@RequestBody @ApiParam(value = "收货单") List<ReceiptBill> receiptBills) throws Exception {
if (receiptBills == null || receiptBills.size() <= 0) {
|
|
929
930
931
932
933
934
935
|
throw new JSONException("没有收货信息");
}
Location condition = new Location();
condition.setCode(receiptBills.get(0).getLocationCode());
condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
condition.setDeleted(false);
Location location1 = locationService.selectFirstEntity(condition);
|
|
936
|
if (location1 == null) {
|
|
937
938
939
940
941
942
943
944
945
|
return AjaxResult.error("没有该库位");
}
String containerCode = location1.getContainerCode();
String locationCode = location1.getCode();
ReceiptContainerView receiptContainerView2 = new ReceiptContainerView();
receiptContainerView2.setContainerCode(containerCode);
receiptContainerView2.setTaskType((short) 200);
receiptContainerView2.setLocationCode(locationCode);
receiptContainerView2.setCompanyCode(receiptBills.get(0).getCompanyCode());
|
|
946
|
if (locationCode != null && locationCode.contains("A")) {
|
|
947
948
949
950
|
receiptContainerView2.setZoneCode("PK");
} else {
receiptContainerView2.setZoneCode("LK");
}
|
|
951
|
Container container = new Container();
|
|
952
953
|
container.setWarehouseCode(ShiroUtils.getWarehouseCode());
container.setCode(receiptContainerView2.getContainerCode());
|
|
954
955
956
|
container = containerService.selectFirstEntity(container);
if (container == null) {
return AjaxResult.error("没有该容器" + receiptContainerView2.getContainerCode());
|
|
957
|
}
|
|
958
|
receiptContainerView2 = containerService.check(receiptContainerView2, container);
|
|
959
960
|
receiptContainerHeaderService.checkContainer(receiptContainerView2);
receiptContainerHeaderService.mobileCheckLocationCode(receiptContainerView2);
|
|
961
|
int receiptHeaderId = receiptHeaderService.createTodayHeader(receiptBills.get(0).getCompanyCode(), container.getUWarehouseCode());
|
|
962
963
|
ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptHeaderId);
List<Integer> receiptDetailIds = receiptDetailService.insertTodayReceiptDetail(receiptHeaderId,
|
|
964
|
receiptBills, false, receiptBills.get(0).getCompanyCode());
|
|
965
|
List<ReceiptContainerView> receiptContainerViews = new ArrayList<>();
|
|
966
|
for (int i = 0; i < receiptBills.size(); i++) {
|
|
967
968
969
970
971
972
973
974
975
|
ReceiptBill receiptBill = receiptBills.get(i);
ReceiptContainerView receiptContainerView = new ReceiptContainerView();
receiptContainerView.setTaskType((short) 200);
receiptContainerView.setContainerCode(containerCode);
receiptContainerView.setQty(receiptBill.getQty());
receiptContainerView.setLocationCode(receiptBills.get(0).getLocationCode());
receiptContainerView.setReceiptCode(receiptHeader.getCode());
receiptContainerView.setReceiptDetailId(receiptDetailIds.get(i));
receiptContainerView.setCompanyCode(receiptBill.getCompanyCode());
|
|
976
|
if (locationCode != null && locationCode.contains("DM")) {
|
|
977
978
979
980
981
982
|
receiptContainerView.setZoneCode("PK");
} else {
receiptContainerView.setZoneCode("LK");
}
container.setWarehouseCode(ShiroUtils.getWarehouseCode());
container.setCode(receiptContainerView.getContainerCode());
|
|
983
984
|
container = containerService.selectFirstEntity(container);
receiptContainerView = containerService.check(receiptContainerView, container);
|
|
985
986
|
receiptContainerViews.add(receiptContainerView);
}
|
|
987
|
return receiptContainerHeaderService.PDAbatchSave(receiptContainerViews);
|
|
988
989
|
}
|
|
990
991
992
|
@PostMapping("/quickNoListReceipt")
@ApiOperation("移动端收货保存")
@Log(title = "移动端收货保存", action = BusinessType.OTHER)
|
|
993
|
// @ApiLogger(apiName = "立库无表单补充入组盘")
|
|
994
995
|
public AjaxResult quickNoListReceipt(@RequestBody @ApiParam(value = "收货单") List<ReceiptBill> receiptBills) throws Exception {
if (receiptBills == null || receiptBills.size() <= 0) {
|
|
996
997
|
throw new JSONException("没有收货信息");
}
|
|
998
|
receiptContainerHeaderService.quickNoListReceipt(receiptBills);
|
|
999
1000
1001
|
return AjaxResult.success("收货成功");
}
|
|
1002
|
}
|