UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_2.5_csconfilt' into dev_2.5_mutiscan

Browse Source 
# Conflicts:
#	src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
#	src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
#	src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
dev_2.5_mutiscan
yewj 7 months ago
parent 146638c6a3 e8b6397294
commit 08610634a4
13 changed files with 237 additions and 209 deletions
Show Stats Download Patch File Download Diff File

74
src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
Unescape Escape View File

@ -36,7 +36,6 @@ import com.glxp.api.service.inout.IoSplitCodeService;
import com.glxp.api.util.Excel.ExcelHandler;
import com.glxp.api.util.Excel.Exception.RenException;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.StringUtils;
import com.glxp.api.util.udi.FilterUdiUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@ -81,9 +80,7 @@ public class IoCollectOrderController extends BaseController {
request.setUserId(userId.toString());
page = basicCollectUserService.filterList(request);
if (page != null && page.size() > 0) {
workPlaceCodes = page.stream()
.map(UserWorkResponse::getWorkplaceId)
.collect(Collectors.toList());
workPlaceCodes = page.stream().map(UserWorkResponse::getWorkplaceId).collect(Collectors.toList());
}
//通过工位列表 获取出 业务列表
workBindBusTypeRequest.setWorkPlaceCodes(workPlaceCodes);
@ -99,9 +96,7 @@ public class IoCollectOrderController extends BaseController {
}
if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)) {
Set<String> uniqueDocumentTypeCodesLinkedHashSet = sysWorkplaceDocumentResponses.stream()
.map(SysWorkplaceDocumentResponse::getDocumentTypeCode)
.collect(Collectors.toCollection(LinkedHashSet::new));
Set<String> uniqueDocumentTypeCodesLinkedHashSet = sysWorkplaceDocumentResponses.stream().map(SysWorkplaceDocumentResponse::getDocumentTypeCode).collect(Collectors.toCollection(LinkedHashSet::new));
List<String> documentTypeCodes = new ArrayList<>(uniqueDocumentTypeCodesLinkedHashSet);
collectOrderRequest.setDocumentTypeCodes(documentTypeCodes);
@ -129,8 +124,7 @@ public class IoCollectOrderController extends BaseController {
request.setBusType(collectOrderRequest.getBusType());
request.setTagStatusList(List.of(1));
List<IoCollectOrderResponse> orderResponses = collectOrderService.filterList(request);
if (CollUtil.isNotEmpty(orderResponses))
return ResultVOUtils.success(orderResponses.get(0));
if (CollUtil.isNotEmpty(orderResponses)) return ResultVOUtils.success(orderResponses.get(0));
return ResultVOUtils.error(500, "该工位已无待处理单据");
}
@ -155,20 +149,17 @@ public class IoCollectOrderController extends BaseController {
request.setUpdateUser(getUserId());
request.setTagStatus(2);
List<IoCollectOrderResponse> orderResponses = collectOrderService.filterList(request);
if (CollUtil.isNotEmpty(orderResponses))
return ResultVOUtils.success(orderResponses.get(0));
if (CollUtil.isNotEmpty(orderResponses)) return ResultVOUtils.success(orderResponses.get(0));
else {
request.setTagStatus(-1);
orderResponses = collectOrderService.filterList(request);
if (CollUtil.isNotEmpty(orderResponses))
return ResultVOUtils.success(orderResponses.get(0));
if (CollUtil.isNotEmpty(orderResponses)) return ResultVOUtils.success(orderResponses.get(0));
else {
IoCollectSet collectSet = collectSetService.getSet();
if (IntUtil.value(collectSet.getAutoAllotOrder())) {
request.setTagStatus(1);
orderResponses = collectOrderService.filterList(request);
if (CollUtil.isNotEmpty(orderResponses))
return ResultVOUtils.success(orderResponses.get(0));
if (CollUtil.isNotEmpty(orderResponses)) return ResultVOUtils.success(orderResponses.get(0));
}
}
}
@ -193,13 +184,11 @@ public class IoCollectOrderController extends BaseController {
request.setLimit(1);
request.setBillNo(collectOrderRequest.getBillNo());
List<IoCollectOrderResponse> orderResponses = collectOrderService.filterList(request);
if (CollUtil.isNotEmpty(orderResponses))
return ResultVOUtils.success(orderResponses.get(0));
if (CollUtil.isNotEmpty(orderResponses)) return ResultVOUtils.success(orderResponses.get(0));
else {
request.setTagStatus(-1);
orderResponses = collectOrderService.filterList(request);
if (CollUtil.isNotEmpty(orderResponses))
return ResultVOUtils.success(orderResponses.get(0));
if (CollUtil.isNotEmpty(orderResponses)) return ResultVOUtils.success(orderResponses.get(0));
}
return ResultVOUtils.error(500, "未查到待处理单据");
}
@ -415,13 +404,24 @@ public class IoCollectOrderController extends BaseController {
@PostMapping("/udiwms/basic/collect/order/finish")
@Transactional(rollbackFor = Exception.class)
public BaseResponse saveFinishOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
List<String> billNos = new ArrayList<>();
if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) return ResultVOUtils.error(500, "单号不能为空！");
IoCollectOrder collectOrder = collectOrderService.getByBillNo(collectOrderRequest.getBillNo());
if (StrUtil.isNotEmpty(collectOrder.getSummaryNo())) {
billNos = collectOrderService.getBillBySummary(collectOrder.getSummaryNo());
} else {
billNos.add(collectOrderRequest.getBillNo());
}
boolean isAllTag = true;
if (!IntUtil.value(collectOrderRequest.getConfirmFinish())) {
//1.校验是否全部自动赋码
CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo());
List<CollectOrderBizResponse> collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest);
boolean isAllTag = true;
String msg = "";
for (String billNo : billNos) {
collectOrderBizRequest.setOrderIdFk(billNo);
List<CollectOrderBizResponse> collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest);
if (CollUtil.isNotEmpty(collectOrderBizResponses)) {
for (int i = 0; i < collectOrderBizResponses.size(); i++) {
CollectOrderBizResponse collectOrderBizResponse = collectOrderBizResponses.get(i);
@ -434,12 +434,24 @@ public class IoCollectOrderController extends BaseController {
}
}
}
}
if (!isAllTag) {
return ResultVOUtils.error(502, "该业务单据未全部赋码【" + msg.replaceAll(";$", "") + "】,是否强制完成单据？");
}
}
if (CollUtil.isNotEmpty(billNos)) {
List<IoCollectOrder> collectOrders = collectOrderService.list(new LambdaQueryWrapper<IoCollectOrder>().in(IoCollectOrder::getBillNo, billNos));
if (CollUtil.isNotEmpty(collectOrders)) {
for (IoCollectOrder temp : collectOrders) {
CollectOrderRequest tempRequest = new CollectOrderRequest();
BeanUtils.copyProperties(temp, tempRequest);
collectOrderService.finishOrder(tempRequest, getUser(), false);
}
}
} else {
collectOrderService.finishOrder(collectOrderRequest, getUser(), false);
}
return ResultVOUtils.success();
}
@ -453,9 +465,14 @@ public class IoCollectOrderController extends BaseController {
if (collectOrderRequest.getIsCheckFinish() != null) {
collectOrderBizRequest.setIsOrderCheck(collectOrderRequest.getIsCheckFinish());
}
IoCollectOrder collectOrder = collectOrderService.getByBillNo(collectOrderRequest.getBillNo());
if (StrUtil.isNotEmpty(collectOrder.getSummaryNo())) {
collectOrderBizRequest.setSummaryNo(collectOrder.getSummaryNo());
}
List<CollectOrderBizResponse> collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest);
boolean isAllTag = collectOrderBizResponses.stream()
.allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()) || obj.getAutoTagStatus() == 2);
boolean isAllTag = collectOrderBizResponses.stream().allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()) || obj.getAutoTagStatus() == 2);
}
collectOrderService.finishOrder(collectOrderRequest, getUser(), false);
return ResultVOUtils.success();
@ -480,8 +497,7 @@ public class IoCollectOrderController extends BaseController {
if (!IntUtil.value(collectSet.getGetSplitConfirm())) {
confirmOrderBiz.setSkipSplitConfirm(true);
}
ConfirmResponse splitInfo = splitCodeService.confirmBizAutiTagCode(confirmOrderBiz, confirmOrderBiz.getQueueCode(),
confirmOrderBiz.getConfirmSplitCode(), confirmOrderBiz.getSkipSplitConfirm());
ConfirmResponse splitInfo = splitCodeService.confirmBizAutiTagCode(confirmOrderBiz, confirmOrderBiz.getQueueCode(), confirmOrderBiz.getConfirmSplitCode(), confirmOrderBiz.getSkipSplitConfirm());
return ResultVOUtils.success(splitInfo);
}
@ -498,8 +514,7 @@ public class IoCollectOrderController extends BaseController {
return ResultVOUtils.error(500, "单据号不能为空！");
}
List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(collectOrderRequest.getBillNo());
boolean allConfirmed = CollUtil.isNotEmpty(collectOrderBizs) &&
collectOrderBizs.stream().allMatch(biz -> IntUtil.value(biz.getGetConfirm()));
boolean allConfirmed = CollUtil.isNotEmpty(collectOrderBizs) && collectOrderBizs.stream().allMatch(biz -> IntUtil.value(biz.getGetConfirm()));
if (allConfirmed) {
collectOrderService.confirmFinishOrder(collectOrderRequest, getUser());
return ResultVOUtils.success("单据完成！");
@ -634,8 +649,7 @@ public class IoCollectOrderController extends BaseController {
@PostMapping("/udiwms/basic/collect/order/finishReturnOrder")
@Transactional(rollbackFor = Exception.class)
public BaseResponse finishReturnOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
return collectOriginService.finishReturnOrder(collectOrderRequest);
// return collectOriginService.submitreturnOrder(collectOrderRequest,1);
return collectOriginService.submitreturnOrder(collectOrderRequest,1);
}

4
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -1830,12 +1830,16 @@ public class IoCodeTempController extends BaseController {
return ResultVOUtils.error(533, "扫码重复!");
}
} else if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
IoCollectSet collectSet = collectSetService.getSet();
if (!IntUtil.value(collectSet.getConflictReturn())) {
if (fifoCodeEntity == null) {
return ResultVOUtils.error(500, "当前追溯码未上货或已出库完毕！");
}
if (splitCodeEntity != null) {//&& StrUtil.isNotEmpty(splitCodeEntity.getSerialNo())
return ResultVOUtils.error(533, "当前追溯码已经拆零，无法退货！");
}
}
if (codeTempEntity != null) {
return ResultVOUtils.error(533, "扫码重复!");
}

