|
1
2
|
package com.huaheng.pc.task.taskHeader.service;
|
|
3
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
4
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
5
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
6
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
7
|
import com.huaheng.api.wcs.service.taskAssignService.TaskAssignService;
|
|
8
|
import com.huaheng.common.exception.service.ServiceException;
|
|
9
|
import com.huaheng.common.utils.DataUtils;
|
|
10
|
import com.huaheng.common.utils.StringUtils;
|
|
11
12
|
import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.web.domain.AjaxResult;
|
|
13
|
import com.huaheng.pc.config.container.domain.Container;
|
|
14
|
import com.huaheng.pc.config.container.service.ContainerService;
|
|
15
16
|
import com.huaheng.pc.config.location.domain.Location;
import com.huaheng.pc.config.location.service.LocationService;
|
|
17
18
|
import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
|
|
19
|
import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
|
|
20
|
import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderService;
|
|
21
22
|
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
|
|
23
24
|
import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
|
|
25
|
import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
|
|
26
|
import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
|
|
27
28
|
import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
|
|
29
30
31
32
|
import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
|
|
33
34
|
import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
|
|
35
36
37
38
|
import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
|
|
39
|
import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
|
|
40
|
import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
|
|
41
|
import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
|
|
42
|
import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
|
|
43
44
45
|
import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
|
|
46
|
import org.apache.poi.ss.formula.functions.T;
|
|
47
|
import org.jsoup.helper.DataUtil;
|
|
48
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
49
|
import org.springframework.stereotype.Service;
|
|
50
|
import java.math.BigDecimal;
|
|
51
52
|
import java.text.SimpleDateFormat;
import java.util.ArrayList;
|
|
53
|
import java.util.Date;
|
|
54
|
import java.util.List;
|
|
55
|
import java.util.Map;
|
|
56
|
import java.util.*;
|
|
57
58
|
import java.util.concurrent.CopyOnWriteArrayList;
|
|
59
60
61
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
|
|
62
63
|
import org.springframework.transaction.annotation.Transactional;
|
|
64
65
|
import javax.annotation.Resource;
|
|
66
|
@Service
|
|
67
|
public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHeader> implements TaskHeaderService {
|
|
68
|
|
|
69
|
@Resource
|
|
70
|
private ShipmentContainerHeaderService shipmentContainerHeaderService;
|
|
71
|
@Resource
|
|
72
|
private ShipmentContainerDetailService shipmentContainerDetailService;
|
|
73
|
@Resource
|
|
74
|
private LocationService locationService;
|
|
75
|
@Resource
|
|
76
77
|
private ContainerService containerService;
@Resource
|
|
78
|
private TaskDetailService taskDetailService;
|
|
79
|
@Resource
|
|
80
|
private TaskHeaderService taskHeaderService;
|
|
81
|
@Resource
|
|
82
|
private InventoryHeaderService inventoryHeaderService;
|
|
83
84
85
|
@Resource
private InventoryDetailService inventoryDetailService;
@Resource
|
|
86
|
private InventoryTransactionService inventoryTransactionService;
|
|
87
|
@Resource
|
|
88
|
private ReceiptHeaderService receiptHeaderService;
|
|
89
90
|
@Resource
private ReceiptDetailService receiptDetailService;
|
|
91
|
@Resource
|
|
92
|
private ReceiptContainerDetailService receiptContainerDetailService;
|
|
93
94
95
96
|
@Resource
private ShipmentHeaderService shipmentHeaderService;
@Resource
private ShipmentDetailService shipmentDetailService;
|
|
97
98
|
@Resource
private CycleCountDetailService cycleCountDetailService;
|
|
99
|
@Resource
|
|
100
101
|
private CycleCountHeaderService cycleCountHeaderService;
@Resource
|
|
102
|
private ReceiptContainerHeaderService receiptContainerHeaderService;
|
|
103
|
@Resource
|
|
104
|
private TaskHeaderMapper taskHeaderMapper;
|
|
105
106
|
@Autowired
private TaskAssignService taskAssignService;
|
|
107
|
|
|
108
|
|
|
109
|
|
|
110
|
/**
|
|
111
|
* 查询容器有无任务
|
|
112
|
*/
|
|
113
114
115
116
|
@Override
public Integer UncompleteCount(String ContainerCode) {
return taskHeaderMapper.UncompleteCount(ContainerCode, ShiroUtils.getWarehouseCode());
}
|
|
117
|
|
|
118
119
120
121
|
/**
* 取消任务
* */
@Override
|
|
122
|
@Transactional
|
|
123
124
125
126
127
128
129
130
131
|
public AjaxResult cancelTask(Integer[] taskIds) {
for(int taskId : taskIds){
TaskHeader taskHeader = taskHeaderService.getById(taskId);
if(taskHeader==null){
return AjaxResult.error("任务"+taskId+"未找到,操作中止");
}
if(taskHeader.getStatus() > 9){
return AjaxResult.error("存在任务"+taskHeader.getId()+"已下发或执行,操作中止");
}
|
|
132
133
134
135
136
137
138
139
140
141
142
|
//查出任务明细
TaskDetail taskDetail1 = new TaskDetail();
taskDetail1.setTaskId(taskHeader.getId());
taskDetail1.setWarehouseCode(taskHeader.getWarehouseCode());
taskDetail1.setCompanyCode(taskHeader.getCompanyCode());
LambdaQueryWrapper<TaskDetail> td = Wrappers.lambdaQuery(taskDetail1);
List<TaskDetail> taskDetailList = taskDetailService.list(td);
TaskDetail taskDetail = taskDetailList.get(0);
if(taskDetail == null){
throw new ServiceException("任务明细条目错误");
}
|
|
143
144
145
146
147
148
149
150
151
152
153
154
|
//删除子任务
LambdaQueryWrapper<TaskDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(TaskDetail::getTaskId,taskHeader.getId());
taskDetailService.remove(lambdaQueryWrapper);
//删除主任务
taskHeaderService.removeById(taskHeader.getId());
// 更改库位状态(整盘入库任务除外)
if(taskHeader.getInternalTaskType() == 100 )
{
ReceiptContainerHeader record =new ReceiptContainerHeader();
record.setStatus((short)0);
record.setId(taskHeader.getAllocationHeadId());
|
|
155
|
if (!receiptContainerHeaderService.updateById(record)){throw new ServiceException("回滚组盘明细失败");}
|
|
156
157
158
159
160
161
162
163
164
|
}
//根据任务类型来更新货箱状态
//修改关联的货箱状态
if(taskHeader.getInternalTaskType() == 200) {
ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader();
shipmentContainerHeader.setId(taskHeader.getAllocationHeadId());
shipmentContainerHeader.setStatus(0);
shipmentContainerHeaderService.updateById(shipmentContainerHeader);
}
|
|
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
//盘点取消任务,恢复明细状态为1
if(taskHeader.getInternalTaskType() == 700) {
CycleCountDetail cycleCountDetail = new CycleCountDetail();
cycleCountDetail.setCompanyCode(taskDetail.getCompanyCode());
cycleCountDetail.setWarehouseCode(taskDetail.getWarehouseCode());
cycleCountDetail.setLocationCode(taskDetail.getFromLocation());
cycleCountDetail.setContainerCode(taskDetail.getContainerCode());
cycleCountDetail.setCycleCountHeadCode(taskDetail.getBillCode());//盘点单Code
cycleCountDetail.setId(taskDetail.getBillDetailId());//盘点细单ID
LambdaQueryWrapper<CycleCountDetail> lam = Wrappers.lambdaQuery(cycleCountDetail);
List<CycleCountDetail> cycleCountDetailList = cycleCountDetailService.list(lam);//
for(CycleCountDetail item:cycleCountDetailList){
item.setTaskHeaderId(null);
item.setTaskHeaderId(null);
item.setLastUpdated(new Date());
item.setLastUpdatedBy(ShiroUtils.getLoginName());
item.setEnableStatus(1);
cycleCountDetailService.saveOrUpdate(item);
}
}
|
|
187
188
189
190
191
192
193
194
195
196
197
198
199
200
|
if(taskHeader.getInternalTaskType()==100||taskHeader.getInternalTaskType()==200){
if(taskHeader.getToLocation()!=null){
//更新托盘、库位状态
locationService.updateStatus(taskHeader.getToLocation(), "empty");
}
}
// if(task.getType()==900){
// //出库查看任务没有关联的货箱,不做处理
// }
}
return AjaxResult.success("取消任务成功!");
}
|
|
201
202
|
/**
* 生成出库任务
|
|
203
|
*
|
|
204
205
206
207
208
|
* @param shipmentTaskCreateModel
* @return
*/
@Override
@Transactional
|
|
209
|
public AjaxResult createTaskFromShipmentContainers(ShipmentTaskCreateModel shipmentTaskCreateModel) {
|
|
210
|
Boolean flag = true;
|
|
211
212
213
|
Integer shipmentContainerHeaderId = shipmentTaskCreateModel.getShipmentContainerHeaderIds();
//获取表头
ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(shipmentContainerHeaderId);
|
|
214
|
if (shipmentContainerHeader == null) {
|
|
215
216
|
return AjaxResult.error("出库货箱" + shipmentContainerHeaderId + "未找到,操作中止");
}
|
|
217
|
if (shipmentContainerHeader.getStatus() > 9) {
|
|
218
219
220
|
return AjaxResult.error("出库货箱" + shipmentContainerHeader.getContainerCode() + "已经生成任务,请不要重复生成,操作中止");
}
//获取所有子货箱
|
|
221
222
|
LambdaQueryWrapper<ShipmentContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(ShipmentContainerDetail::getShippingContainerId, shipmentContainerHeader.getId());
|
|
223
|
List<ShipmentContainerDetail> shipmentContainerDetails = shipmentContainerDetailService.list(lambdaQueryWrapper);
|
|
224
|
if (shipmentContainerDetails == null || shipmentContainerDetails.size() == 0) {
|
|
225
226
227
|
return AjaxResult.error("货箱" + shipmentContainerHeader.getContainerCode() + "没有子任务,操作中止");
}
//检测库位
|
|
228
229
230
231
|
LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
locationLambdaQueryWrapper.eq(Location::getCode, shipmentContainerHeader.getLocationCode())
.eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode())
.eq(Location::getDeleted, false);
|
|
232
|
Location location = locationService.getOne(locationLambdaQueryWrapper);
|
|
233
|
if (location == null) {
|
|
234
235
236
237
238
239
|
return AjaxResult.error("库位禁用或不存在!");
}
//创建任务头
TaskHeader task = new TaskHeader();
//分拣出库
task.setTaskType(400);
|
|
240
|
task.setFromLocation(shipmentContainerHeader.getLocationCode());
|
|
241
|
task.setToLocation(shipmentContainerHeader.getLocationCode());
|
|
242
|
//判断是否整出任务,钱柜和AGV不能整出
|
|
243
|
|
|
244
245
246
247
248
|
//表示整出优先
//判断当前子货箱所有数量是否等于该托盘对应的所有库存的数量,
//这里必须与库存的在库数量对比,后期可能存在一个配盘在执行任务,后一个配盘又在配这个的情况(这个时候不能整出)
// 如果相等,则说明这个货箱包含了所有的数量,则可以整出,否则,创建拣选任务;
//查询所有库存
|
|
249
250
251
|
LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getLocationCode, shipmentContainerHeader.getLocationCode())
.eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
|
|
252
|
List<InventoryDetail> inventories = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
|
|
253
254
|
BigDecimal inventoryTotal = new BigDecimal("0");
for (InventoryDetail item : inventories) {
|
|
255
256
257
|
inventoryTotal = inventoryTotal.add(item.getQty());
}
BigDecimal containerTotal = new BigDecimal("0");
|
|
258
|
for (ShipmentContainerDetail item : shipmentContainerDetails) {
|
|
259
260
|
containerTotal = containerTotal.add(item.getQty());
}
|
|
261
|
if (inventoryTotal.compareTo(containerTotal) == 0) {
|
|
262
|
task.setTaskType(300);//整盘出库
|
|
263
|
task.setToLocation("");
|
|
264
|
}
|
|
265
|
|
|
266
|
task.setInternalTaskType(200);
|
|
267
|
task.setAllocationHeadId(shipmentContainerHeader.getId());
|
|
268
269
270
271
|
task.setWarehouseCode(shipmentContainerHeader.getWarehouseCode());
task.setCompanyCode(shipmentContainerHeader.getCompanyCode());
task.setAssignedUser(ShiroUtils.getLoginName());
task.setConfirmedBy(ShiroUtils.getLoginName());
|
|
272
|
task.setStatus(0);
|
|
273
274
275
276
277
278
279
|
task.setContainerCode(shipmentContainerHeader.getContainerCode());
task.setCreatedBy(ShiroUtils.getLoginName());
task.setCreated(new Date());
task.setLastUpdatedBy(ShiroUtils.getLoginName());
task.setLastUpdated(null);
this.save(task);
//遍历子货箱创建子任务
|
|
280
|
for (ShipmentContainerDetail shipmentContainerDetail : shipmentContainerDetails) {
|
|
281
282
|
TaskDetail taskDetail = new TaskDetail();
taskDetail.setTaskId(task.getId());
|
|
283
|
taskDetail.setInternalTaskType(task.getInternalTaskType());
|
|
284
285
|
taskDetail.setWarehouseCode(task.getWarehouseCode());
taskDetail.setCompanyCode(task.getCompanyCode());
|
|
286
|
taskDetail.setTaskType(task.getTaskType());
|
|
287
|
taskDetail.setToInventoryId(shipmentContainerDetail.getInventoryId());
|
|
288
|
taskDetail.setAllocationId(shipmentContainerDetail.getId());
|
|
289
290
291
292
|
taskDetail.setBillCode(shipmentContainerDetail.getShipmentCode());
taskDetail.setBillDetailId(shipmentContainerDetail.getShipmentDetailId());
taskDetail.setMaterialCode(shipmentContainerDetail.getMaterialCode());
taskDetail.setMaterialName(shipmentContainerDetail.getMaterialName());
|
|
293
294
|
taskDetail.setMaterialSpec(shipmentContainerDetail.getMaterialSpec());
taskDetail.setMaterialUnit(shipmentContainerDetail.getMaterialUnit());
|
|
295
296
297
|
taskDetail.setFromInventoryId(shipmentContainerDetail.getInventoryId());
taskDetail.setQty(shipmentContainerDetail.getQty());
taskDetail.setContainerCode(task.getContainerCode());
|
|
298
299
|
taskDetail.setFromLocation(task.getFromLocation());
taskDetail.setToLocation(task.getToLocation());
|
|
300
301
302
|
taskDetail.setLot(shipmentContainerDetail.getLot());
taskDetail.setBatch(shipmentContainerDetail.getBatch());
taskDetail.setProjectNo(shipmentContainerDetail.getProjectNo());
|
|
303
|
taskDetail.setStatus(0);
|
|
304
|
taskDetail.setWaveId(shipmentContainerDetail.getWaveId());
|
|
305
|
taskDetail.setInventorySts(shipmentContainerDetail.getInventorySts());
|
|
306
|
taskDetail.setCreatedBy(ShiroUtils.getLoginName());
|
|
307
|
taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
|
|
308
309
310
311
312
313
|
flag=taskDetailService.save(taskDetail);
if(flag == false){
throw new ServiceException("新建任务明细失败,sql报错");
}
shipmentContainerDetail.setStatus(10);
|
|
314
315
|
}
//更新货位状态
|
|
316
317
318
319
320
321
322
323
324
325
|
shipmentContainerHeader.setStatus(10);
flag = shipmentContainerHeaderService.updateById(shipmentContainerHeader);
if(flag == false){
throw new ServiceException("修改组盘头状态失败,sql报错");
}
flag = shipmentContainerDetailService.updateBatchById(shipmentContainerDetails);
if(flag == false){
throw new ServiceException("修改组盘明细状态明细失败,sql报错");
}
|
|
326
327
328
|
return AjaxResult.success(task.getId());
}
|
|
329
|
|
|
330
|
/**
|
|
331
|
*下发WCS执行任务
|
|
332
333
|
* 执行任务
* */
|
|
334
|
@Override
|
|
335
|
@Transactional
|
|
336
|
public AjaxResult<TaskHeader> sendTaskToWcs(Integer[] taskIds) {
|
|
337
338
|
TaskHeader task = null;
for (Integer taskId : taskIds) {
|
|
339
|
task = taskHeaderService.getById(taskId);
|
|
340
|
|
|
341
|
if (task.getStatus() > 9) {
|
|
342
343
344
|
return AjaxResult.error("任务" + taskId + "已经下发,请不要重复下发,操作中止");
}
//修改任务头表
|
|
345
|
task.setId(taskId);
|
|
346
347
348
349
|
task.setStatus(10);
task.setStartPickDateTime(new Date()); //生成时间
task.setLastUpdated(new Date());
task.setLastUpdatedBy(ShiroUtils.getLoginName());
|
|
350
|
taskHeaderService.saveOrUpdate(task);
|
|
351
|
//修改任务明细状态
|
|
352
353
354
355
356
357
358
359
360
361
362
363
364
365
|
LambdaQueryWrapper<TaskDetail> lambdaWrapper = Wrappers.lambdaQuery();
lambdaWrapper.eq(TaskDetail::getTaskId, task.getId());
List<TaskDetail> taskDetailList = taskDetailService.list(lambdaWrapper);
List<TaskDetail> taskDetails = new ArrayList<>();
for (TaskDetail item:taskDetailList){
item.setStatus(10);
item.setLastUpdated(new Date());
item.setLastUpdatedBy(ShiroUtils.getLoginName());
item.setProcessStamp("100");
taskDetails.add(item);
//盘点执行修改盘点单据状态为10
if(task.getTaskType() == 700){
cycleCountDetailService.updataDetailStatus(item.getBillDetailId(),10);
}
|
|
366
|
}
|
|
367
|
if (!taskDetailService.saveOrUpdateBatch(taskDetails)){
|
|
368
369
|
throw new ServiceException("更新任务明细失败");
}
|
|
370
|
|
|
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
|
// //修改入库明细
// if (task.getInternalTaskType()==100){
// ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(record.getId()));
// if (!receiptDetailService.updateById(receiptDetail)){
// throw new ServiceException("更新状态失败");
// }
// receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
//
// //修改组盘表状态为20
// ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
// receiptContainerDetail.setStatus(20);
// receiptContainerDetail.setLastUpdated(new Date());
// receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
// LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
// receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId,receiptDetail.getReceiptId());
// if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
// throw new ServiceException("更新组盘状态失败");
// }
//
// //修改出库单状态
// if (task.getInternalTaskType()==200){
// LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
// taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
// List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
//
// for (TaskDetail taskDeatails: taskDetailList) {
// LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
// shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
//
// ShipmentHeader shipmentHeader =new ShipmentHeader();
// shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
// shipmentHeader.setFirstStatus(100);
// shipmentHeader.setLastStatus(100);
// shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
// shipmentHeader.setLastUpdated(new Date());
// shipmentHeaderService.updateById(shipmentHeader);
// }
// }
|
|
410
411
|
// 给wcs传递任务
taskAssignService.wcsTaskAssign(task);
|
|
412
|
}
|
|
413
|
return AjaxResult.success("执行下发任务成功", task);
|
|
414
415
416
|
}
@Override
|
|
417
418
|
@Transactional
public AjaxResult completeTaskByWMS(Integer[] taskIds) {
|
|
419
420
421
422
423
424
425
426
427
428
|
for (int taskId : taskIds) {
TaskHeader task = taskHeaderService.getById(taskId);
if (task == null) {
throw new ServiceException("任务" + taskId + "未找到,执行中止");
}
//如果已完成则不管
if (task.getStatus() == 100) {
throw new ServiceException("任务(" + taskId + ")任务已经是完成的!");
}
//如果没有库位不能完成
|
|
429
|
if (StringUtils.isEmpty(task.getFromLocation())) {
|
|
430
431
432
433
434
435
436
437
438
439
440
441
442
|
throw new ServiceException("任务" + taskId + "没有库位,执行中止");
}
this.completeTask(task);
}
return AjaxResult.success("完成任务成功!");
}
/**
* 完成任务
*
* @param task
*/
|
|
443
444
|
@Transactional
public void completeTask(TaskHeader task) {
|
|
445
|
//区分任务类型
|
|
446
|
if (task.getInternalTaskType() == 100) {
|
|
447
448
449
|
//入库任务
completeReceiptTask(task);
}
|
|
450
|
if (task.getInternalTaskType() == 200) {
|
|
451
452
|
// 出库任务
completeShipmentTask(task);
|
|
453
|
}
|
|
454
|
// 900 出库查看,空托出库查看
|
|
455
456
|
if ( task.getTaskType() == 900) {
completeSeeOutTask(task);
|
|
457
|
}
|
|
458
459
460
461
462
|
// 700 盘点
if ( task.getTaskType() == 700) {
completeCycleCountTask(task);
}
if (task.getTaskType() == 800) {
|
|
463
|
// //移库
|
|
464
|
completeTransferTask(task);
|
|
465
|
}
|
|
466
|
if (task.getTaskType() == 500) {
|
|
467
468
|
//空托盘入库
completeEmptyIn(task);
|
|
469
|
}
|
|
470
|
if (task.getTaskType() == 600) {
|
|
471
472
|
//空托盘出库
completeEmptyOut(task);
|
|
473
474
475
|
}
}
|
|
476
477
|
/**
|
|
478
|
*完成入库任务
|
|
479
|
*/
|
|
480
|
@Override
|
|
481
|
@Transactional
|
|
482
|
public AjaxResult completeReceiptTask(TaskHeader task){
|
|
483
484
|
List<Map<String, Object>> taskReceiptContainerDetail = taskHeaderMapper.getReceiptTask(task.getId());
if (taskReceiptContainerDetail.size() < 1) {
|
|
485
486
|
return AjaxResult.success("未找到对应任务的入库单号!!!");
}
|
|
487
488
489
|
for (Map<String, Object> map : taskReceiptContainerDetail) {
//将未完成的任务数量更新到库存表
if (DataUtils.getInteger(map.get("status")) < 100) {
|
|
490
491
492
493
494
495
496
|
LambdaQueryWrapper<InventoryDetail> inventory = Wrappers.lambdaQuery();
inventory.eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
.eq(InventoryDetail::getLocationCode, task.getFromLocation())
.eq(InventoryDetail::getReceiptDetailId, DataUtils.getString(map.get("receiptDetailId")))
.eq(InventoryDetail::getContainerCode, DataUtils.getString(map.get("containerCode")));
InventoryDetail detail = inventoryDetailService.getOne(inventory);
if (detail == null) {
|
|
497
498
499
500
501
|
//添加库存单
InventoryHeader header = new InventoryHeader();
header.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库
header.setCompanyCode(task.getCompanyCode());//货主
header.setContainerCode(DataUtils.getString(map.get("containerCode")));//容器号
|
|
502
|
header.setLocationCode(task.getToLocation());
|
|
503
504
505
506
507
508
|
header.setTotalQty(DataUtils.getInteger(map.get("totalQty")));//总数量
header.setLocking(1);
header.setEnable(1);
header.setCreatedBy(ShiroUtils.getLoginName());
header.setCreated(new Date());
header.setLastUpdated(new Date());
|
|
509
510
511
|
if (!inventoryHeaderService.save(header))
throw new ServiceException("添加库存单失败");
|
|
512
513
514
515
516
|
//库存明细添加
detail = new InventoryDetail();
detail.setInventoryHeaderId(header.getId());//库存头ID
detail.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库
detail.setCompanyCode(task.getCompanyCode());//货主
|
|
517
|
detail.setLocationCode(task.getToLocation());//库位号
|
|
518
519
520
521
|
detail.setContainerCode(DataUtils.getString(map.get("containerCode")));//容器号
detail.setMaterialCode(DataUtils.getString(map.get("materialCode")));//物料号
detail.setMaterialName(DataUtils.getString(map.get("materialName")));//物料名称
detail.setMaterialSpec(DataUtils.getString(map.get("materialSpec")));//物料规格
|
|
522
|
detail.setMaterialUnit(DataUtils.getString(map.get("materialUnit")));//物料单位
|
|
523
|
detail.setReceiptCode(DataUtils.getString(map.get("receiptCode")));//入库单编码
|
|
524
|
detail.setReceiptDetailId(DataUtils.getInteger(map.get("receiptDetailId")));//入库单明细ID
|
|
525
526
527
|
detail.setBatch(DataUtils.getString(map.get("batch")));//批次
detail.setLot(DataUtils.getString(map.get("lot")));//批号
detail.setInventorySts(DataUtils.getString(map.get("inventorySts")));//库存状态
|
|
528
|
// detail.setManufactureDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("manufactureDate").toString()));//生产日期
|
|
529
|
// detail.setExpirationDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("expirationDate").toString()));//失效日期
|
|
530
|
detail.setQty(DataUtils.getBigDecimal(map.get("qty")));//数量
|
|
531
|
detail.setTaskQty(DataUtils.getBigDecimal(0));
|
|
532
533
|
detail.setCreatedBy(ShiroUtils.getLoginName());//创建人
detail.setLastUpdatedBy(ShiroUtils.getLoginName());//创建时间
|
|
534
535
|
if (!inventoryDetailService.save(detail))
throw new ServiceException("添加库存明细失败");
|
|
536
537
|
}
else {
|
|
538
539
540
|
detail.setQty(detail.getQty().add(DataUtils.getBigDecimal(map.get("qty"))));
detail.setLastUpdatedBy(ShiroUtils.getLoginName());
LambdaUpdateWrapper<InventoryDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
|
|
541
|
lambdaUpdateWrapper.eq(InventoryDetail::getId,DataUtils.getInteger(map.get("receiptDetailId")));
|
|
542
|
if (!inventoryDetailService.update(detail, lambdaUpdateWrapper))
|
|
543
|
throw new ServiceException("更新入库单明细失败");
|
|
544
|
|
|
545
546
547
548
549
550
|
}
//记录库存交易记录
InventoryTransaction inventoryTransaction = new InventoryTransaction();
inventoryTransaction.setTransactionType(10);
inventoryTransaction.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));
inventoryTransaction.setCompanyCode(task.getCompanyCode());
|
|
551
|
inventoryTransaction.setLocationCode(task.getToLocation());
|
|
552
553
554
|
inventoryTransaction.setContainerCode(DataUtils.getString(map.get("containerCode")));
inventoryTransaction.setMaterialCode(DataUtils.getString(map.get("materialCode")));
inventoryTransaction.setMaterialName(DataUtils.getString(map.get("materialName")));
|
|
555
556
|
inventoryTransaction.setMaterialSpec(DataUtils.getString(map.get("materialSpec")));//物料规格
inventoryTransaction.setMaterialUnit(DataUtils.getString(map.get("materialUnit")));//物料单位
|
|
557
|
inventoryTransaction.setBillCode(DataUtils.getString(map.get("receiptCode")));
|
|
558
|
inventoryTransaction.setBillDetailId(DataUtils.getInteger(map.get("receiptDetailId")));
|
|
559
560
|
inventoryTransaction.setBatch(DataUtils.getString(map.get("batch")));
inventoryTransaction.setLot(DataUtils.getString(map.get("lot")));
|
|
561
|
// inventoryTransaction.setManufactureDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("manufactureDate").toString()));//生产日期
|
|
562
|
// inventoryTransaction.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));
|
|
563
|
inventoryTransaction.setInventorySts(DataUtils.getString((map.get("inventorySts"))));
|
|
564
|
inventoryTransaction.setTaskQty(DataUtils.getBigDecimal(map.get("qty")));
|
|
565
566
|
inventoryTransaction.setCreated(new Date());
inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
|
|
567
568
|
if (!inventoryTransactionService.save(inventoryTransaction))
throw new ServiceException("新增库存记录失败");
|
|
569
570
571
572
573
574
|
//修改任务明细的状态为完成
TaskDetail taskDetail = new TaskDetail();
taskDetail.setStatus(100);
taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
taskDetail.setAgingDate(new Date()); //入库时间
LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
|
|
575
|
lambdaUpdateWrapper.eq(TaskDetail::getTaskId,task.getId());
|
|
576
|
taskDetailService.update(taskDetail, lambdaUpdateWrapper);
|
|
577
578
579
|
if ( !taskDetailService.update(taskDetail, lambdaUpdateWrapper)){
throw new ServiceException("修改入库单明细失败");
}
|
|
580
|
|
|
581
|
//修改任务主表状态,因为立库任务表单头只对应一个货箱,表单详情的任务会同时完成
|
|
582
583
584
585
586
|
task.setStatus(100);
task.setLastUpdatedBy(ShiroUtils.getLoginName());
task.setLastUpdated(new Date());
LambdaUpdateWrapper<TaskHeader> taskHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
taskHeaderLambdaUpdateWrapper.eq(TaskHeader::getId, task.getId());
|
|
587
588
|
if (!taskHeaderService.update(task, taskHeaderLambdaUpdateWrapper))
throw new ServiceException("更新任务主表失败");
|
|
589
590
591
|
//修改库位状态和对应的容器
Location location = new Location();
|
|
592
593
|
location.setContainerCode(task.getContainerCode());
location.setStatus("empty");
|
|
594
|
LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
|
|
595
|
locationLambdaUpdateWrapper.eq(Location::getCode, task.getToLocation());
|
|
596
|
if (!locationService.update(location,locationLambdaUpdateWrapper))
|
|
597
|
throw new ServiceException("更新库位失败");
|
|
598
599
600
|
//修改容器状态和对应的库位
Container container = new Container();
|
|
601
|
container.setLocationCode(task.getToLocation());
|
|
602
|
container.setStatus("some");
|
|
603
|
LambdaUpdateWrapper<Container> containerLambdaUpdateWrapper = Wrappers.lambdaUpdate();
|
|
604
|
containerLambdaUpdateWrapper.eq(Container::getCode, task.getContainerCode());
|
|
605
|
if (!containerService.update(container, containerLambdaUpdateWrapper)){
|
|
606
|
throw new ServiceException("更新容器失败");
|
|
607
608
|
}
//修改组盘表状态为20
|
|
609
|
ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
|
|
610
|
receiptContainerDetail.setStatus(30);
|
|
611
612
613
|
receiptContainerDetail.setProcessStamp("0");
receiptContainerDetail.setLastUpdated(new Date());
receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
|
|
614
|
LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
|
|
615
|
receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId, DataUtils.getInteger(map.get("receiptId")));
|
|
616
617
|
if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
throw new ServiceException("更新组盘状态失败");
|
|
618
|
|
|
619
620
621
622
623
624
625
626
627
628
629
630
|
//修改入库组盘头表状态
ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
receiptContainerHeader.setId(task.getAllocationHeadId());
receiptContainerHeader.setLastUpdated(new Date());
receiptContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
receiptContainerHeader.setStatus((short) 20);
if (!receiptContainerHeaderService.updateById(receiptContainerHeader)){
throw new ServiceException("更新入库组盘头表状态失败");
}
|
|
631
632
|
//修改入库单状态
ReceiptHeader receiptHeader = new ReceiptHeader();
|
|
633
634
|
receiptHeader.setFirstStatus(800);
receiptHeader.setLastStatus(800);
|
|
635
636
637
638
|
receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
receiptHeader.setLastUpdated(new Date());
LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId,DataUtils.getInteger(map.get("receiptId")));
|
|
639
640
|
if (!receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper))
throw new ServiceException("更新入库头表状态失败");
|
|
641
|
|
|
642
643
|
}
|
|
644
|
}
|
|
645
|
return AjaxResult.success("完成入库任务");
|
|
646
|
}
|
|
647
648
649
650
651
652
|
// @Override
// public List<Map<String, Object>> getReceiptTask(Integer taskId) {
// return taskHeaderMapper.getReceiptTask(taskId) ;
// }
|
|
653
|
/**
|
|
654
|
* 生成
|
|
655
|
* 立库移库
|
|
656
|
*/
|
|
657
|
@Transactional
|
|
658
|
public AjaxResult createTransferTask(String sourceLocation, String destinationLocation) {
|
|
659
|
|
|
660
661
|
//源库位校验
Location temp1 = new Location();
|
|
662
|
temp1.setCode(sourceLocation);
|
|
663
664
665
|
temp1.setWarehouseCode(ShiroUtils.getWarehouseCode());
LambdaQueryWrapper<Location> lambda1 = Wrappers.lambdaQuery();
Location loc1 = locationService.getOne(lambda1);
|
|
666
667
|
if (loc1 == null) {
return AjaxResult.error("源库位:" + sourceLocation + "未找到");
|
|
668
|
}
|
|
669
670
|
if (!loc1.getStatus().equals("empty")) {
return AjaxResult.error("源库位:" + sourceLocation + "状态非空闲");
|
|
671
|
}
|
|
672
673
|
if (StringUtils.isEmpty(loc1.getContainerCode())) {
return AjaxResult.error("源库位:" + sourceLocation + "不存在托盘");
|
|
674
675
676
|
}
//这里增加组盘校验,如果此托盘存在未完成的组盘数据,则不能移库
//校验入库组盘
|
|
677
678
679
|
int count1 = inventoryHeaderService.getUncompleteReceiptContainer(sourceLocation, ShiroUtils.getWarehouseCode());
if (count1 > 0) {
return AjaxResult.error("源库位:" + sourceLocation + "存在入库组盘,不能移库");
|
|
680
|
}
|
|
681
682
683
|
int count2 = inventoryHeaderService.getUncompleteShipmentContainer(sourceLocation, ShiroUtils.getWarehouseCode());
if (count2 > 0) {
return AjaxResult.error("源库位:" + sourceLocation + "存在出库组盘,不能移库");
|
|
684
|
}
|
|
685
|
//目的库位校验
|
|
686
|
Location temp2 = new Location();
|
|
687
|
temp2.setWarehouseCode(ShiroUtils.getWarehouseCode());
|
|
688
|
temp2.setCode(destinationLocation);
|
|
689
690
|
LambdaQueryWrapper<Location> lambdaQueryWrapper2 = Wrappers.lambdaQuery(temp2);
Location loc2 = locationService.getOne(lambdaQueryWrapper2);
|
|
691
692
|
if (loc2 == null) {
return AjaxResult.error("目标库位:" + destinationLocation + "未找到");
|
|
693
|
}
|
|
694
695
|
if (!loc2.getStatus().equals("empty")) {
return AjaxResult.error("目标库位:" + destinationLocation + "状态非空闲");
|
|
696
|
}
|
|
697
698
|
if (StringUtils.isNotEmpty(loc2.getContainerCode())) {
return AjaxResult.error("目标库位:" + destinationLocation + "已存在托盘");
|
|
699
|
}
|
|
700
701
702
|
int count3 = inventoryHeaderService.getUncompleteReceiptContainer(destinationLocation, ShiroUtils.getWarehouseCode());
if (count3 > 0) {
return AjaxResult.error("目标库位:" + sourceLocation + "存在入库组盘,不能移库");
|
|
703
|
}
|
|
704
705
706
707
|
//写入任务主表和明细表
TaskHeader taskHeader = new TaskHeader();
taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
taskHeader.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));//获取第一个货主
|
|
708
|
taskHeader.setInternalTaskType(500);
|
|
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
|
taskHeader.setTaskType(800);
taskHeader.setContainerCode(loc1.getContainerCode());
taskHeader.setStatus(1);
taskHeader.setFromLocation(sourceLocation);
taskHeader.setToLocation(destinationLocation);
taskHeader.setCreated(new Date());
taskHeader.setCreatedBy(ShiroUtils.getLoginName());
taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
taskHeader.setLastUpdated(new Date());
taskHeaderMapper.insert(taskHeader);
//写入明细表
TaskDetail taskDetail = new TaskDetail();
taskDetail.setTaskId(taskHeader.getId());//主单ID
taskDetail.setTaskType(taskHeader.getTaskType());
taskDetail.setInternalTaskType(taskHeader.getTaskType());
taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
taskDetail.setCompanyCode(taskDetail.getCompanyCode());
taskDetail.setFromLocation(sourceLocation);
taskDetail.setToLocation(destinationLocation);
taskDetail.setContainerCode(taskHeader.getContainerCode());
taskDetail.setCreated(new Date());
taskDetail.setCreatedBy(ShiroUtils.getLoginName());
taskDetail.setLastUpdated(new Date());
taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
taskDetailService.save(taskDetail);
|
|
736
737
738
|
//更新货位状态为预定
loc1.setStatus("lock");
loc2.setStatus("lock");
|
|
739
740
741
742
743
744
745
746
|
locationService.saveOrUpdate(loc1);
locationService.saveOrUpdate(loc2);
return AjaxResult.success(taskHeader.getId());
}
/**
* 完成移库任务
|
|
747
|
*
|
|
748
749
|
* @param task
*/
|
|
750
|
@Transactional
|
|
751
|
public void completeTransferTask(TaskHeader task) {
|
|
752
753
754
755
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
|
//找到任务明细
TaskDetail taskDetail = new TaskDetail();
taskDetail.setTaskId(task.getId());
taskDetail.setWarehouseCode(task.getWarehouseCode());
taskDetail.setCompanyCode(task.getCompanyCode());
taskDetail.setContainerCode(task.getContainerCode());
LambdaQueryWrapper<TaskDetail> taskDetailLW = Wrappers.lambdaQuery(taskDetail);
taskDetail = taskDetailService.getOne(taskDetailLW);
//更新库存主表和明细的库位,更改更新用户和时间
InventoryHeader inventoryHeader = new InventoryHeader();
//主表
inventoryHeader.setWarehouseCode(taskDetail.getWarehouseCode());
inventoryHeader.setCompanyCode(taskDetail.getCompanyCode());
inventoryHeader.setContainerCode(taskDetail.getContainerCode());
inventoryHeader.setLocationCode(taskDetail.getFromLocation());//通过源库位查找库存
LambdaQueryWrapper<InventoryHeader> inventoryHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(inventoryHeader);
inventoryHeader = inventoryHeaderService.getOne(inventoryHeaderLambdaQueryWrapper);
inventoryHeader.setLocationCode(taskDetail.getToLocation());//把目的库位写入库存
inventoryHeader.setLastUpdated(new Date());
inventoryHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
inventoryHeaderService.saveOrUpdate(inventoryHeader);//修改主表库位
//明细表
List<InventoryDetail> inventoryDetails = new ArrayList<>();
InventoryDetail inventoryDetail = new InventoryDetail();
inventoryDetail.setWarehouseCode(inventoryHeader.getWarehouseCode());
inventoryDetail.setCompanyCode(inventoryHeader.getCompanyCode());
inventoryDetail.setInventoryHeaderId(inventoryHeader.getId());
LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery(inventoryDetail);
|
|
781
|
List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
|
|
782
783
|
/*同时写入库存交易表*/
List<InventoryTransaction> inventoryTransactionList = new ArrayList<>();
|
|
784
|
for (InventoryDetail item : inventoryDetailList) {
|
|
785
786
787
788
|
item.setLocationCode(inventoryHeader.getLocationCode());//修改明细表库位
item.setLastUpdated(new Date());
item.setLastUpdatedBy(ShiroUtils.getLoginName());
inventoryDetails.add(item);
|
|
789
|
/*----------*/
|
|
790
791
792
793
794
795
796
797
798
799
|
InventoryTransaction inventoryTransaction = new InventoryTransaction();
inventoryTransaction.setWarehouseCode(task.getWarehouseCode());
inventoryTransaction.setLocationCode(taskDetail.getToLocation());
inventoryTransaction.setContainerCode(taskDetail.getContainerCode());
inventoryTransaction.setTransactionType(50);
inventoryTransaction.setMaterialCode(item.getMaterialCode());
inventoryTransaction.setManufactureDate(item.getManufactureDate());
inventoryTransaction.setMaterialName(item.getMaterialName());
inventoryTransaction.setMaterialSpec(item.getMaterialSpec());
inventoryTransaction.setMaterialUnit(item.getMaterialUnit());
|
|
800
|
inventoryTransaction.setTaskQty(BigDecimal.ZERO);
|
|
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
|
inventoryTransaction.setInventorySts(item.getInventorySts());
//inventoryTransaction.setReferCode();
//inventoryTransaction.setQcCheck();
inventoryTransaction.setReferDetailId(item.getId().toString());
inventoryTransaction.setBatch(item.getBatch());
inventoryTransaction.setLot(item.getLot());
inventoryTransaction.setProjectNo(item.getProjectNo());
inventoryTransaction.setWeight(item.getWeight());
inventoryTransaction.setManufactureDate(item.getManufactureDate());
inventoryTransaction.setExpirationDate(item.getExpirationDate());
inventoryTransaction.setAgingDate(item.getCreated());
inventoryTransaction.setAttributeId(item.getAttributeId());
inventoryTransaction.setAttribute1(item.getAttribute1());
inventoryTransaction.setAttribute2(item.getAttribute2());
inventoryTransaction.setAttribute3(item.getAttribute3());
inventoryTransaction.setCreated(new Date());
inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
//inventoryTransaction.setLockCode();
inventoryTransaction.setBillCode(item.getInventoryHeaderId().toString());
inventoryTransaction.setBillDetailId(item.getId());
inventoryTransaction.setSupplierCode(item.getSupplierCode());
inventoryDetailList.add(inventoryDetail);
}
|
|
824
|
if (inventoryDetailService.saveOrUpdateBatch(inventoryDetails)) {
|
|
825
826
|
//更新库存明细成功后,写入库存交易
inventoryTransactionService.saveBatch(inventoryTransactionList);
|
|
827
|
} else {
|
|
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
|
throw new ServiceException("库存明细更新错误!");
}
//更新托盘、库位状态
Location temp1 = new Location(); //源库位
temp1.setCode(taskDetail.getFromLocation());
temp1.setWarehouseCode(ShiroUtils.getWarehouseCode());
LambdaQueryWrapper<Location> lambdaQueryWrapper1 = Wrappers.lambdaQuery(temp1);
Location loc1 = locationService.getOne(lambdaQueryWrapper1);
Location temp2 = new Location();//目的库位
temp2.setCode(taskDetail.getToLocation());
temp2.setWarehouseCode(ShiroUtils.getWarehouseCode());
LambdaQueryWrapper<Location> lambdaQueryWrapper2 = Wrappers.lambdaQuery(temp2);
Location loc2 = locationService.getOne(lambdaQueryWrapper2);
loc2.setContainerCode(loc1.getContainerCode());
loc2.setStatus("empty");
loc1.setContainerCode("");
loc1.setStatus("empty");
locationService.saveOrUpdate(loc1);
locationService.saveOrUpdate(loc2);
//更新taskHeader状态
task.setStatus(100);
task.setLastUpdatedBy(ShiroUtils.getLoginName());
task.setLastUpdated(new Date());
taskHeaderService.saveOrUpdate(task);
//更新taskDetail状态
taskDetail.setStatus(100);
taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
taskDetail.setLastUpdated(new Date());
taskDetailService.saveOrUpdate(taskDetail);
|
|
860
861
|
}
|
|
862
|
/**
|
|
863
864
|
* 生成
* 出库查看
|
|
865
|
* 任务
|
|
866
|
*/
|
|
867
868
869
870
|
@Override
@Transactional
public AjaxResult createCheckOutTask(String[] ids) {
|
|
871
872
|
for (String id : ids) {
InventoryHeader inventoryHeader = inventoryHeaderService.getById(Integer.parseInt(id));
|
|
873
|
//校验库位是否锁定
|
|
874
875
876
877
878
879
|
//检查库位容器
Location temp = new Location();
temp.setCode(inventoryHeader.getLocationCode());
temp.setWarehouseCode(inventoryHeader.getWarehouseCode());
LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery(temp);
Location loc = locationService.getOne(lambdaQueryWrapper);
|
|
880
|
if (loc == null) {
|
|
881
882
|
throw new ServiceException("库存没有库位!");
}
|
|
883
884
|
if (!loc.getStatus().equals("empty")) {
throw new ServiceException(inventoryHeader.getLocationCode() + "状态非空闲,操作失败");
|
|
885
|
}
|
|
886
887
|
if (StringUtils.isEmpty(loc.getContainerCode())) {
throw new ServiceException(inventoryHeader.getLocationCode() + "没有容器,操作失败");
|
|
888
889
890
891
892
893
894
|
}
//通过库存头,找到库存明细
InventoryDetail inventoryDetail = new InventoryDetail();
inventoryDetail.setWarehouseCode(inventoryHeader.getWarehouseCode());
inventoryDetail.setCompanyCode(inventoryHeader.getCompanyCode());
inventoryDetail.setInventoryHeaderId(inventoryHeader.getId());
LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery(inventoryDetail);
|
|
895
|
List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
|
|
896
897
898
899
900
|
//写入任务主表
TaskHeader taskHeader = new TaskHeader();
taskHeader.setWarehouseCode(inventoryHeader.getWarehouseCode());
taskHeader.setCompanyCode(inventoryHeader.getCompanyCode());//货主
|
|
901
|
taskHeader.setInternalTaskType(400);
|
|
902
903
904
905
906
907
908
909
910
911
912
913
|
taskHeader.setTaskType(900);
taskHeader.setContainerCode(inventoryHeader.getContainerCode());
taskHeader.setStatus(1);
taskHeader.setFromLocation(inventoryHeader.getLocationCode());
taskHeader.setToLocation(inventoryHeader.getLocationCode());
taskHeader.setCreated(new Date());
taskHeader.setCreatedBy(ShiroUtils.getLoginName());
taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
taskHeader.setLastUpdated(new Date());
taskHeaderMapper.insert(taskHeader);
//分拆库存明细,并写入任务细表
List<TaskDetail> taskDetails = new ArrayList<>();
|
|
914
|
for (InventoryDetail item : inventoryDetailList) {
|
|
915
|
|
|
916
917
918
919
920
921
922
923
924
925
926
927
928
929
|
TaskDetail taskDetail = new TaskDetail();
taskDetail.setTaskId(taskHeader.getId());//主单ID
taskDetail.setTaskType(taskHeader.getTaskType());
taskDetail.setInternalTaskType(taskHeader.getTaskType());
taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
taskDetail.setCompanyCode(item.getCompanyCode());
taskDetail.setFromLocation(taskHeader.getFromLocation());
taskDetail.setToLocation(taskHeader.getToLocation());
taskDetail.setContainerCode(taskHeader.getContainerCode());
taskDetail.setCreated(new Date());
taskDetail.setCreatedBy(ShiroUtils.getLoginName());
taskDetail.setLastUpdated(new Date());
taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
taskDetails.add(taskDetail);
|
|
930
931
932
|
}
if (taskDetailService.saveBatch(taskDetails)) {
//锁定库位状态
|
|
933
|
locationService.updateStatus(inventoryHeader.getLocationCode(), "lock");
|
|
934
935
936
|
} else {
throw new ServiceException("出库查看任务明细生成失败!");
}
|
|
937
|
|
|
938
939
940
|
}
return AjaxResult.success("出库查看任务生成成功!");
}
|
|
941
|
|
|
942
|
/**
|
|
943
|
* 完成
|
|
944
|
* 出库查看
|
|
945
|
* 更新状态即可
|
|
946
|
*/
|
|
947
948
|
@Transactional
@Override
|
|
949
|
public AjaxResult completeSeeOutTask(TaskHeader taskHeader) {
|
|
950
951
952
953
954
955
956
957
958
959
|
taskHeader.setStatus(100);
taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
taskHeader.setLastUpdated(new Date()); //更新时间
//task更新明细单总的状态
TaskDetail taskDetail = new TaskDetail();
taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
taskDetail.setTaskType(taskHeader.getTaskType());
taskDetail.setTaskId(taskHeader.getId());
LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail);
List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单
|
|
960
961
|
List<TaskDetail> list = new CopyOnWriteArrayList<>();
for(TaskDetail item:taskDetailList){
|
|
962
963
964
|
item.setStatus(100);
item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
item.setLastUpdated(new Date()); //更新时间
|
|
965
|
list.add(item);
|
|
966
|
}
|
|
967
968
|
if (taskDetailService.saveOrUpdateBatch(list) == false ||
taskHeaderService.saveOrUpdate(taskHeader) == false) {
|
|
969
970
|
throw new ServiceException("任务单据状态更新失败!");
}
|
|
971
972
|
//释放库位状态
locationService.updateStatus(taskHeader.getFromLocation(), "empty");
|
|
973
974
975
976
|
return AjaxResult.success("完成出库查看任务");
}
/**
|
|
977
978
979
980
981
982
983
|
* 盘点完成
* @param taskHeader
* @return
*/
@Transactional
@Override
public AjaxResult completeCycleCountTask(TaskHeader taskHeader){
|
|
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
|
/*盘点完成,传入任务主单,查出任务明细,通过任务明细查找盘点的明细单,
完成任务同时,修改盘点细单和主单的状态,完成后库存锁复位*/
//修改任务主单状态
taskHeader.setStatus(100);
taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
taskHeader.setLastUpdated(new Date()); //更新时间
//task更新明细单状态
TaskDetail taskDetail = new TaskDetail();
taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
taskDetail.setTaskType(taskHeader.getTaskType());
taskDetail.setTaskId(taskHeader.getId());
LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail);
List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单
List<TaskDetail> list = new CopyOnWriteArrayList<>();
//修改任务明细状态的同时查找到盘点明细的条目并修改状态,最后修改主单状态
List<CycleCountDetail> cycleCountDetailList = new CopyOnWriteArrayList<>();
for(TaskDetail item:taskDetailList){
item.setStatus(100);
item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
item.setLastUpdated(new Date()); //更新时间
list.add(item);
|
|
1005
|
|
|
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
|
CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(item.getBillDetailId());//盘点明细
cycleCountDetail.setEnableStatus(100);
cycleCountDetail.setCompletedBy(ShiroUtils.getLoginName());
cycleCountDetail.setCompletedAt(new Date());
cycleCountDetailList.add(cycleCountDetail);
//取消库存盘点锁
InventoryDetail inventoryDetail = inventoryDetailService.getById(cycleCountDetail.getInventoryDetailId());
inventoryDetail.setLockCode("");
inventoryDetailService.saveOrUpdate(inventoryDetail);
}
if ( taskHeaderService.saveOrUpdate(taskHeader) == false ||
taskDetailService.saveOrUpdateBatch(list) == false ||
cycleCountDetailService.saveOrUpdateBatch(cycleCountDetailList) == false) {
throw new ServiceException("盘点任务单据状态更新失败!");
}
//更新主单状态
cycleCountHeaderService.updataHeaderStatus(cycleCountDetailList.get(0).getCycleCountHeadCode());
//释放库位
locationService.updateStatus(cycleCountDetailList.get(0).getLocationCode(), "empty");
return AjaxResult.success("完成盘点任务");
|
|
1026
1027
1028
1029
|
}
/**
|
|
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
|
* 完成空托盘入库任务
* @param taskHeader
*/
@Transactional
public void completeEmptyIn(TaskHeader taskHeader) {
//完成任务,修改主单和明细状态
taskHeader.setStatus(100);
taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
taskHeader.setLastUpdated(new Date());
//taskHeaderService.saveOrUpdate(taskHeader);
//taskDetail更新明细单总的状态
TaskDetail taskDetail = new TaskDetail();
taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
taskDetail.setTaskType(taskHeader.getTaskType());
taskDetail.setTaskId(taskHeader.getId());
LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail);
List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单
for (TaskDetail item : taskDetailList) {
item.setStatus(100);
item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
item.setLastUpdated(new Date()); //更新时间
taskDetailList.add(item);
}
|
|
1054
1055
|
if (taskDetailService.saveOrUpdateBatch(taskDetailList) == false ||
taskHeaderService.saveOrUpdate(taskHeader) == false) {
|
|
1056
1057
|
throw new ServiceException("任务单据状态更新失败!");
}
|
|
1058
1059
1060
1061
|
//解锁容器,更新库位
containerService.updateLocationCodeAndStatus(taskHeader.getContainerCode(),taskHeader.getToLocation(),"empty");
//解锁库位,更新容器
locationService.updateContainerCodeAndStatus(taskHeader.getToLocation(),taskHeader.getContainerCode(),"empty");
|
|
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
|
}
/**
* 完成空托盘出库任务
* @param taskHeader
*/
@Transactional
public void completeEmptyOut(TaskHeader taskHeader) {
taskHeader.setStatus(100);
taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
taskHeader.setLastUpdated(new Date());
//taskHeaderService.saveOrUpdate(taskHeader);
//taskDetail更新明细单总的状态
TaskDetail taskDetail = new TaskDetail();
taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
taskDetail.setTaskType(taskHeader.getTaskType());
taskDetail.setTaskId(taskHeader.getId());
LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail);
List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单
for (TaskDetail item : taskDetailList) {
item.setStatus(100);
item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
item.setLastUpdated(new Date()); //更新时间
taskDetailList.add(item);
}
if (taskDetailService.saveOrUpdateBatch(taskDetailList) == false || taskHeaderService.saveOrUpdate(taskHeader) == false) {
throw new ServiceException("任务单据状态更新失败!");
}
|
|
1092
1093
1094
1095
1096
|
//更新货位
locationService.updateContainerCodeAndStatus(taskHeader.getFromLocation(), "", "empty");
//更新容器信息
containerService.updateLocationCodeAndStatus(taskHeader.getContainerCode(), "", "empty");
|
|
1097
1098
|
}
|
|
1099
1100
1101
1102
1103
1104
|
/**
* 创建上架任务
* @param ids
* @return
*/
@Override
|
|
1105
|
@Transactional
|
|
1106
|
public AjaxResult createReceiptTask(List<Integer> ids) {
|
|
1107
|
for (Integer id : ids) {
|
|
1108
1109
1110
|
ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(id);
if (receiptContainerHeader == null)
throw new ServiceException("任务不存在!");
|
|
1111
|
if (!receiptContainerHeader.getWarehouseCode().equals(ShiroUtils.getWarehouseCode()))
|
|
1112
|
throw new ServiceException("任务不在当前仓库!");
|
|
1113
1114
1115
1116
1117
1118
1119
1120
1121
|
//锁定容器
Container container = new Container();
container.setStatus("lock");
LambdaUpdateWrapper<Container> containerUpdateWrapper = Wrappers.lambdaUpdate();
containerUpdateWrapper.eq(Container::getCode, receiptContainerHeader.getContainerCode());
containerService.update(container, containerUpdateWrapper);
//查询入库组盘明细
|
|
1122
|
LambdaQueryWrapper<ReceiptContainerDetail> containerDetailLambda = Wrappers.lambdaQuery();
|
|
1123
|
containerDetailLambda.eq(ReceiptContainerDetail::getReceiptContainerId, id);
|
|
1124
|
List<ReceiptContainerDetail> list = receiptContainerDetailService.list(containerDetailLambda);
|
|
1125
|
|
|
1126
1127
1128
1129
|
if (list.size() < 1)
throw new ServiceException("没有组盘明细,请先组盘!");
if (receiptContainerHeader.getStatus() == 0) {
if (receiptContainerHeader.getStatus().intValue() < 10) {
|
|
1130
|
receiptContainerHeader.setStatus((short) 10);
|
|
1131
1132
1133
1134
|
receiptContainerHeaderService.updateById(receiptContainerHeader);
}
//添加任务主表
TaskHeader task = new TaskHeader();
|
|
1135
|
task.setAllocationHeadId(receiptContainerHeader.getId());
|
|
1136
|
task.setInternalTaskType(100);
|
|
1137
1138
1139
1140
1141
1142
1143
|
task.setWarehouseCode(receiptContainerHeader.getWarehouseCode());
task.setCompanyCode(receiptContainerHeader.getCompanyCode());
task.setFromLocation(receiptContainerHeader.getFromLocation());
task.setTaskType(Integer.valueOf(receiptContainerHeader.getTaskType()));
task.setFromLocation(receiptContainerHeader.getFromLocation());
task.setToLocation(receiptContainerHeader.getToLocation());
task.setContainerCode(receiptContainerHeader.getContainerCode());
|
|
1144
|
task.setRecvDock(receiptContainerHeader.getRecvDock());
|
|
1145
1146
|
task.setCreated(new Date());
task.setCreatedBy(ShiroUtils.getLoginName());
|
|
1147
1148
1149
1150
1151
|
if (this.save(task)){
//添加任务明细表
for(ReceiptContainerDetail item : list) {
TaskDetail taskDetail = new TaskDetail();
taskDetail.setTaskId(task.getId());
|
|
1152
|
taskDetail.setTaskType(Integer.valueOf(receiptContainerHeaderService.getById(item.getReceiptContainerId()).getTaskType()));
|
|
1153
1154
|
taskDetail.setInternalTaskType(100);
taskDetail.setWarehouseCode(task.getWarehouseCode());
|
|
1155
|
taskDetail.setAllocationId(item.getReceiptId());
|
|
1156
1157
1158
1159
1160
1161
1162
|
taskDetail.setCompanyCode(task.getCompanyCode());
taskDetail.setCompanyCode(task.getCompanyCode());
taskDetail.setMaterialCode(item.getMaterialCode());
taskDetail.setMaterialName(item.getMaterialName());
taskDetail.setBillCode(item.getReceiptCode());
taskDetail.setBillDetailId(item.getReceiptDetailId());
taskDetail.setBillCode(item.getReceiptCode());
|
|
1163
|
taskDetail.setQty(item.getQty());
|
|
1164
1165
1166
1167
1168
1169
1170
1171
|
taskDetail.setContainerCode(task.getContainerCode());
taskDetail.setFromLocation(task.getFromLocation());
taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
taskDetail.setBatch(item.getBatch());
if (!taskDetailService.save(taskDetail)){
throw new ServiceException("生成任务明细失败");
}
|
|
1172
1173
|
//更新入库组盘明细状态
item.setStatus(10);
|
|
1174
1175
1176
|
if (!receiptContainerDetailService.updateById(item)){
throw new ServiceException("更新入库组盘明细状态出错");
}
|
|
1177
|
|
|
1178
|
ReceiptDetail receiptDetail = receiptDetailService.getById(item.getReceiptDetailId());
|
|
1179
1180
1181
1182
|
ReceiptDetail detail = receiptDetailService.queryflow(receiptDetail);
if (!receiptDetailService.updateById(detail)){
throw new ServiceException("更新入库单详情失败");
|
|
1183
|
}
|
|
1184
1185
1186
|
//更新头表状态
receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
|
|
1187
|
}
|
|
1188
1189
|
} else {
throw new ServiceException("生成任务头表失败");
|
|
1190
1191
1192
|
}
}
}
|
|
1193
|
return AjaxResult.success("生成上架任务成功!");
|
|
1194
|
}
|
|
1195
|
|
|
1196
1197
1198
1199
1200
|
/**
*
* 完成出库任务
* */
@Override
|
|
1201
|
@Transactional
|
|
1202
1203
1204
1205
1206
1207
1208
|
public void completeShipmentTask(TaskHeader task) {
//获取所有子任务
TaskDetail condition = new TaskDetail();
condition.setTaskId(task.getId());
LambdaQueryWrapper<TaskDetail> lambdaQueryWrapper = Wrappers.lambdaQuery(condition);
List<TaskDetail> taskDetails = taskDetailService.list(lambdaQueryWrapper);
List<Integer> shipmentHeadIds = new ArrayList<>();
|
|
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
|
for(TaskDetail taskDetail : taskDetails){
if(taskDetail.getStatus()<20){
//获取出库子货箱
ShipmentContainerDetail shipmentContainerDetail = shipmentContainerDetailService.getById(taskDetail.getAllocationId());
//取出子单据
ShipmentDetail shipmentDetail = shipmentDetailService.getById(taskDetail.getBillDetailId());
//暂存id,为更新单据状态准备
shipmentHeadIds.add(shipmentDetail.getShipmentId());
//获取对应库存记录
InventoryDetail inventoryDetail = inventoryDetailService.getById(taskDetail.getToInventoryId());
if (inventoryDetail == null) {
throw new ServiceException("任务明细对应的库存ID【" + taskDetail.getToInventoryId().toString() + "】不存在!");
}
BigDecimal orignalQty = inventoryDetail.getQty();
|
|
1223
1224
1225
1226
|
//减扣库存单
InventoryHeader inventoryHeader = inventoryHeaderService.getById(inventoryDetail.getInventoryHeaderId());
inventoryHeader.setTotalQty(inventoryDetail.getQty().subtract(taskDetail.getQty()).intValue());
//扣减库存明细
|
|
1227
1228
1229
1230
1231
|
inventoryDetail.setTaskQty(inventoryDetail.getTaskQty().subtract(taskDetail.getQty()));
inventoryDetail.setQty(inventoryDetail.getQty().subtract(taskDetail.getQty()));
if(inventoryDetail.getQty().compareTo(new BigDecimal("0"))==0 && inventoryDetail.getTaskQty().compareTo(new BigDecimal("0"))==0){
//如果库存没有了,就删除这个库存
inventoryDetailService.removeById(inventoryDetail.getId());
|
|
1232
|
inventoryHeaderService.removeById(inventoryHeader.getId());
|
|
1233
1234
1235
|
}else {
//否则更新这个库存
inventoryDetailService.updateById(inventoryDetail);
|
|
1236
|
inventoryHeaderService.updateById(inventoryHeader);
|
|
1237
1238
1239
1240
|
}
//设置子任务状态为已执行
taskDetail.setStatus(100);
taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
|
|
1241
|
taskDetail.setLastUpdated(new Date());//完成时间
|
|
1242
1243
1244
1245
1246
1247
1248
1249
1250
|
taskDetailService.updateById(taskDetail);
//记录库存交易记录
InventoryTransaction inventoryTransaction = new InventoryTransaction();
inventoryTransaction.setWarehouseCode(task.getWarehouseCode());
inventoryTransaction.setCompanyCode(shipmentDetail.getCompanyCode());
inventoryTransaction.setLocationCode(inventoryDetail.getLocationCode());
inventoryTransaction.setContainerCode(inventoryDetail.getContainerCode());
inventoryTransaction.setTransactionType(20);
inventoryTransaction.setMaterialCode(shipmentDetail.getMaterialCode());
|
|
1251
1252
1253
|
inventoryTransaction.setMaterialName(shipmentDetail.getMaterialName());
inventoryTransaction.setMaterialSpec(shipmentDetail.getMaterialSpec());
inventoryTransaction.setMaterialUnit(shipmentDetail.getMaterialUnit());
|
|
1254
1255
1256
1257
|
inventoryTransaction.setBillCode(taskDetail.getBillCode());
inventoryTransaction.setBillDetailId(shipmentDetail.getId());
inventoryTransaction.setBatch(shipmentDetail.getBatch());
inventoryTransaction.setLot(shipmentDetail.getLot());
|
|
1258
1259
1260
|
inventoryTransaction.setProjectNo(shipmentDetail.getProjectNo());
inventoryTransaction.setQcCheck(inventoryDetail.getQcCheck());
inventoryTransaction.setSupplierCode(inventoryDetail.getSupplierCode());
|
|
1261
1262
1263
1264
|
inventoryTransaction.setManufactureDate(shipmentDetail.getManufactureDate());
inventoryTransaction.setExpirationDate(shipmentDetail.getExpirationDate());
inventoryTransaction.setInventorySts(inventoryDetail.getInventorySts());
//这里取反,更符合出库的语义,同时方便对记录进行统计
|
|
1265
|
inventoryTransaction.setTaskQty(taskDetail.getQty());
|
|
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
|
// inventoryTransaction.setCostPrice(shipmentDetail.);
inventoryTransaction.setCreated(null);
inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
inventoryTransactionService.save(inventoryTransaction);
// //更新单据状态
// shipmentHeaderService.updateShipmentStatus(shipmentHeader.getId());
}
}
//设置主任务为已执行
task.setStatus(100);
task.setLastUpdatedBy(ShiroUtils.getLoginName());
task.setLastUpdated(new Date());
taskHeaderService.updateById(task);
|
|
1279
1280
|
|
|
1281
|
//将库位状态改为空闲,如果是整出的对应的容器也清空
|
|
1282
1283
|
LambdaQueryWrapper<Location> lam=Wrappers.lambdaQuery();
|
|
1284
|
lam.eq(Location::getCode,task.getFromLocation());
|
|
1285
1286
1287
1288
|
Location locationRecord = locationService.getOne(lam);
if(lam == null){
throw new ServiceException("系统没有"+task.getToLocation()+"库位");
}
|
|
1289
1290
1291
1292
|
locationRecord.setStatus("empty");
if(task.getTaskType()==300) {
locationRecord.setContainerCode("");
}
|
|
1293
|
locationService.updateById(locationRecord);
|
|
1294
|
//如果是整出,删掉这个库位上的这个托盘,否则更改托盘状态
|
|
1295
1296
1297
1298
1299
1300
|
LambdaQueryWrapper<Container> containerLam = Wrappers.lambdaQuery();
containerLam.eq(Container::getCode,task.getContainerCode());
Container ctn = containerService.getOne(containerLam);
if(ctn == null){
throw new ServiceException("系统无此容器");
}
|
|
1301
|
if(task.getTaskType()==300) {
|
|
1302
1303
1304
1305
1306
1307
1308
1309
|
if(ctn.getContainerType().equals("LS")){
Boolean flag = containerService.removeById(ctn.getId());
if(flag == false){
throw new ServiceException("删除临时容器失败");
}
}else {
containerService.updateLocationCodeAndStatus(task.getContainerCode(), "", "empty");
}
|
|
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
|
}
else{
//查询是否存在关联的库存,入如果没有就修改容器状态为empty
InventoryDetail inventoryCondition = new InventoryDetail();
inventoryCondition.setLocationCode(task.getToLocation());
LambdaQueryWrapper<InventoryDetail> inventoryDetaillambdaQueryWrapper = Wrappers.lambdaQuery();
inventoryDetaillambdaQueryWrapper.eq(InventoryDetail::getLocationCode,task.getToLocation());
List<InventoryDetail> detailList= inventoryDetailService.list();
//库存查询不到该容器就把容器状态改为可用
if (detailList.size()<1) {
Container container =new Container();
container.setCode(task.getToLocation());
condition.setToLocation("");
LambdaUpdateWrapper<Container> containerLambdaUpdateWrapper = Wrappers.lambdaUpdate();
containerLambdaUpdateWrapper.eq(Container::getCode,task.getToLocation());
containerService.update(containerLambdaUpdateWrapper);
}
}
|
|
1328
|
//设置出库货箱状态为拣货任务完成
|
|
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
|
for(TaskDetail taskDetail : taskDetails) {
ShipmentContainerDetail shipmentContainerDetail = new ShipmentContainerDetail();
shipmentContainerDetail.setStatus(30);
shipmentContainerDetail.setLastUpdated(new Date());
shipmentContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
LambdaUpdateWrapper<ShipmentContainerDetail> shipmentContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
shipmentContainerDetailLambdaUpdateWrapper.eq(ShipmentContainerDetail::getId, taskDetail.getAllocationId());
if (!shipmentContainerDetailService.update(shipmentContainerDetail, shipmentContainerDetailLambdaUpdateWrapper)) {
throw new ServiceException("更新组盘明细状态失败");
}
|
|
1339
1340
|
}
//设置出库货箱表头状态为拣货任务完成
|
|
1341
1342
1343
1344
1345
1346
|
ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader();
shipmentContainerHeader.setStatus(30);
shipmentContainerHeader.setLastUpdated(new Date());
shipmentContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
LambdaUpdateWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
shipmentContainerHeaderLambdaUpdateWrapper.eq(ShipmentContainerHeader::getId,task.getAllocationHeadId());
|
|
1347
|
if (! shipmentContainerHeaderService.update(shipmentContainerHeader, shipmentContainerHeaderLambdaUpdateWrapper)) {
|
|
1348
|
throw new ServiceException("更新组盘头状态失败");
|
|
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
|
}
//修改出库单状态
LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
HashSet<Integer> ids = new HashSet<>();
for (TaskDetail taskDeatails: taskDetailList) {
LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId, taskDeatails.getBillDetailId());
ShipmentDetail shipmentDetail = shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper);
if (shipmentDetail == null) {
throw new ServiceException("查找出库单明细失败");
}
if (shipmentDetail.getShipQty().compareTo(shipmentDetail.getRequestQty()) == 0) {
shipmentDetail.setStatus(500);
shipmentDetailService.updateById(shipmentDetail);
}
ids.add(shipmentDetail.getShipmentId());
}
for(Integer id : ids) {
ShipmentHeader shipmentHeader = shipmentHeaderService.getById(id);
if(shipmentHeader != null) {
Map<String,Integer> status = shipmentDetailService.selectStatus(shipmentHeader.getId());
Integer maxStatus = status.get("maxStatus");
Integer minStatus = status.get("minStatus");
if(maxStatus == 500){
shipmentHeader.setFirstStatus(500);
}
if(minStatus == 500) {
shipmentHeader.setLastStatus(500);
}
shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
shipmentHeader.setLastUpdated(new Date());
shipmentHeaderService.updateById(shipmentHeader);
}
}
|
|
1388
|
|
|
1389
1390
|
}
|
|
1391
|
|
|
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
|
|
|
1407
|
}
|