|
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.api.general.domain.Receipt;
|
|
7
|
import com.huaheng.common.constant.QuantityConstant;
|
|
8
|
import com.huaheng.api.general.domain.ReceiptDomain;
|
|
9
10
11
|
import com.huaheng.common.constant.QuantityConstant;
import com.huaheng.common.exception.service.ServiceException;
import com.huaheng.common.utils.StringUtils;
|
huhai
authored
|
12
|
import com.huaheng.common.utils.StringUtils;
|
|
13
14
15
16
17
18
19
20
21
22
23
|
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;
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;
|
|
24
25
|
import com.huaheng.pc.config.materialType.domain.MaterialType;
import com.huaheng.pc.config.materialType.service.MaterialTypeService;
|
|
26
27
|
import com.huaheng.pc.config.receiptType.domain.ReceiptType;
import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
|
|
28
|
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
|
|
29
|
import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
|
|
30
31
32
33
34
35
36
37
|
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;
|
|
38
|
import com.huaheng.pc.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
|
|
39
|
import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
|
|
40
41
|
import com.huaheng.pc.system.dict.domain.DictData;
import com.huaheng.pc.system.dict.service.IDictDataService;
|
|
42
43
44
45
46
47
48
49
50
51
52
53
|
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;
|
|
54
55
|
import java.text.SimpleDateFormat;
import java.util.*;
|
|
56
57
58
59
60
61
62
63
64
|
/**
*
* @author Enzo Cotter
* @date 2019/12/15
*/
@CrossOrigin
@RestController
@RequestMapping("/mobile/receipt/batch")
|
|
65
|
@Api(tags = {"移动端收货"}, value = "移动端收货MobileBatchReceiptController")
|
|
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
public class MobileBatchReceiptController {
@Resource
private ReceiptContainerHeaderService receiptContainerHeaderService;
@Resource
private ReceiptHeaderService receiptHeaderService;
@Resource
private ReceiptDetailService receiptDetailService;
@Resource
private ReceiptContainerDetailService receiptContainerDetailService;
@Resource
private ContainerService containerService;
@Resource
private MaterialService materialService;
@Resource
|
|
81
82
|
private MaterialTypeService materialTypeService;
@Resource
|
|
83
84
85
86
87
88
89
|
private LocationService locationService;
@Resource
private TaskHeaderService taskHeaderService;
@Resource
private TaskDetailService taskDetailService;
@Resource
private CompanyService companyService;
|
|
90
91
|
@Resource
private IDictDataService dictDataService;
|
|
92
93
|
@Resource
private ReceiptTypeService receiptTypeService;
|
|
94
95
|
@Resource
private ReceiptHeaderMapper receiptHeaderMapper;
|
|
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
@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("托盘编码错误");
}
|
|
116
|
if (!QuantityConstant.STATUS_CONTAINER_EMPTY.equals(container.getStatus())) {
|
|
117
118
|
return AjaxResult.error("托盘状态不为空");
}
|
|
119
|
if (!"".equals(container.getLocationCode())) {
|
|
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
|
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)不能为空");
}
Material material = materialService.findAllByCode(param.get("code"));
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);
}
|
|
164
|
@PostMapping("/getLatestReceipt")
|
|
165
166
167
|
@ApiOperation("移动端获取入库单")
@Log(title = "移动端获取入库单", action = BusinessType.OTHER)
public AjaxResult getLatestReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
|
|
168
|
List<ReceiptHeader> receiptHeaders = receiptHeaderService.getLatestReceipt(ShiroUtils.getWarehouseCode(), param.get("companyCode"));
|
|
169
170
171
172
173
174
175
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
240
241
242
243
244
245
246
247
248
|
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)
public AjaxResult quickReceipt(@RequestBody @ApiParam(value="收货单") List<ReceiptBill> receiptBills) throws Exception {
if (receiptBills == null || receiptBills.size() <=0) {
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);
if(container == null) {
throw new JSONException("不存在这个托盘");
}
|
|
249
|
if(locationCode != null && locationCode.equals(container.getLocationCode())) {
|
|
250
251
252
253
254
|
/* 查询未完成的入库任务*/
LambdaQueryWrapper<TaskHeader> taskQueryWrapper = Wrappers.lambdaQuery();
taskQueryWrapper.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
.in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT,
QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)
|
|
255
|
.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
|
|
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
|
.eq(TaskHeader::getContainerCode, containerCode);
TaskHeader taskHeader = taskHeaderService.getOne(taskQueryWrapper);
if(taskHeader == null) {
throw new JSONException("没有找到托盘对应的任务");
}
LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
receiptDetailQueryWrapper.eq(ReceiptDetail::getId, receiptDetailId);
ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailQueryWrapper);
if(receiptDetail == null) {
throw new JSONException("没有找到入库单详情");
}
LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
receiptHeaderQueryWrapper.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptHeaderQueryWrapper);
if(receiptHeader == null) {
throw new JSONException("没有找到入库单");
}
|
|
275
276
277
278
279
280
281
282
283
284
285
286
|
LambdaQueryWrapper<ReceiptContainerHeader> lambda = Wrappers.lambdaQuery();
lambda.eq(ReceiptContainerHeader::getContainerCode, containerCode)
.lt(ReceiptContainerHeader::getStatus, QuantityConstant.RECEIPT_CONTAINER_FINISHED);
List<ReceiptContainerHeader> list = receiptContainerHeaderService.list(lambda);
if (list.size() >= 1){
throw new ServiceException("容器已经生成任务,不能放物料了!");
}
ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
//如果不存在记录则新建记录
receiptContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
receiptContainerHeader.setCompanyCode(companyCode);
receiptContainerHeader.setContainerCode(containerCode);
|
|
287
|
Container container2 = containerService.getContainerByCode(containerCode);
|
|
288
|
receiptContainerHeader.setContainerType(container2.getContainerType());
|
|
289
|
receiptContainerHeader.setTaskType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
|
|
290
291
292
293
|
receiptContainerHeader.setFromLocation(container2.getLocationCode());
receiptContainerHeader.setToLocation(locationCode);
receiptContainerHeader.setCreatedBy(ShiroUtils.getLoginName());
receiptContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
|
|
294
|
receiptContainerHeader.setStatus(10);
|
|
295
296
297
298
299
300
301
302
303
|
if (!receiptContainerHeaderService.save(receiptContainerHeader)){
throw new ServiceException("入库组盘头表保存失败");
}
receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RECEIVING);
receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RECEIVING);
receiptHeaderService.update(receiptHeader, receiptHeaderQueryWrapper);
|
|
304
305
|
taskHeader.setAllocationHeadId(receiptContainerHeader.getId());
taskHeaderService.updateById(taskHeader);
|
|
306
|
for(ReceiptBill receiptBill : receiptBills) {
|
|
307
|
|
|
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
|
LambdaQueryWrapper<ReceiptDetail> receiptDetail2QueryWrapper = Wrappers.lambdaQuery();
receiptDetail2QueryWrapper.eq(ReceiptDetail::getId, receiptBill.getReceiptDetailId());
ReceiptDetail receiptDetail2 = receiptDetailService.getOne(receiptDetail2QueryWrapper);
if(receiptDetail2 == null) {
throw new JSONException("没有找到入库单详情");
}
BigDecimal openQty = receiptDetail2.getOpenQty();
BigDecimal totalQty = receiptDetail2.getTotalQty();
BigDecimal qty = openQty.add(receiptBill.getQty());
if(totalQty.subtract(qty).compareTo(BigDecimal.ZERO) < 0) {
throw new Exception("配盘数量大于表单数量");
}
receiptDetail2.setOpenQty(qty);
receiptDetailService.update(receiptDetail2, receiptDetail2QueryWrapper);
|
|
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
|
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);
|
|
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
|
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);
|
|
371
372
373
|
}
} else {
|
|
374
|
ReceiptContainerView record = new ReceiptContainerView();
|
|
375
376
|
record.setReceiptContainerCode(containerCode);
record.setLocationCode(locationCode);
|
|
377
378
379
|
record.setTaskType((short)100);
record.setCompanyCode(receiptBills.get(0).getCompanyCode());
receiptContainerHeaderService.checkContainer(record);
|
|
380
381
382
|
if(locationCode != null) {
receiptContainerHeaderService.mobileCheckLocationCode(record);
}
|
|
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
|
int receiptHeaderId = receiptHeaderService.createTodayHeader(companyCode);
ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptHeaderId);
List<Integer> receiptDetailIds = receiptDetailService.insertTodayReceiptDetail(receiptHeaderId, receiptBills, true, companyCode);
if(receiptDetailIds != null && receiptDetailIds.size() > 0) {
int containerHeaderId = receiptContainerHeaderService.insertTodayReceiptContainerHeader(receiptBills.get(0), receiptHeader.getCode());
if(containerHeaderId > 0) {
List<Integer> receiptContainerDetailIds = receiptContainerDetailService.insertTodayReceiptcContainerDetail(containerHeaderId, receiptHeaderId, receiptDetailIds, receiptBills);
if(receiptContainerDetailIds != null && receiptContainerDetailIds.size() > 0) {
} else {
return AjaxResult.error("入库组盘失败");
}
} else {
return AjaxResult.error("插入入库容器表单头失败");
}
} else {
return AjaxResult.error("插入入库明细表单失败");
|
|
400
|
}
|
|
401
|
}
|
|
402
|
|
|
403
404
405
|
return AjaxResult.success("收货成功");
}
|
|
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
|
@PostMapping("/listReceipt")
@ApiOperation("移动端根据表单整盘入库")
@Log(title = "移动端根据表单整盘入库", action = BusinessType.OTHER)
@Transactional(rollbackFor = Exception.class)
public AjaxResult listReceipt(@RequestBody @ApiParam(value="收货单") List<ReceiptBill> receiptBills) throws Exception {
if (receiptBills == null || receiptBills.size() <=0) {
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);
if(container == null) {
|
|
423
424
425
426
427
428
429
430
431
|
if(locationCode != null) {
LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
locationLambdaQueryWrapper.eq(Location::getCode, locationCode);
Location location = locationService.getOne(locationLambdaQueryWrapper);
if(location != null && location.getLocationType().equals("PK")) {
containerCode = location.getContainerCode();
if(StringUtils.isEmpty(containerCode)) {
LambdaQueryWrapper<Container> containerQueryWrapper2 = Wrappers.lambdaQuery();
containerQueryWrapper2.eq(Container::getEnable, true)
|
|
432
|
.eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_EMPTY)
|
|
433
434
435
436
437
438
439
440
441
442
|
.eq(Container::getContainerType, "DM");
List<Container> containerList = containerService.list(containerQueryWrapper2);
containerCode = containerList.get(0).getCode();
}
} else {
return AjaxResult.error("不存在这个托盘");
}
} else {
return AjaxResult.error("不存在这个托盘");
}
|
|
443
444
445
446
447
448
449
450
451
452
|
}
if(locationCode != null) {
LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
locationLambdaQueryWrapper.eq(Location::getCode, locationCode);
Location location = locationService.getOne(locationLambdaQueryWrapper);
if(location == null) {
throw new JSONException("不存在这个托盘");
}
|
|
453
|
if(!QuantityConstant.STATUS_LOCATION_EMPTY.equals(location.getStatus())) {
|
|
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
|
throw new JSONException("库位状态不是空闲");
}
}
LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
receiptDetailQueryWrapper.eq(ReceiptDetail::getId, receiptDetailId);
ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailQueryWrapper);
if(receiptDetail == null) {
throw new JSONException("没有找到入库单详情");
}
LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
receiptHeaderQueryWrapper.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptHeaderQueryWrapper);
if(receiptHeader == null) {
throw new JSONException("没有找到入库单");
}
List<ReceiptContainerView> receiptContainerViewList = new ArrayList<>();
for(ReceiptBill receiptBill : receiptBills) {
|
|
474
475
476
|
if(receiptBill.getQty().compareTo(BigDecimal.ZERO) == 0) {
continue;
}
|
|
477
478
479
|
ReceiptContainerView receiptContainerView = new ReceiptContainerView();
receiptContainerView.setLocationCode(receiptBill.getLocationCode());
receiptContainerView.setCompanyCode(receiptBill.getCompanyCode());
|
|
480
|
receiptContainerView.setReceiptContainerCode(containerCode);
|
|
481
482
483
484
485
486
487
488
489
490
|
receiptContainerView.setReceiptDetailId(Integer.parseInt(receiptBill.getReceiptDetailId()));
receiptContainerView.setQty(receiptBill.getQty());
receiptContainerView.setTaskType((short)100);
receiptContainerViewList.add(receiptContainerView);
}
receiptContainerHeaderService.batchSave(receiptContainerViewList);
AjaxResult retResult = taskHeaderService.createQuickTask(containerCode);
return retResult;
}
|
|
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
|
@PostMapping("/findReceipt")
@ApiOperation("移动端查询入库单")
@Log(title = "移动端查询入库单", action = BusinessType.OTHER)
public AjaxResult findReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
String receiptCode = param.get("receiptCode");
String companyCode = param.get("companyCode");
if (StringUtils.isNull(receiptCode)){
return AjaxResult.error("上游系统关联单号为空");
} else if (StringUtils.isNull(companyCode)){
return AjaxResult.error("公司编码为空");
}
/* 查询入库单,如果数据库中不存在,则调用ERP接口拉取单据,成功后再次查询返回结果*/
LambdaQueryWrapper<ReceiptHeader> receiptLambdaQueryWrapper = Wrappers.lambdaQuery();
receiptLambdaQueryWrapper.eq(ReceiptHeader::getCode, receiptCode)
.eq(ReceiptHeader::getCompanyCode, companyCode);
ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptLambdaQueryWrapper);
if(receiptHeader == null) {
return AjaxResult.error("没有找到入库单");
}
|
|
511
|
ReceiptDomain receipt = new ReceiptDomain();
|
|
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
|
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)
public AjaxResult callBox(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) {
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);
|
|
535
|
if(container == null) {
|
|
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
|
return AjaxResult.error("容器不存在");
}
if (!StringUtils.isNotEmpty(container.getLocationCode())) {
return AjaxResult.error("容器不在库位[" + container.getLocationCode() + "]上");
}
if(!container.getLocationCode().equals(destinationLocation)) {
return AjaxResult.error("容器不在目的库位上");
}
Location temp = new Location();
temp.setCode(destinationLocation);
temp.setWarehouseCode(ShiroUtils.getWarehouseCode());
LambdaQueryWrapper lambda = Wrappers.lambdaQuery(temp);
Location loc = locationService.getOne(lambda);
if(StringUtils.isNotEmpty(destinationLocation)) {
//校验目标地址
if (loc == null) {
return AjaxResult.error("目标库位不存在");
}
|
|
554
|
if (!QuantityConstant.STATUS_LOCATION_EMPTY.equals(loc.getStatus())) {
|
|
555
556
557
558
559
|
return AjaxResult.error("目标库位非空闲");
}
}
//判断托盘是否已经存在任务
LambdaQueryWrapper<TaskHeader> headerQueryWrapper = Wrappers.lambdaQuery();
|
|
560
|
headerQueryWrapper.ne(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
|
|
561
562
563
564
565
566
567
568
569
570
|
.eq(TaskHeader::getContainerCode, containerCode);
Integer taskCount = taskHeaderService.count(headerQueryWrapper);
if (taskCount != null && taskCount.intValue() > 0) {
return AjaxResult.error("容器已存在任务");
}
//创建主任务
TaskHeader taskHeader = new TaskHeader();
taskHeader.setWarehouseCode(loc.getWarehouseCode());
taskHeader.setCompanyCode(companyCode);//货主
|
|
571
|
if(type == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
|
|
572
|
taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
|
|
573
574
|
taskHeader.setTaskType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
} else {
|
|
575
576
|
taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
taskHeader.setTaskType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
|
|
577
578
579
580
581
582
583
584
585
|
}
taskHeader.setContainerCode(container.getCode());
taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
taskHeader.setFromLocation(loc.getCode());
taskHeader.setToLocation(loc.getCode());
taskHeader.setCreated(new Date());
taskHeader.setCreatedBy(ShiroUtils.getLoginName());
taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
taskHeader.setLastUpdated(new Date());
|
|
586
|
if (taskHeaderService.save(taskHeader)){
|
|
587
|
//锁定库位状态
|
|
588
|
locationService.updateStatus(loc.getCode(),QuantityConstant.STATUS_LOCATION_LOCK);
|
|
589
|
} else {
|
|
590
591
592
593
594
|
throw new ServiceException("补充入库主表生成失败!");
}
return AjaxResult.success(taskHeader.getId());
}
|
|
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
|
@PostMapping("/searchReceipt")
@ApiOperation("移动端查询入库单")
@Log(title = "移动端查询入库单", action = BusinessType.OTHER)
public AjaxResult searchReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
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())
|
|
611
|
.ne(ReceiptHeader::getReceiptType, "PPI")
|
|
612
|
.le(ReceiptHeader::getCreated, now)
|
|
613
614
|
.gt(ReceiptHeader::getCreated, start)
.orderByDesc(ReceiptHeader::getCreated);
|
|
615
616
617
618
|
List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderQueryWrapper);
return AjaxResult.success(receiptHeaderList);
}
|
|
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
|
@PostMapping("/searchReceiptInCondition")
@ApiOperation("移动端查询入库单")
@Log(title = "移动端查询入库单", action = BusinessType.OTHER)
public AjaxResult searchReceiptInCondition(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
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);
|
|
638
639
640
641
642
643
644
645
646
647
648
|
if(lastStatus.equals("200")) {
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);
}
|
|
649
650
651
652
|
List<ReceiptHeader> receiptDetailList = receiptHeaderService.list(receiptQueryWrapper);
return AjaxResult.success(receiptDetailList);
}
|
|
653
654
655
656
657
658
659
660
661
|
@PostMapping("/getDictListData")
@ApiOperation("移动端查询字典信息")
@Log(title = "移动端查询字典信息", action = BusinessType.OTHER)
public AjaxResult getDictListData(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
String dictType = param.get("dictType");
List<DictData> dictDataList = dictDataService.selectDictDataByType(dictType);
return AjaxResult.success(dictDataList);
}
|
|
662
663
664
665
|
@PostMapping("/getReceiptType")
@ApiOperation("移动端查询入库类型")
@Log(title = "移动端查询字典信息", action = BusinessType.OTHER)
public AjaxResult getReceiptType(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
|
|
666
|
String companyCode = param.get("companyCode");
|
|
667
|
LambdaQueryWrapper<ReceiptType> receiptTypeLambda = Wrappers.lambdaQuery();
|
|
668
669
|
receiptTypeLambda.eq(ReceiptType::getCompanyCode, companyCode);
receiptTypeLambda.eq(ReceiptType::getWarehouseCode, ShiroUtils.getWarehouseCode());
|
|
670
671
672
|
List<ReceiptType> receiptType = receiptTypeService.list(receiptTypeLambda);
return AjaxResult.success(receiptType);
}
|
|
673
|
|
|
674
675
676
677
678
|
@PostMapping("/createReceiptCode")
@ApiOperation("移动端创建入库单号")
@Log(title = "移动端创建入库单号", action = BusinessType.OTHER)
public AjaxResult createReceiptCode(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
String companyCode = param.get("companyCode");
|
|
679
|
String receiptType = param.get("receiptType");
|
|
680
681
682
683
684
|
String code = null;
Date now = new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
String maxCode = receiptHeaderMapper.createCode(receiptType);
//如果指定类型的最后的code存在,并且日期一致。那么 code = 入库单类型 + 年月日 + (排序号 + 1)
|
|
685
686
687
|
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);
|
|
688
|
} else {
|
|
689
|
code = receiptType + df.format(now) + "00001";
|
|
690
|
}
|
|
691
|
return AjaxResult.success().setData(code);
|
|
692
|
}
|
|
693
|
|
|
694
695
696
697
698
699
700
|
@PostMapping("/createReceipt")
@ApiOperation("移动端创建入库单")
@Log(title = "移动端创建入库单", action = BusinessType.OTHER)
@Transactional(rollbackFor = Exception.class)
public AjaxResult createReceipt(@RequestBody @ApiParam(value = "物料号")List<ReceiptBill> receiptBills){
String companyCode = receiptBills.get(0).getCompanyCode();
String receiptCode = receiptBills.get(0).getReceiptCode();
|
|
701
|
String receiptType = receiptBills.get(0).getReceiptType();
|
|
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
|
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);
if(receiptDetailIds != null && receiptDetailIds.size() > 0) {
return AjaxResult.success("创建入库单成功");
}
return AjaxResult.error("创建入库单失败");
}
|
|
722
|
|
|
723
724
725
726
727
728
729
730
731
732
|
@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);
List<Material> materialList = materialService.list(materialLambdaQueryWrapper);
return AjaxResult.success(materialList);
}
|
|
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
|
@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())
|
|
755
|
.eq(Material::getDeleted, false)
|
|
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
|
.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);
List<Material> materialList = materialService.list(materialLambdaQueryWrapper);
return AjaxResult.success(materialList);
}
@PostMapping("/createMaterialCode")
@ApiOperation("移动端创建物料编码")
@Log(title = "移动端创建物料编码", action = BusinessType.OTHER)
public AjaxResult createMaterialCode(@RequestBody @ApiParam(value = "物料号") Map<String, String> param){
String code = null;
Date now = new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
String day = df.format(now);
LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
materialLambdaQueryWrapper.like(Material::getCode, day);;
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);
}
|
|
796
|
}
|