12/19 界面优化1.0

dev_unify
wangwei 7 months ago
parent 68057172b7
commit b455c8c6c1

@ -95,10 +95,14 @@ public class IoCollectOrderBackupController extends BaseController {
response.setGgxh(response.getSpec()); response.setGgxh(response.getSpec());
} }
} }
List<CollectOrderBizResponse> collectOrderBizResponses1 = collectOrderBizResponses.stream().skip((collectOrderBizRequest.getPage()-1)*collectOrderBizRequest.getLimit()).limit(collectOrderBizRequest.getLimit()).
collect(Collectors.toList());
PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(collectOrderBizResponses); PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(collectOrderBizResponses);
PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(collectOrderBizResponses); pageSimpleResponse.setList(collectOrderBizResponses1);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }

@ -448,9 +448,8 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
} }
public List<CollectOrderBizResponse> setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) { public List<CollectOrderBizResponse> setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest); List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterListByBillNo(collectOrderBizRequest);
List<IoCollectCodeBackup> ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());; List<IoCollectCodeBackup> ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());;
List<CollectOrderBizResponse> collectOrderBizResponses = new ArrayList<>(); List<CollectOrderBizResponse> collectOrderBizResponses = new ArrayList<>();
for (CollectOrderBizResponse collectOrderBiz : list) { for (CollectOrderBizResponse collectOrderBiz : list) {
@ -469,6 +468,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
} }
collectOrderBizResponses.add(collectOrderBizResponse); collectOrderBizResponses.add(collectOrderBizResponse);
} }
return collectOrderBizResponses; return collectOrderBizResponses;
} }
} }

@ -163,5 +163,10 @@ public class IoCollectOrderBizBackupService extends ServiceImpl<IoCollectOrderBi
return list; return list;
} }
public List<CollectOrderBizResponse> filterListByBillNo(CollectOrderBizRequest collectOrderRequest) {
List<CollectOrderBizResponse> data = ioCollectOrderBizBackupMapper.filterList(collectOrderRequest);
return data;
}
} }

@ -341,42 +341,46 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
if (ioSplitFifoCodeEntities.size() < quotient) { if (ioSplitFifoCodeEntities.size() < quotient) {
if (isAuto) if (isAuto)
throw new JsonException(500, "提交失败,工位库存数量不足!"); throw new JsonException(500, "提交失败,工位库存数量不足!");
else return; // else return;
} }
for (int i = 0; i < quotient; i++) { if (ioSplitFifoCodeEntities.size() > 0){
IoSplitFifoCodeEntity splitFifoCodeEntity = ioSplitFifoCodeEntities.get(i); for (int i = 0; i < quotient; i++) {
collectOrderBiz.setUnTagCount(IntUtil.value(collectOrderBiz.getUnTagCount()) - IntUtil.value(udiRelevanceResponse.getBhxjsl())); IoSplitFifoCodeEntity splitFifoCodeEntity = ioSplitFifoCodeEntities.get(i);
collectOrderCodeAutoService.save(IoCollectOrderCodeAuto.builder() collectOrderBiz.setUnTagCount(IntUtil.value(collectOrderBiz.getUnTagCount()) - IntUtil.value(udiRelevanceResponse.getBhxjsl()));
.codeIdFk(splitFifoCodeEntity.getId()) collectOrderCodeAutoService.save(IoCollectOrderCodeAuto.builder()
.udiCode(splitFifoCodeEntity.getCode()) .codeIdFk(splitFifoCodeEntity.getId())
.orderIdFk(collectOrder.getBillNo()) .udiCode(splitFifoCodeEntity.getCode())
.batchNo(splitFifoCodeEntity.getBatchNo()) .orderIdFk(collectOrder.getBillNo())
.productDate(splitFifoCodeEntity.getProduceDate()) .batchNo(splitFifoCodeEntity.getBatchNo())
.expireDate(splitFifoCodeEntity.getExpireDate()) .productDate(splitFifoCodeEntity.getProduceDate())
.serialNo(splitFifoCodeEntity.getSerialNo()) .expireDate(splitFifoCodeEntity.getExpireDate())
.relId(collectOrderBiz.getRelId()) .serialNo(splitFifoCodeEntity.getSerialNo())
.bizIdFk(collectOrderBiz.getId()) .relId(collectOrderBiz.getRelId())
.fifoSplit(splitFifoCodeEntity.getFifoSplit()) .bizIdFk(collectOrderBiz.getId())
.createTime(new Date()) .fifoSplit(splitFifoCodeEntity.getFifoSplit())
.updateTime(new Date()) .createTime(new Date())
.build()); .updateTime(new Date())
splitFifoCodeService.removeById(splitFifoCodeEntity.getId()); .build());
IoSplitFifoInv splitFifoInv = splitFifoInvService.findByFifoCode(splitFifoCodeEntity); splitFifoCodeService.removeById(splitFifoCodeEntity.getId());
if (splitFifoInv != null) { IoSplitFifoInv splitFifoInv = splitFifoInvService.findByFifoCode(splitFifoCodeEntity);
splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(splitFifoCodeEntity.getTotalCount())); if (splitFifoInv != null) {
int lockCount = IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoCodeEntity.getTotalCount()); splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(splitFifoCodeEntity.getTotalCount()));
splitFifoInv.setLockCount(lockCount > 0 ? lockCount : 0); int lockCount = IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoCodeEntity.getTotalCount());
splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount())); splitFifoInv.setLockCount(lockCount > 0 ? lockCount : 0);
splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())); splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()));
splitFifoInvService.updateById(splitFifoInv); splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount()));
} splitFifoInvService.updateById(splitFifoInv);
}
}
} }
} }
//.如果拆零,拆零表扣除 //.如果拆零,拆零表扣除
if (remainder > 0) { if (remainder > 0) {
splitRemove(collectOrderBiz, collectOrder, putWorkPlaceCode, isAuto); splitRemove(collectOrderBiz, collectOrder, putWorkPlaceCode, isAuto);
} }
} }
ArrayList<IoCollectOrderBizBackup> ioCollectOrderBizBackups = new ArrayList<>(); ArrayList<IoCollectOrderBizBackup> ioCollectOrderBizBackups = new ArrayList<>();
for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs) { for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs) {

Loading…
Cancel
Save