8
src/main/java/com/glxp/api/controller/inout/IoOrderController.java
Unescape Escape View File

@ -433,11 +433,11 @@ public class IoOrderController extends BaseController {
if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(codeTempEntity.getCode(), addOrderRequest.getWorkPlaceCode());
if (fifoCodeEntity == null && StrUtil.isEmpty(fifoCodeEntity.getSerialNo())) {
return ResultVOUtils.error(500, "当前追溯码:" + fifoCodeEntity.getCode() + "未上货!");
}
// if (fifoCodeEntity == null) {
// return ResultVOUtils.error(500, "当前追溯码:" + fifoCodeEntity.getCode() + "未上货!");
// }
//校验工位库存
if (fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()) {
if (fifoCodeEntity!=null && fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()) {
return ResultVOUtils.error(500, "当前码:" + fifoCodeEntity.getCode() + "库存不足，请更改码明细!");
}
}

9
src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
Unescape Escape View File

@ -130,6 +130,15 @@ public class IoCollectSet implements Serializable {
private Boolean delayTageCode;
@TableField(value = "conflictScan")
@ApiModelProperty(value = "是否启用扫码冲突替换：1：是；0：否")
private Boolean conflictScan;
@TableField(value = "conflictReturn")
@ApiModelProperty(value = "是否启用退货扫码冲突替换：1：是；0：否")
private Boolean conflictReturn;
private static final long serialVersionUID = 1L;
@TableField(exist = false)

53
src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
Unescape Escape View File

@ -57,7 +57,10 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Service
@ -139,18 +142,12 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
SysWorkplacePutRel sysWorkplacePutRel = workplacePutRelService.findPutWorkPlace(workPlace.getWorkplaceId(), null);
IoCollectSet collectSet = collectSetService.getSet();
Long putWorkPlaceCode = null;
if (sysWorkplacePutRel != null)
putWorkPlaceCode = sysWorkplacePutRel.getWorkPlaceCode();
if (sysWorkplacePutRel != null) putWorkPlaceCode = sysWorkplacePutRel.getWorkPlaceCode();
if (workPlace == null) throw new JsonException(500, "请先选择工位");
SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(workPlace.getWorkplaceId(), addTagCodeReqeust.getBusType());
IoCollectOrderBiz collectOrderBiz = null;
IoCollectOrder collectOrder = null;
// try {
// Thread.sleep(3*1000);
// } catch (InterruptedException e) {
// throw new RuntimeException(e);
// }
//1.校验UDI码完整性
String code = addTagCodeReqeust.getCode();
if (StringUtils.isBlank(code)) throw new JsonException(ResultEnum.DATA_ERROR.getMessage());
@ -181,7 +178,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
}
}
} else {
if (udiRelevanceResponse.getDistributeMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
@ -272,7 +268,13 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
}
}
IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(code, putWorkPlaceCode);
List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(addTagCodeReqeust.getBillNo());
List<IoCollectOrderBiz> collectOrderBizs;
collectOrder = collectOrderService.getByBillNo(addTagCodeReqeust.getBillNo());
if (StrUtil.isNotEmpty(collectOrder.getSummaryNo())) {
collectOrderBizs = collectOrderService.getOrderBizs(collectOrder.getSummaryNo());
} else {
collectOrderBizs = collectOrderBizService.listByBillNo(addTagCodeReqeust.getBillNo());
}
//2.校验是否处方单UDI码
if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_GEN_ORDER) {
if (StrUtil.isEmpty(addTagCodeReqeust.getBillNo())) {
@ -544,26 +546,11 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
if (isExitRel(code, collectOrder.getBillNo())) {
throw new JsonException(500, "当前追溯码已上传关联关系，请勿重复扫码！");
}
IoCollectOrderCodeMan collectOrderCodeMan =
IoCollectOrderCodeMan.builder()
.udiCode(code)
.orderIdFk(collectOrder.getBillNo())
.bizIdFk(collectOrderBiz.getId())
.relId(collectOrderBiz.getRelId())
.nameCode(udiEntity.getUdi())
.batchNo(udiEntity.getBatchNo() == null ? collectOrderBiz.getBatchNo() : udiEntity.getBatchNo())
.serialNo(udiEntity.getSerialNo())
.productDate(udiEntity.getProduceDate() == null ? collectOrderBiz.getProductDate() : udiEntity.getProduceDate())
.expireDate(udiEntity.getExpireDate() == null ? collectOrderBiz.getExpireDate() : udiEntity.getExpireDate())
.createTime(new Date())
.createUser(userId)
.updateTime(new Date())
.updateUser(userId)
.scanCount(count + 1)
IoCollectOrderCodeMan collectOrderCodeMan = IoCollectOrderCodeMan.builder().udiCode(code)
.orderIdFk(collectOrderBiz.getOrderIdFk())
.bizIdFk(collectOrderBiz.getId()).relId(collectOrderBiz.getRelId()).nameCode(udiEntity.getUdi()).batchNo(udiEntity.getBatchNo() == null ? collectOrderBiz.getBatchNo() : udiEntity.getBatchNo()).serialNo(udiEntity.getSerialNo()).productDate(udiEntity.getProduceDate() == null ? collectOrderBiz.getProductDate() : udiEntity.getProduceDate()).expireDate(udiEntity.getExpireDate() == null ? collectOrderBiz.getExpireDate() : udiEntity.getExpireDate()).createTime(new Date()).createUser(userId).updateTime(new Date()).updateUser(userId).scanCount(count + 1)
// .scanCount(scanCount)
.isSplitCode(addTagCodeReqeust.getIsSplitCode())
.scanActCount(scanCount)
.build();
.isSplitCode(addTagCodeReqeust.getIsSplitCode()).scanActCount(scanCount).build();
RelCodeDetailResponse codeRelEntity = relCodeDetailService.findByCode(code);
@ -630,9 +617,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
public IoCollectOrderBiz scanGenOrder(List<UdiRelevanceResponse> udiRelevanceResponses, List<IoCollectOrderBiz> collectOrderBizs, UdiEntity udiEntity, IoCollectOrder collectOrder) {
for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId()) &&
(StrUtil.trimToEmpty(collectOrderBiz.getBatchNo()).equals(StrUtil.trimToEmpty(udiEntity.getBatchNo())))
) {
if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId()) && (StrUtil.trimToEmpty(collectOrderBiz.getBatchNo()).equals(StrUtil.trimToEmpty(udiEntity.getBatchNo())))) {
int actCount = 0;
if (IntUtil.value(collectOrder.getOrderCirType()) == 1) {
actCount = +calCountUtil.getCirActCount(udiRelevanceResponse);
@ -780,9 +765,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
} else {
List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
for (String code : request.getUdiCodeList()) {
IoCollectOrderCodeMan ioCollectOrderCodeMan = collectOrderCodeManMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>()
.eq(IoCollectOrderCodeMan::getOrderIdFk, request.getOrderIdFk())
.eq(IoCollectOrderCodeMan::getUdiCode, code));
IoCollectOrderCodeMan ioCollectOrderCodeMan = collectOrderCodeManMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>().eq(IoCollectOrderCodeMan::getOrderIdFk, request.getOrderIdFk()).eq(IoCollectOrderCodeMan::getUdiCode, code));
VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
if (ioCollectOrderCodeMan != null) {
vailCodeResultResponse.setStatus(1);

15
src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
Unescape Escape View File

@ -1013,4 +1013,19 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
return new ArrayList<>(summarizedMap.values());
}
public List<String> getBillBySummary(String summaryNo) {
List<String> billNos = listObjs(new LambdaQueryWrapper<IoCollectOrder>().select(IoCollectOrder::getBillNo).eq(IoCollectOrder::getSummaryNo, summaryNo), Object::toString);
return billNos;
}
public List<IoCollectOrderBiz> getOrderBizs(String summaryNo) {
List<IoCollectOrderBiz> collectOrderBizs = null;
List<String> billNos = getBillBySummary(summaryNo);
if (CollUtil.isNotEmpty(billNos)) {
collectOrderBizs = collectOrderBizService.list(new LambdaQueryWrapper<IoCollectOrderBiz>().in(IoCollectOrderBiz::getOrderIdFk, billNos));
}
return collectOrderBizs;
}
}

