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