|
1
2
|
package com.huaheng.pc.shipment.shipmentContainerHeader.service;
|
|
3
4
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
5
|
import com.huaheng.common.constant.QuantityConstant;
|
|
6
|
import com.huaheng.common.exception.service.ServiceException;
|
|
7
|
import com.huaheng.common.utils.StringUtils;
|
|
8
9
|
import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.web.domain.AjaxResult;
|
|
10
|
import com.huaheng.framework.web.domain.RetCode;
|
|
11
12
|
import com.huaheng.pc.config.container.domain.Container;
import com.huaheng.pc.config.container.service.ContainerService;
|
|
13
14
15
16
|
import com.huaheng.pc.config.location.domain.Location;
import com.huaheng.pc.config.location.service.LocationService;
import com.huaheng.pc.config.material.domain.Material;
import com.huaheng.pc.config.material.service.MaterialService;
|
|
17
|
import com.huaheng.pc.config.shipmentPreference.service.ShipmentPreferenceService;
|
|
18
19
|
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
|
|
20
|
import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
|
|
21
22
|
import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
|
|
23
24
25
26
27
28
29
|
import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentCombinationModel;
import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
|
|
30
31
|
import com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch;
import com.huaheng.pc.shipment.shippingCombination.service.ShippingCombinationService;
|
|
32
33
|
import com.huaheng.pc.shipment.wave.domain.Wave;
import com.huaheng.pc.shipment.wave.service.WaveService;
|
|
34
35
|
import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
|
|
36
|
import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
|
|
37
|
import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
|
|
38
|
import com.huaheng.pc.task.taskHeader.service.ShipmentTaskService;
|
|
39
|
import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
|
|
40
|
import io.swagger.models.auth.In;
|
|
41
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
42
43
|
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
|
|
44
|
import java.math.BigDecimal;
|
|
45
|
import java.util.ArrayList;
|
|
46
|
import java.util.List;
|
|
47
48
|
import java.util.Map;
|
|
49
50
51
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
import com.huaheng.pc.shipment.shipmentContainerHeader.mapper.ShipmentContainerHeaderMapper;
|
|
52
53
|
import org.springframework.transaction.annotation.Transactional;
|
|
54
55
56
|
@Service
public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentContainerHeaderMapper, ShipmentContainerHeader> implements ShipmentContainerHeaderService{
|
|
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
@Autowired
private ShipmentDetailService shipmentDetailService;
@Autowired
private InventoryDetailService inventoryDetailService;
@Autowired
private LocationService locationService;
@Autowired
private ShipmentHeaderService shipmentHeaderService;
@Resource
private ShipmentContainerHeaderMapper shipmentContainerHeaderMapper;
@Autowired
private ShipmentContainerDetailService shipmentContainerDetailService;
@Autowired
private MaterialService materialService;
|
|
71
72
|
@Autowired
private ShippingCombinationService shippingCombinationService;
|
|
73
74
|
@Autowired
private TaskHeaderService taskHeaderService;
|
|
75
76
|
@Autowired
private TaskDetailService taskDetailService;
|
|
77
78
|
@Autowired
private WaveService waveService;
|
|
79
80
|
@Autowired
private ShipmentPreferenceService shipmentPreferenceService;
|
|
81
82
|
@Autowired
private ContainerService containerService;
|
|
83
84
|
@Resource
private ShipmentTaskService shipmentTaskService;
|
|
85
86
|
@Autowired
private ReceiptContainerHeaderService receiptContainerHeaderService;
|
|
87
88
89
90
91
92
93
94
95
96
|
@Override
public Map<String, Integer> getShipmentContainerMaxAndMinStatusByShipmentID(int shipmentId) {
return shipmentContainerHeaderMapper.getShipmentContainerMaxAndMinStatusByShipmentID(shipmentId);
}
/**
|
|
97
98
99
100
101
102
103
104
|
* 1.检查基本属性
* 2.更改库存明细
* 3.更新单据明细的已出库数量
* 4.自动判定出库任务状态,根据库存数量减去预定库存相等就是整盘出--预计任务状态
* 5.增加出库组盘头
* 6.增加出库组盘明细
* 7.更新单据状态
*
|
|
105
106
107
108
109
110
|
* 出库组盘单条保存
* @param shipmentCombinationModel
* @return
*/
@Transactional
@Override
|
|
111
|
public ShipmentContainerHeader combination(ShipmentCombinationModel shipmentCombinationModel) {
|
|
112
|
|
|
113
|
//1.检查基本属性
|
|
114
115
|
//校验
if(shipmentCombinationModel.getShipQty().compareTo(new BigDecimal("0")) <= 0){
|
|
116
|
throw new ServiceException("出库数量必须大于0");
|
|
117
118
|
}
ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentCombinationModel.getShipmentDetailId());
|
|
119
|
if(shipmentDetail == null){
|
|
120
|
throw new ServiceException("出库明细未找到");
|
|
121
122
|
}
InventoryDetail inventoryDetail = inventoryDetailService.getById((shipmentCombinationModel.getInventoryDetailId()));
|
|
123
|
if(inventoryDetail == null){
|
|
124
|
throw new ServiceException("库存未找到");
|
|
125
|
}
|
|
126
127
128
129
130
|
String containerCode = inventoryDetail.getContainerCode();
int unCompleteCombineNumber = receiptContainerHeaderService.getUnCompleteCombineNumber(containerCode);
if(unCompleteCombineNumber > 0) {
throw new ServiceException("托盘:" + containerCode + " 已经用于入库组盘");
}
|
|
131
132
|
//校验数量是否超出
if((shipmentDetail.getShipQty().subtract(shipmentDetail.getRequestQty())).compareTo(shipmentCombinationModel.getShipQty())<0){
|
|
133
|
throw new ServiceException("录入数量超出明细待出数量");
|
|
134
135
|
}
//校验库存可用数量
|
|
136
|
if(inventoryDetail.getQty().subtract(inventoryDetail.getTaskQty()).compareTo(shipmentCombinationModel.getShipQty())<0){
|
|
137
|
throw new ServiceException("录入数量超出可出数量");
|
|
138
139
|
}
if(!shipmentDetail.getMaterialCode().equals(inventoryDetail.getMaterialCode())){
|
|
140
|
throw new ServiceException("配盘物料不一致");
|
|
141
142
143
144
145
146
|
}
//库位
LambdaQueryWrapper<Location> lambdaQueryWrapper= Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(Location::getWarehouseCode,inventoryDetail.getWarehouseCode())
.eq(Location::getCode,inventoryDetail.getLocationCode());
Location location = locationService.getOne(lambdaQueryWrapper);
|
|
147
148
149
|
if (location == null) {
throw new ServiceException("库位 " + inventoryDetail.getLocationCode() + " 不存在");
}
|
|
150
|
|
|
151
|
//2.更新库存分配数
|
|
152
153
|
inventoryDetail.setTaskQty(inventoryDetail.getTaskQty().add(shipmentCombinationModel.getShipQty()));
inventoryDetailService.saveOrUpdate(inventoryDetail);
|
|
154
|
//3.更新单据明细的已出库数量
|
|
155
156
157
|
shipmentDetail.setRequestQty(shipmentDetail.getRequestQty().add(shipmentCombinationModel.getShipQty()));
int i = shipmentDetail.getShipQty().compareTo(shipmentDetail.getRequestQty());
if(i > 0){
|
|
158
|
shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_WAVE);
|
|
159
|
}else if(i == 0) {
|
|
160
|
shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_GROUPDISK);
|
|
161
|
}else if(i < 0) {
|
|
162
163
164
165
166
167
168
|
throw new ServiceException("出库数量不能大于单据数量!");
}
shipmentDetailService.saveOrUpdate(shipmentDetail);
//自动判定出库任务状态,根据库存数量减去预定库存相等就是整盘出--预计任务状态
BigDecimal inventoryQty = inventoryDetail.getQty().subtract(inventoryDetail.getTaskQty());
if(inventoryQty.compareTo(new BigDecimal(0)) <= 0) {
|
|
169
|
shipmentCombinationModel.setTaskType(QuantityConstant.TASK_TYPE_WHOLESHIPMENT);
|
|
170
|
} else {
|
|
171
|
shipmentCombinationModel.setTaskType(QuantityConstant.TASK_TYPE_SORTINGSHIPMENT);
|
|
172
173
|
}
|
|
174
175
176
|
//5.增加出库组盘头
ShipmentContainerHeader shipmentContainerHeader = ShipmentContainerHeaderAdd(location, shipmentDetail);
//6.增加出库组盘明细
|
|
177
|
ShipmentContainerDetail shipmentContainerDetail = ShipmentContainerDetailAdd(shipmentDetail, shipmentContainerHeader, shipmentCombinationModel);
|
|
178
|
//7.更新单据状态
|
|
179
180
|
shipmentHeaderService.updateShipmentStatus(shipmentDetail.getShipmentId());
|
|
181
|
return shipmentContainerHeader;
|
|
182
183
184
|
}
/**
|
|
185
186
187
188
|
* 组盘头
* 1.查看是否有状态小于等于20的组盘头,有就需新建组盘头,没有就新建
* 2.没有符合条件的组盘头,新建组盘头
*
|
|
189
|
* @param location
|
|
190
|
* @param shipmentDetail
|
|
191
192
193
|
* @return
*/
private ShipmentContainerHeader ShipmentContainerHeaderAdd(Location location,
|
|
194
195
|
ShipmentDetail shipmentDetail) {
//1.查看是否有状态小于等于20的组盘头,有就需新建组盘头,没有就新建
|
|
196
|
LambdaQueryWrapper<ShipmentContainerHeader> lambdaQueryWrapper=Wrappers.lambdaQuery();
|
|
197
198
|
lambdaQueryWrapper.eq(ShipmentContainerHeader::getLocationCode,location.getCode())
.eq(ShipmentContainerHeader::getContainerCode,location.getContainerCode())
|
|
199
|
.eq(ShipmentContainerHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
|
|
200
|
.lt(ShipmentContainerHeader::getStatus,QuantityConstant.SHIPMENT_CONTAINER_FINISHED);
|
|
201
202
|
ShipmentContainerHeader shipmentContainerHeader = this.getOne(lambdaQueryWrapper);
if(shipmentContainerHeader != null) {
|
|
203
|
return shipmentContainerHeader;
|
|
204
205
|
}
else {
|
|
206
207
208
209
210
211
|
// 2.没有符合条件的组盘头,新建组盘头
//找到容器类型
LambdaQueryWrapper<Container> containerLam=Wrappers.lambdaQuery();
containerLam.eq(Container::getCode,location.getContainerCode())
.eq(Container::getWarehouseCode,ShiroUtils.getWarehouseCode());
Container container = containerService.getOne(containerLam);
|
|
212
|
if(container == null) {
|
|
213
214
|
throw new ServiceException("系统没有此容器编码");
}
|
|
215
216
217
218
219
220
221
222
223
224
|
LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getContainerCode, container.getCode());
List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
int taskType = QuantityConstant.TASK_TYPE_WHOLESHIPMENT;
if(inventoryDetailList != null && inventoryDetailList.size() > 0) {
for(InventoryDetail inventoryDetail : inventoryDetailList) {
if(inventoryDetail.getQty().subtract(inventoryDetail.getTaskQty()).
compareTo(BigDecimal.ZERO) > 0) {
taskType = QuantityConstant.TASK_TYPE_SORTINGSHIPMENT;
}
|
|
225
|
}
|
|
226
|
}
|
|
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
|
shipmentContainerHeader = new ShipmentContainerHeader();
shipmentContainerHeader.setContainerCode(location.getContainerCode());
shipmentContainerHeader.setLocationCode(location.getCode());
shipmentContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
shipmentContainerHeader.setCompanyCode(shipmentDetail.getCompanyCode());
shipmentContainerHeader.setPort(shipmentDetail.getPort());
shipmentContainerHeader.setContainerType(container.getContainerType());
shipmentContainerHeader.setStatus(QuantityConstant.SHIPMENT_CONTAINER_BUILD);
shipmentContainerHeader.setTaskType(taskType);
shipmentContainerHeader.setTaskCreated(0);
shipmentContainerHeader.setCreatedBy(ShiroUtils.getLoginName());
Boolean flag = this.save(shipmentContainerHeader);
if (flag == false) {
throw new ServiceException("新建组盘头失败,sql错误");
}
return shipmentContainerHeader;
}
|
|
244
245
246
|
}
/**
|
|
247
248
249
250
251
252
|
* 组盘明细
* 1.查看是否有同一出库明细的物料需要出库
* 2.有时修改阻盘明细的出库数量就行
* 3.没有就新建明细
* 4。查看组盘头状态,如果状态在10到20,则生成任务明细或修改任务明细的数量
*
|
|
253
254
255
256
257
258
259
260
|
* @param shipmentDetail
* @param shipmentContainerHeader
* @param shipmentCombinationModel
* @return
*/
private ShipmentContainerDetail ShipmentContainerDetailAdd(ShipmentDetail shipmentDetail,
ShipmentContainerHeader shipmentContainerHeader,
ShipmentCombinationModel shipmentCombinationModel) {
|
|
261
262
263
|
Boolean flag =true;
//1.查看是否有同一出库明细的物料需要出库
|
|
264
|
LambdaQueryWrapper<ShipmentContainerDetail> lambdaQueryWrapper=Wrappers.lambdaQuery();
|
|
265
266
267
268
269
270
|
lambdaQueryWrapper.eq(ShipmentContainerDetail::getShippingContainerId, shipmentContainerHeader.getId())
.eq(ShipmentContainerDetail::getLocationCode, shipmentContainerHeader.getLocationCode())
.eq(ShipmentContainerDetail::getContainerCode, shipmentContainerHeader.getContainerCode())
.eq(ShipmentContainerDetail::getShipmentDetailId, shipmentCombinationModel.getShipmentDetailId())
.eq(ShipmentContainerDetail::getInventoryId, shipmentCombinationModel.getInventoryDetailId())
.eq(ShipmentContainerDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
|
|
271
|
ShipmentContainerDetail shipmentContainerDetail = shipmentContainerDetailService.getOne(lambdaQueryWrapper);
|
|
272
273
274
|
ShipmentContainerDetail shipmentContainerDetaill = new ShipmentContainerDetail();
//2.有时修改阻盘明细的出库数量就行
|
|
275
276
|
if(shipmentContainerDetail != null) {
shipmentContainerDetail.setQty(shipmentContainerDetail.getQty().add(shipmentCombinationModel.getShipQty()));
|
|
277
278
279
280
|
flag=shipmentContainerDetailService.saveOrUpdate(shipmentContainerDetail);
if(flag == false){
throw new ServiceException("修改组盘明细失败,sql错误");
}
|
|
281
|
}
|
|
282
|
else {
|
|
283
|
|
|
284
|
//3.没有就新建明细
|
|
285
286
287
288
|
LambdaQueryWrapper<Material> lam=Wrappers.lambdaQuery();
lam.eq(Material::getCode,shipmentDetail.getMaterialCode())
.eq(Material::getWarehouseCode,ShiroUtils.getWarehouseCode());
Material material = materialService.getOne(lam);
|
|
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
|
if (material == null) {
throw new ServiceException("出库单(" + shipmentDetail.getShipmentCode() + ")的物料(" + shipmentDetail.getMaterialCode() + ")不存在!");
}
shipmentContainerDetaill.setWarehouseCode(shipmentContainerHeader.getWarehouseCode());
shipmentContainerDetaill.setCompanyCode(shipmentContainerHeader.getCompanyCode());
shipmentContainerDetaill.setContainerCode(shipmentContainerHeader.getContainerCode());
shipmentContainerDetaill.setLocationCode(shipmentContainerHeader.getLocationCode());
shipmentContainerDetaill.setInventoryId(shipmentCombinationModel.getInventoryDetailId());
shipmentContainerDetaill.setInventorySts(shipmentDetail.getInventorySts());
shipmentContainerDetaill.setShippingContainerId(shipmentContainerHeader.getId());
shipmentContainerDetaill.setShipmentCode(shipmentDetail.getShipmentCode());
shipmentContainerDetaill.setShipmentId(shipmentDetail.getShipmentId());
shipmentContainerDetaill.setShipmentDetailId(shipmentDetail.getId());
shipmentContainerDetaill.setMaterialCode(shipmentDetail.getMaterialCode());
shipmentContainerDetaill.setMaterialName(shipmentDetail.getMaterialName());
shipmentContainerDetaill.setMaterialSpec(shipmentDetail.getMaterialSpec());
shipmentContainerDetaill.setMaterialUnit(shipmentDetail.getMaterialUnit());
shipmentContainerDetaill.setQty(shipmentCombinationModel.getShipQty());
shipmentContainerDetaill.setWaveId(shipmentDetail.getWaveId());
shipmentContainerDetaill.setTaskCreated(0);
|
|
309
|
shipmentContainerDetaill.setStatus(QuantityConstant.SHIPMENT_CONTAINER_BUILD);
|
|
310
311
312
313
|
shipmentContainerDetaill.setBatch(shipmentDetail.getBatch());
shipmentContainerDetaill.setLot(shipmentDetail.getLot());
shipmentContainerDetaill.setProjectNo(shipmentDetail.getProjectNo());
shipmentContainerDetaill.setCreatedBy(ShiroUtils.getLoginName());
|
|
314
|
flag = shipmentContainerDetailService.save(shipmentContainerDetaill);
|
|
315
316
317
|
if(flag == false){
throw new ServiceException("新建组盘明细失败,sql错误");
}
|
|
318
|
}
|
|
319
|
|
|
320
|
//4.查看组盘头状态,如果状态在10到30,则生成任务明细或修改任务明细的数量
|
|
321
|
//查看任务头
|
|
322
323
324
|
int containerHeaderStatus = shipmentContainerHeader.getStatus().intValue();
if(QuantityConstant.SHIPMENT_CONTAINER_TASK <= containerHeaderStatus &&
containerHeaderStatus < QuantityConstant.SHIPMENT_CONTAINER_FINISHED){
|
|
325
326
|
LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper=Wrappers.lambdaQuery();
taskHeaderLambdaQueryWrapper.eq(TaskHeader::getWarehouseCode,shipmentContainerHeader.getWarehouseCode())
|
|
327
|
.in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_SORTINGSHIPMENT, QuantityConstant.TASK_TYPE_WHOLESHIPMENT)
|
|
328
|
.eq(TaskHeader::getAllocationHeadId,shipmentContainerHeader.getId());
|
|
329
330
|
TaskHeader taskHeader=taskHeaderService.getOne(taskHeaderLambdaQueryWrapper);
if(taskHeader==null){
|
|
331
|
throw new ServiceException("有相同的组盘头,但找不到相应的任务头");
|
|
332
|
}
|
|
333
334
335
336
337
338
339
340
|
if(shipmentContainerDetaill == null) {
//shipmentContainerDetaill为空时,说明组盘明细不是新建,so修改任务明细
//查找任务明细
LambdaQueryWrapper<TaskDetail> taskDetailLam = Wrappers.lambdaQuery();
taskDetailLam.eq(TaskDetail::getWarehouseCode,shipmentContainerDetail.getWarehouseCode())
.eq(TaskDetail::getAllocationId,shipmentContainerDetail.getId())
.eq(TaskDetail::getTaskId,taskHeader.getId())
|
|
341
|
.in(TaskDetail::getTaskType, QuantityConstant.TASK_TYPE_SORTINGSHIPMENT, QuantityConstant.TASK_TYPE_WHOLESHIPMENT);
|
|
342
343
344
345
346
347
348
349
350
|
TaskDetail taskDetail = taskDetailService.getOne(taskDetailLam);
if(taskDetail == null){
throw new ServiceException("找不到对应的任务明细");
}
taskDetail.setQty(taskDetail.getQty().add(shipmentCombinationModel.getShipQty()));
flag=taskDetailService.saveOrUpdate(taskDetail);
if(flag == false){
throw new ServiceException("修改任务明细失败,sql错误");
}
|
|
351
|
}else {
|
|
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
|
//shipmentContainerDetaill不为空时,说明组盘明细是新建,so新建任务明细
TaskDetail taskDetail = new TaskDetail();
taskDetail.setTaskId(taskHeader.getId());
taskDetail.setInternalTaskType(taskHeader.getInternalTaskType());
taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
taskDetail.setCompanyCode(taskHeader.getCompanyCode());
taskDetail.setTaskType(taskHeader.getTaskType());
taskDetail.setAllocationId(shipmentContainerDetaill.getId());
taskDetail.setBillCode(shipmentContainerDetaill.getShipmentCode());
taskDetail.setBillDetailId(shipmentContainerDetaill.getShipmentDetailId());
taskDetail.setMaterialCode(shipmentContainerDetaill.getMaterialCode());
taskDetail.setMaterialName(shipmentContainerDetaill.getMaterialName());
taskDetail.setMaterialSpec(shipmentContainerDetaill.getMaterialSpec());
taskDetail.setMaterialUnit(shipmentContainerDetaill.getMaterialUnit());
taskDetail.setFromInventoryId(shipmentContainerDetaill.getInventoryId());
taskDetail.setQty(shipmentContainerDetaill.getQty());
taskDetail.setContainerCode(taskHeader.getContainerCode());
taskDetail.setFromLocation(taskHeader.getFromLocation());
taskDetail.setToLocation(taskHeader.getToLocation());
taskDetail.setLot(shipmentContainerDetaill.getLot());
taskDetail.setWaveId(shipmentContainerDetaill.getWaveId());
taskDetail.setBatch(shipmentContainerDetaill.getBatch());
|
|
374
|
taskDetail.setProjectNo(shipmentContainerDetaill.getProjectNo());
|
|
375
|
if (shipmentContainerHeader.getStatus().equals(QuantityConstant.SHIPMENT_CONTAINER_TASK)) {
|
|
376
|
taskDetail.setStatus(QuantityConstant.TASK_STATUS_BUILD);
|
|
377
|
} else {
|
|
378
|
taskDetail.setStatus(QuantityConstant.TASK_STATUS_RELEASE);
|
|
379
380
381
382
383
384
385
|
}
taskDetail.setCreatedBy(ShiroUtils.getLoginName());
taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
flag = taskDetailService.save(taskDetail);
if(flag == false){
throw new ServiceException("新建任务明细失败,sql错误");
}
|
|
386
387
|
}
}
|
|
388
389
390
|
return shipmentContainerDetail;
}
|
|
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
|
/**
* 取消组盘的一组明细
* @param detailIds
* @return
*/
@Override
public AjaxResult cancelCombinationDetail(List<Integer> detailIds) {
List<ShipmentContainerDetail> shipmentContainerDetails = new ArrayList<>();
for(int detailId:detailIds){
ShipmentContainerDetail shipmentContainerDetail = shipmentContainerDetailService.getById(detailId);
shipmentContainerDetails.add(shipmentContainerDetail);
}
return cancelCombinationDetailInner(shipmentContainerDetails);
}
/**
* 取消组盘的一组明细
* @param shipmentContainerDetails
* @return
*/
@Override
@Transactional
public AjaxResult cancelCombinationDetailInner(List<ShipmentContainerDetail> shipmentContainerDetails) {
for(ShipmentContainerDetail shipmentContainerDetail:shipmentContainerDetails){
//获取头
ShipmentContainerHeader shipmentContainerHeader = this.getById(shipmentContainerDetail.getShippingContainerId());
|
|
418
|
if(shipmentContainerHeader.getStatus()>= QuantityConstant.SHIPMENT_CONTAINER_TASK){
|
|
419
420
421
422
423
424
425
426
427
428
|
return AjaxResult.error("容器"+shipmentContainerHeader.getContainerCode()+"非新建状态,不允许取消明细");
}
//恢复占用库存
InventoryDetail inventoryDetail = inventoryDetailService.getById(shipmentContainerDetail.getInventoryId());
inventoryDetail.setTaskQty(inventoryDetail.getTaskQty().subtract(shipmentContainerDetail.getQty()));
inventoryDetailService.saveOrUpdate(inventoryDetail);
//恢复单据发货数量
ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentContainerDetail.getShipmentDetailId());
shipmentDetail.setRequestQty(shipmentDetail.getRequestQty().subtract(shipmentContainerDetail.getQty()));
if(shipmentDetail.getRequestQty().compareTo(BigDecimal.ZERO) != 0 ){
|
|
429
|
shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_WAVE);//明细状态恢复,如果删除后还有以出数量就是波次
|
|
430
|
}else{
|
|
431
|
shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_POOL );//明细状态
|
|
432
433
434
435
436
437
438
439
440
441
442
|
}
shipmentDetailService.saveOrUpdate(shipmentDetail);
//删除这个配盘明细
shipmentContainerDetailService.removeById(shipmentContainerDetail.getId());
//查询头表下还有没有明细,如果没有,则删了这个头表
ShipmentContainerDetail condition = new ShipmentContainerDetail();
condition.setShippingContainerId(shipmentContainerDetail.getShippingContainerId());
List<Map<String, Object>> list= shipmentContainerDetailService.selectListMapByEqual("id", condition);
if(list==null||list.size() == 0){
this.removeById(shipmentContainerHeader.getId());
|
|
443
444
|
locationService.updateStatus(shipmentContainerHeader.getLocationCode(),
QuantityConstant.STATUS_LOCATION_EMPTY);
|
|
445
446
447
448
449
450
451
|
}
//更新单据状态
shipmentHeaderService.updateShipmentStatus(shipmentDetail.getShipmentId());
}
return AjaxResult.success("");
}
|
|
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
|
/**
* 取消组盘
* @param shipmentContainerIds
* @return
*/
@Override
public AjaxResult cancelCombination(List<Integer> shipmentContainerIds) {
AjaxResult result = checkForCancelCombination(shipmentContainerIds);
if(result.getCode()!= RetCode.SUCCESS.getValue()){
return result;
}
for(int id : shipmentContainerIds){
LambdaQueryWrapper<ShipmentContainerDetail> lambdaQueryWrapper=Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(ShipmentContainerDetail::getShippingContainerId,id);
List<ShipmentContainerDetail> shipmentContainerDetails = shipmentContainerDetailService.list(lambdaQueryWrapper);
result = cancelCombinationDetailInner(shipmentContainerDetails);
if(result.hasErr()){
return result;
}
}
return AjaxResult.success("");
}
|
|
476
477
478
479
480
481
482
483
484
|
/**
* 出库自动组盘
* @param shipmentCode
* @return
*/
@Override
@Transactional
public AjaxResult autoCombination(String shipmentCode) {
|
|
485
486
487
488
489
490
491
|
LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLam = Wrappers.lambdaQuery();
shipmentHeaderLam.eq(ShipmentHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
.eq(ShipmentHeader::getCode,shipmentCode);
ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(shipmentHeaderLam);
if(shipmentHeader == null){
throw new ServiceException("系统没有此单据");
}
|
|
492
|
shipmentPreferenceService.checkShipmentProcess(shipmentHeader.getId().toString(),100,shipmentCode);
|
|
493
|
|
|
494
495
496
|
LambdaQueryWrapper<ShipmentDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(ShipmentDetail::getShipmentCode, shipmentCode)
.eq(ShipmentDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
|
|
497
|
List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(lambdaQueryWrapper);
|
|
498
|
if (shipmentDetailList.isEmpty()) {
|
|
499
500
|
return AjaxResult.error("找不到子单链");
}
|
|
501
502
503
504
505
|
for(ShipmentDetail shipmentDetail: shipmentDetailList){
if(shipmentDetail.getWaveId() != 0){
return AjaxResult.error(shipmentCode+"单号已加入波次"+shipmentDetail.getWaveId()+",无法自动组盘");
}
}
|
|
506
507
508
509
510
|
return this.autoCombination(shipmentDetailList);
}
//出库自动组盘
|
|
511
|
@Override
|
|
512
513
|
public AjaxResult autoCombination(List<ShipmentDetail> shipmentDetailList){
int num = 0;
|
|
514
|
List<Integer> list = new ArrayList<>();
|
|
515
516
517
|
for (ShipmentDetail item : shipmentDetailList) {
//获取需要出库数量
BigDecimal shipmentQty = item.getShipQty().subtract(item.getRequestQty());
|
|
518
519
520
521
|
String userDef1 = item.getUserDef1();
if (StringUtils.isNotEmpty(userDef1)) {
shipmentQty = new BigDecimal(userDef1);
}
|
|
522
523
524
525
526
|
//判断是否还有需要出库的物料,如果没有就跳过该物料
if (shipmentQty.compareTo(BigDecimal.ZERO) <= 0) {
continue;
}
|
|
527
|
List<InventoryDetail> inventoryList = shippingCombinationService.getInventorys(item);
|
|
528
|
//去除已锁的库存
|
|
529
530
531
532
|
ArrayList<InventoryDetail> removeInventoryList = new ArrayList<>();
List<TaskHeader> taskHeaderList = taskHeaderService.getUnCompleteTaskList();
List<ReceiptContainerHeader> receiptContainerHeaderList =
receiptContainerHeaderService.getUnCompleteCombineList();
|
|
533
534
|
boolean lock = false;
for (InventoryDetail inventoryDetail : inventoryList) {
|
|
535
536
537
538
539
|
LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
containerLambdaQueryWrapper.eq(Container::getCode, inventoryDetail.getContainerCode());
Container container = containerService.getOne(containerLambdaQueryWrapper);
if (QuantityConstant.STATUS_CONTAINER_LOCK.equals(container.getStatus())) {
removeInventoryList.add(inventoryDetail);
|
|
540
541
|
lock = true;
}
|
|
542
543
544
545
546
547
548
549
550
551
552
553
554
555
|
if(taskHeaderList != null) {
for(TaskHeader taskHeader : taskHeaderList) {
if(taskHeader.getContainerCode().equals(container.getCode())) {
removeInventoryList.add(inventoryDetail);
}
}
}
if(receiptContainerHeaderList != null) {
for(ReceiptContainerHeader receiptContainerHeader : receiptContainerHeaderList) {
if(receiptContainerHeader.getContainerCode().equals(container.getCode())) {
removeInventoryList.add(inventoryDetail);
}
}
}
|
|
556
|
}
|
|
557
|
inventoryList.removeAll(removeInventoryList);
|
|
558
559
560
561
|
if (inventoryList.size()<1 && lock){
return AjaxResult.success("明细id为"+item.getId()+"的物料所在托盘全部处于锁定状态,请完成或取消任务后再进行组盘");
}
|
|
562
|
if(inventoryList.size() < 1 && item.getWaveId() != 0){
|
|
563
|
Wave wave = waveService.getById(item.getWaveId());
|
|
564
565
566
|
wave.setStatus(QuantityConstant.WAVE_STATUS_ERROR);
wave.setCurrentWaveStep(QuantityConstant.WAVE_STEP_ERROR);
wave.setLastWaveStep(QuantityConstant.WAVE_STEP_BUILD);
|
|
567
|
waveService.updateById(wave);
|
|
568
|
throw new ServiceException("主单为"+item.getShipmentCode()+"子单id为"+item.getId() + "的单据没有库存,波次失败");
|
|
569
|
}
|
|
570
571
572
573
574
575
576
577
578
579
580
581
582
|
if (inventoryList.size() < 1) {
num = num + 1;
} else {
for (InventoryDetail inventory : inventoryList) {
//判断是否组盘完毕,完毕就退出内循环
if (shipmentQty.compareTo(BigDecimal.ZERO) <= 0) {
break;
}
BigDecimal inventoryQty = inventory.getQty().subtract(inventory.getTaskQty());
ShipmentCombinationModel shipmentCombination = new ShipmentCombinationModel();
shipmentCombination.setInventoryDetailId(inventory.getId());
shipmentCombination.setShipmentDetailId(item.getId());
|
|
583
|
shipmentCombination.setType((short) QuantityConstant.TASK_TYPE_WHOLESHIPMENT);
|
|
584
|
|
|
585
586
587
588
589
590
|
//如果库存数 >= 待出库数,组盘数就是待出库数并且结束组盘,否则组盘数就是库存数
if (inventoryQty.compareTo(shipmentQty) > -1) {
shipmentCombination.setShipQty(shipmentQty);
} else {
shipmentCombination.setShipQty(inventoryQty);
}
|
|
591
592
|
ShipmentContainerHeader shipmentContainerHeader=this.combination(shipmentCombination);
list.add(shipmentContainerHeader.getId());
|
|
593
594
595
596
|
shipmentQty = shipmentQty.subtract(shipmentCombination.getShipQty());
}
}
}
|
|
597
598
|
if(num == shipmentDetailList.size()){
|
|
599
|
throw new ServiceException("单据物料的库存分配规则在此库区没有库存,无法出库");
|
|
600
|
}
|
|
601
|
return AjaxResult.success("成功",list);
|
|
602
603
|
}
|
|
604
605
606
607
608
609
610
611
612
|
/**
* 检查是否可以进行取消配盘
* @param shipmentContainerIds
* @return
*/
@Override
public AjaxResult checkForCancelCombination(List<Integer> shipmentContainerIds) {
for(int id : shipmentContainerIds){
ShipmentContainerHeader shipmentContainerHeader = this.getById(id);
|
|
613
|
if(shipmentContainerHeader.getStatus()>=QuantityConstant.SHIPMENT_CONTAINER_TASK){
|
|
614
615
616
617
618
619
620
621
622
623
624
625
626
|
return AjaxResult.error("存在已生成任务的记录,请先取消任务再取消组盘");
}
}
return AjaxResult.success("");
}
/* 生成任务 */
@Override
@Transactional
public AjaxResult createTask(List<Integer> idList) {
ShipmentTaskCreateModel shipmentTask = new ShipmentTaskCreateModel();
for (Integer id : idList) {
shipmentTask.setShipmentContainerHeaderIds(id);
|
|
627
|
AjaxResult ajaxResult = shipmentTaskService.createTaskFromShipmentContainers(shipmentTask);
|
|
628
629
630
|
if(ajaxResult.hasErr()){
return ajaxResult;
}
|
|
631
632
633
634
|
}
return AjaxResult.success("全部生成完毕");
}
|
|
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
|
/**
* 取消出库任务
*/
@Override
@Transactional(rollbackFor = ServiceException.class)
public boolean cancelShipment(Integer combineHeaderId) {
// 回滚组盘主表状态
ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader();
shipmentContainerHeader.setId(combineHeaderId);
shipmentContainerHeader.setStatus(QuantityConstant.SHIPMENT_CONTAINER_BUILD);
if (!updateById(shipmentContainerHeader)){
throw new ServiceException("更新出库组盘头表失败");
}
// 回滚组盘明细状态
LambdaQueryWrapper<ShipmentContainerDetail> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(ShipmentContainerDetail::getShippingContainerId,combineHeaderId);
List<ShipmentContainerDetail> shipmentContainerDetailList = shipmentContainerDetailService.list(queryWrapper);
for (ShipmentContainerDetail shipmentContainerDetail : shipmentContainerDetailList) {
shipmentContainerDetail.setStatus(QuantityConstant.SHIPMENT_CONTAINER_BUILD);
}
if (!shipmentContainerDetailService.updateBatchById(shipmentContainerDetailList)){
throw new ServiceException("更新出库组盘明细失败");
}
return true;
}
|
|
661
662
663
664
665
666
667
668
669
670
|
@Override
public AjaxResult getShipmentInfoByCode(String code) {
LambdaQueryWrapper<ShipmentContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(ShipmentContainerDetail::getShipmentCode, code)
.eq(ShipmentContainerDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
List<ShipmentContainerDetail> shipmentContainerDetails = shipmentContainerDetailService.list(lambdaQueryWrapper);
return AjaxResult.success(shipmentContainerDetails);
}
|
|
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
|
@Override
public int getUnCompleteCombineNumber(String containerCode) {
LambdaQueryWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
shipmentContainerHeaderLambdaQueryWrapper.eq(ShipmentContainerHeader::getContainerCode, containerCode)
.lt(ShipmentContainerHeader::getStatus, QuantityConstant.SHIPMENT_CONTAINER_FINISHED);
int number = 0;
List<ShipmentContainerHeader> shipmentContainerHeaderList = list(shipmentContainerHeaderLambdaQueryWrapper);
if(shipmentContainerHeaderList != null && shipmentContainerHeaderList.size() > 0) {
number = shipmentContainerHeaderList.size();
}
return number;
}
@Override
public List<ShipmentContainerHeader> getUnCompleteCombineList() {
LambdaQueryWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
shipmentContainerHeaderLambdaQueryWrapper.lt(ShipmentContainerHeader::getStatus,
QuantityConstant.SHIPMENT_CONTAINER_FINISHED);
List<ShipmentContainerHeader> shipmentContainerHeaderList =
list(shipmentContainerHeaderLambdaQueryWrapper);
return shipmentContainerHeaderList;
}
|
|
694
|
}
|