3
src/main/java/com/glxp/api/service/inout/AddCoodeService.java
Unescape Escape View File

@ -919,12 +919,15 @@ public class AddCoodeService {
return ResultVOUtils.error(533, "扫码重复!");
}
} else if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
IoCollectSet collectSet = collectSetService.getSet();
if (!IntUtil.value(collectSet.getConflictReturn())) {
if (fifoCodeEntity == null) {
return ResultVOUtils.error(500, "当前追溯码未上货或已出库完毕！");
}
if (splitCodeEntity != null) {//&& StrUtil.isNotEmpty(splitCodeEntity.getSerialNo())
return ResultVOUtils.error(533, "当前追溯码已经拆零，无法退货！");
}
}
if (codeTempEntity != null) {
return ResultVOUtils.error(533, "扫码重复!");
}

2
src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
Unescape Escape View File

@ -1283,7 +1283,7 @@ public class IoCheckInoutService {
} else if (orderEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
//拆零预出库退回
List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
fifoInvService.removeInv(codeList, orderEntity.getWorkPlaceCode());
fifoInvService.removeInv(codeList, orderEntity);
splitFifoCodeService.updateAllInvAlert(orderEntity.getWorkPlaceCode());
}
}

67
src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
Unescape Escape View File

@ -199,20 +199,24 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
collectOrderBizService.updateById(collectOrderBiz);
}
@Resource
IoCollectSetService collectSetService;
@Transactional(rollbackFor = Exception.class)
public void finishAutoTagCode(IoCollectOrder collectOrder, Boolean isAuto, String queueCode) {
IoCollectSet collectSet = collectSetService.getSet();
SysWorkplacePutRel sysWorkplacePutRel = workplacePutRelService.findPutWorkPlace(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
Long putWorkPlaceCode = null;
if (sysWorkplacePutRel != null) putWorkPlaceCode = sysWorkplacePutRel.getWorkPlaceCode();
List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
List<IoCollectOrderBiz> collectOrderBizs = null;
collectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
//如果手动扫码判断该码是否在队列里，如果已在队列，则队列里剔除
List<IoCollectOrderCodeMan> collectOrderCodeMEN = collectOrderCodeManService.listByBillNo(collectOrder.getBillNo());
if (CollUtil.isNotEmpty(collectOrderCodeMEN)) {
//扫码冲突
// dealOrderReplace(collectOrderCodeMEN, collectOrder,putWorkPlaceCode);
if (IntUtil.value(collectSet.getConflictScan())) {
dealOrderReplace(collectOrderCodeMEN, collectOrder, putWorkPlaceCode);
}
for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodeMEN) {
if (IntUtil.value(collectOrderCodeMan.getRemoveFlag())) {
continue;
@ -371,17 +375,22 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
/**
* 手动赋码与自动赋码冲突时解决方案
*/
public void dealOrderReplace(List<IoCollectOrderCodeMan> collectOrderCodeManList, IoCollectOrder collectOrder,Long putWorkPlaceCode) {
public void dealOrderReplace(List<IoCollectOrderCodeMan> collectOrderCodeManList, IoCollectOrder collectOrder, Long putWorkPlaceCode) {
for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodeManList) {
// 1. 查找已完成成单据扫码是否已被分配
List<IoCollectCodeBackup> collectCodeBackups = collectCodeBackMapper.selectList(new LambdaQueryWrapper<IoCollectCodeBackup>().eq(IoCollectCodeBackup::getBusType, collectOrder.getBusType()).eq(IoCollectCodeBackup::getCode, collectOrderCodeMan.getUdiCode()).eq(IoCollectCodeBackup::getIsSplitCode, 0));
List<IoCollectCodeBackup> collectCodeBackups = collectCodeBackMapper.selectList(new LambdaQueryWrapper<IoCollectCodeBackup>().eq(IoCollectCodeBackup::getBusType, collectOrder.getBusType()).eq(IoCollectCodeBackup::getCode, collectOrderCodeMan.getUdiCode()));
if (CollUtil.isNotEmpty(collectCodeBackups)) {
IoCollectCodeBackup collectCodeBackup = collectCodeBackups.get(0);
// 1. 如果本身标记为手动整取，则应报错提示，重复扫码
if (IntUtil.value(collectCodeBackup.getFifoSplit()) == 3) {
throw new JsonException(500, collectCodeBackup.getCode() + "重复扫码，请盘查后重试！");
}
// 不管是自动拆零或者手动拆零直接忽略，不走冲突赋码逻辑
if (IntUtil.value(collectCodeBackup.getFifoSplit()) != 2) {
break;
}
IoCollectOrderBackup collectOrderBackup = collectOrderBackupMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderBackup>().eq(IoCollectOrderBackup::getBillNo, collectCodeBackup.getBillNo()));
collectOrderCodeMan.setRemoveFlag(true);
@ -403,7 +412,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
if (splitFifoCodeEntity == null) {
throw new JsonException(500, "工位存量不足！");
}
IoCollectErrorLog ioCollectErrorLog = IoCollectErrorLog.builder().orderId(collectOrder.getId() + "").autoCode(splitFifoCodeEntity.getCode()).manuCode(collectOrderCodeMan.getUdiCode()).type(1) //未上传医保替换码
IoCollectErrorLog ioCollectErrorLog = IoCollectErrorLog.builder().orderId(collectOrder.getBillNo()).autoCode(splitFifoCodeEntity.getCode()).manuCode(collectOrderCodeMan.getUdiCode()).type(1) //未上传医保替换码
.updateTime(new Date()).build();
collectErrorLogMapper.insert(ioCollectErrorLog);
//替换已完成单据的码
@ -421,8 +430,6 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
*/
public void workReturnReplace(IoCodeEntity codeEntity, Long workPlaceCode) {
IoSplitFifoCodeEntity ioSplitFifoCodeEntity = splitFifoCodeService.findByCode(codeEntity.getCode(), workPlaceCode);
if (ioSplitFifoCodeEntity == null) {
// 1.判断工位库存是否足够
// 2.工位库存足够的话，判断已完成单是否存在，
// 3.存在的话，判断已完成单是否已上传医保
@ -432,18 +439,15 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
if (CollUtil.isEmpty(splitFifoCodeEntitys)) {
throw new JsonException(500, "工位库存不足！");
}
// ioSplitFifoCodeEntity = splitFifoCodeEntitys.get(0);
IoSplitFifoCodeEntity ioSplitFifoCodeEntity = splitFifoCodeEntitys.get(0);
List<IoCollectCodeBackup> collectCodeBackups = collectCodeBackMapper.selectList(new LambdaQueryWrapper<IoCollectCodeBackup>().eq(IoCollectCodeBackup::getCode, ioSplitFifoCodeEntity.getCode()));
List<IoCollectCodeBackup> collectCodeBackups = collectCodeBackMapper.selectList(new LambdaQueryWrapper<IoCollectCodeBackup>().eq(IoCollectCodeBackup::getCode, codeEntity.getCode()));
if (CollUtil.isNotEmpty(collectCodeBackups)) {
IoCollectCodeBackup collectCodeBackup = collectCodeBackups.get(0);
if (IntUtil.value(collectCodeBackup.getFifoSplit()) == 3) {
throw new JsonException(500, collectCodeBackup.getCode() + "重复扫码，请盘查后重试！");
}
// if (IntUtil.value(collectCodeBackup.getFifoSplit()) == 3) {
// throw new JsonException(500, collectCodeBackup.getCode() + "重复扫码，请盘查后重试！");
// }
IoCollectOrderBackup collectOrderBackup = collectOrderBackupMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderBackup>().eq(IoCollectOrderBackup::getBillNo, collectCodeBackup.getBillNo()));
if (IntUtil.value(collectOrderBackup.getUploadStatus()) == 2) {
// 单据已被上传至医保 ---- 取当前库存的码替换至已完成单的码，并退库，以当前的码为退库单的码，并生成替换日志
IoSplitFifoCodeEntity splitFifoCodeEntity = removeInvByCode(ioSplitFifoCodeEntity);
@ -451,8 +455,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
throw new JsonException(500, "工位存量不足！");
}
IoCollectErrorLog ioCollectErrorLog = IoCollectErrorLog.builder().orderId(codeEntity.getOrderId()).autoCode(splitFifoCodeEntity.getCode()).manuCode(ioSplitFifoCodeEntity.getCode()).type(4) //退货已上传医保替换码
IoCollectErrorLog ioCollectErrorLog = IoCollectErrorLog.builder().orderId(codeEntity.getOrderId()).autoCode(splitFifoCodeEntity.getCode()).manuCode(codeEntity.getCode()).type(4) //退货已上传医保替换码
.updateTime(new Date()).build();
collectErrorLogMapper.insert(ioCollectErrorLog);
collectCodeBackup.setCode(splitFifoCodeEntity.getCode());
@ -479,7 +482,6 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
}
}
}
}
@ -501,9 +503,10 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
remainder = unTagCount % IntUtil.value(udiRelevanceResponse.getBhxjsl());
if (remainder > 0) {
collectOrder.setTagStatus(6); //拆零未赋码
}
break;
}
}
}
collectOrderBackupService.updateByBillNo(collectOrder);
}
@ -593,7 +596,8 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
for (IoSplitCodeEntity ioSplitCodeEntity : ioSplitCodeEntities) {
if (IntUtil.value(ioSplitCodeEntity.getRemainCount()) > 0) {
count = IntUtil.value(ioSplitCodeEntity.getRemainCount()) - unCount;
IoCollectOrderCodeAuto collectOrderCodeAuto = IoCollectOrderCodeAuto.builder().codeIdFk(ioSplitCodeEntity.getId()).udiCode(ioSplitCodeEntity.getCode()).orderIdFk(collectOrder.getBillNo()).batchNo(ioSplitCodeEntity.getBatchNo()).productDate(ioSplitCodeEntity.getProduceDate()).expireDate(ioSplitCodeEntity.getExpireDate()).serialNo(ioSplitCodeEntity.getSerialNo()).relId(collectOrderBiz.getRelId()).bizIdFk(collectOrderBiz.getId()).fifoSplit(count > 0 ? count : 0).reCount(count).createTime(new Date()).updateTime(new Date()).build();
IoCollectOrderCodeAuto collectOrderCodeAuto = IoCollectOrderCodeAuto.builder().codeIdFk(ioSplitCodeEntity.getId()).udiCode(ioSplitCodeEntity.getCode()).orderIdFk(collectOrder.getBillNo()).batchNo(ioSplitCodeEntity.getBatchNo()).productDate(ioSplitCodeEntity.getProduceDate()).expireDate(ioSplitCodeEntity.getExpireDate()).serialNo(ioSplitCodeEntity.getSerialNo()).relId(collectOrderBiz.getRelId()).bizIdFk(collectOrderBiz.getId())
.fifoSplit(1).reCount(count > 0 ? count : 0).createTime(new Date()).updateTime(new Date()).build();
collectOrderCodeAutoService.save(collectOrderCodeAuto);
codeAutoList.add(collectOrderCodeAuto);
if (count > 0) {
@ -635,26 +639,11 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
}
public void saveSplitCode(List<IoCollectOrderCodeAuto> codeAutoList, IoCollectOrderBackup collectOrder) {
if (CollUtil.isEmpty(codeAutoList))
return;
if (CollUtil.isEmpty(codeAutoList)) return;
List<IoCollectCodeBackup> ioCollectCodes = new ArrayList<>();
for (IoCollectOrderCodeAuto collectOrderCodeAuto : codeAutoList) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(collectOrderCodeAuto.getRelId() + "");
ioCollectCodes.add(IoCollectCodeBackup.builder().code(collectOrderCodeAuto.getUdiCode())
.fromType(collectOrder.getFromType())
.busType(collectOrder.getBusType())
.billNo(collectOrder.getBillNo())
.fromCorp(collectOrder.getFromCorp())
.operTime(collectOrder.getUpdateTime())
.operUser(collectOrder.getCreateUser())
.fifoSplit(1)
.relId(collectOrderCodeAuto.getRelId())
.workPlaceCode(collectOrder.getWorkPlaceCode())
.remark(collectOrder.getRemark())
.purType(udiRelevanceResponse.getPurType())
.inBatchNo(System.currentTimeMillis())
.reCount(collectOrderCodeAuto.getReCount())
.build());
ioCollectCodes.add(IoCollectCodeBackup.builder().code(collectOrderCodeAuto.getUdiCode()).fromType(collectOrder.getFromType()).busType(collectOrder.getBusType()).billNo(collectOrder.getBillNo()).fromCorp(collectOrder.getFromCorp()).operTime(collectOrder.getUpdateTime()).operUser(collectOrder.getCreateUser()).fifoSplit(1).relId(collectOrderCodeAuto.getRelId()).workPlaceCode(collectOrder.getWorkPlaceCode()).remark(collectOrder.getRemark()).purType(udiRelevanceResponse.getPurType()).inBatchNo(System.currentTimeMillis()).reCount(collectOrderCodeAuto.getReCount()).build());
}
collectCodeBackService.saveBatch(ioCollectCodes);
}

38
src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
Unescape Escape View File

@ -13,10 +13,7 @@ import com.glxp.api.dao.inout.IoSplitFifoInvMapper;
import com.glxp.api.entity.basic.SysWorkplaceLayer;
import com.glxp.api.entity.basic.SysWorkplacePutRel;
import com.glxp.api.entity.basic.SysWorkplaceQueue;
import com.glxp.api.entity.collect.IoCollectCodeBackup;
import com.glxp.api.entity.collect.IoCollectErrorLog;
import com.glxp.api.entity.collect.IoCollectOrderBackup;
import com.glxp.api.entity.collect.IoSplitFifoInvRel;
import com.glxp.api.entity.collect.*;
import com.glxp.api.entity.inout.*;
import com.glxp.api.exception.JsonException;
import com.glxp.api.req.basic.SysWorkplaceLayerRequest;
@ -28,6 +25,7 @@ import com.glxp.api.service.basic.SysWorkplaceDocumentService;
import com.glxp.api.service.basic.SysWorkplaceLayerService;
import com.glxp.api.service.basic.SysWorkplaceQueueService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.collect.IoCollectSetService;
import com.glxp.api.service.collect.IoSplitFifoInvRelService;
import com.glxp.api.service.thrsys.SysWorkplacePutRelService;
import com.glxp.api.util.IntUtil;
@ -226,22 +224,23 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
IoCollectOrderBackupMapper collectOrderBackupMapper;
@Resource
IoCollectCodeBackMapper collectCodeBackMapper;
@Resource
IoCollectSetService collectSetService;
/**
* 移除库存
*
* @param codeList
* @param workPlaceCode
*/
@Transactional(rollbackFor = Exception.class)
public void removeInv(List<IoCodeEntity> codeList, Long workPlaceCode) {
public void removeInv(List<IoCodeEntity> codeList, IoOrderEntity orderEntity) {
List<IoSplitFifoCodeEntity> splitCodeEntities = new ArrayList<>();
IoCollectSet collectSet = collectSetService.getSet();
if (CollUtil.isNotEmpty(codeList)) {
for (IoCodeEntity codeEntity : codeList) {
IoSplitFifoCodeEntity ioSplitFifoCodeEntity = splitFifoCodeService.findByCode(codeEntity.getCode(), workPlaceCode);
IoSplitFifoCodeEntity ioSplitFifoCodeEntity = splitFifoCodeService.findByCode(codeEntity.getCode(), orderEntity.getWorkPlaceCode());
if (ioSplitFifoCodeEntity == null && IntUtil.value(collectSet.getConflictReturn())) {
ioSplitCodeService.workReturnReplace(codeEntity, orderEntity.getWorkPlaceCode());
} else {
//退库扫码冲突判断
if (StrUtil.isEmpty(codeEntity.getSerialNo())) {
if (ioSplitFifoCodeEntity != null) {
ioSplitFifoCodeEntity.setScanCount(IntUtil.value(ioSplitFifoCodeEntity.getScanCount()) - IntUtil.value(codeEntity.getCount()));
@ -263,14 +262,11 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
}
} else {
if (ioSplitFifoCodeEntity != null) splitCodeEntities.add(ioSplitFifoCodeEntity);
}
}
}
splitFifoCodeService.removeBatchByIds(splitCodeEntities);
for (IoSplitFifoCodeEntity ioSplitFifoCodeEntity : splitCodeEntities) {
IoSplitFifoInv splitFifoInv = findByFifoCode(ioSplitFifoCodeEntity);
for (IoSplitFifoCodeEntity tempEntity : splitCodeEntities) {
IoSplitFifoInv splitFifoInv = findByFifoCode(tempEntity);
if (splitFifoInv != null) {
splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(tempEntity.getTotalCount()));
splitFifoInv.setOutCodeCount(IntUtil.value(splitFifoInv.getOutCodeCount()) + 1);
splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()));
splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount()));
@ -278,6 +274,12 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
updateById(splitFifoInv);
}
}
}
}
}
}
}

2
src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml
Unescape Escape View File

@ -30,7 +30,7 @@
AND iccb.code LIKE concat( #{code}, '%')
</if>
<if test="billNo != null and billNo != ''">
AND iccb.billNo LIKE concat(#{billNo}, '%')
AND iccb.billNo = #{billNo}
</if>
<if test="relId != null and relId != ''">
AND iccb.relId = #{relId}

9
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -5590,6 +5590,15 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'delayTageCode',
1);
CALL Pro_Temp_ColumnWork('io_collect_set', 'conflictScan',
'tinyint NULL DEFAULT NULL COMMENT ''是否启用扫码冲突替换：1：是；0：否''',
1);
CALL Pro_Temp_ColumnWork('io_collect_set', 'conflictReturn',
'tinyint NULL DEFAULT NULL COMMENT ''是否启用退货扫码冲突替换：1：是；0：否''',
1);
CREATE TABLE IF NOT EXISTS `yb_uploading_log` (
`id` int NOT NULL AUTO_INCREMENT,
`ybParam` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '医保入参',

Write Preview
Loading…
Cancel
Save