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

10/10 bug优化1.0

Browse Source
dev_no_inv
wangwei 9 months ago
parent 182cb345d8
commit aaed60e9cc
8 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -97,7 +97,7 @@ public class IoCollectOrderController extends BaseController {
}
if (collectOrderRequest.getTagStatus() != null && collectOrderRequest.getTagStatus() == -2) {
collectOrderRequest.setExcludeWorkCode(String.valueOf(collectOrderRequest.getWorkPlaceCode()));
// collectOrderRequest.setExcludeWorkCode(String.valueOf(collectOrderRequest.getWorkPlaceCode()));
collectOrderRequest.setWorkPlaceCode(null);
collectOrderRequest.setTagStatus(1);
}
@ -202,31 +202,14 @@ public class IoCollectOrderController extends BaseController {
request.setLimit(1);
request.setBillNo(collectOrderRequest.getBillNo());
List<IoCollectOrderResponse> orderResponses = collectOrderService.filterList(request);
IoCollectOrder order = collectOrderService.getOne(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, collectOrderRequest.getBillNo()));
if (CollUtil.isNotEmpty(orderResponses)) {
if (order.getTagStatus() == 2) {
return ResultVOUtils.error(500, "此单据正在处理中！");
}
//查询到显示页面 更改为处理中 防止前端刷新页面 重新查询
order.setBillNo(collectOrderRequest.getBillNo());
order.setUpdateUser(getUserId());
order.setUpdateTime(new Date());
order.setTagStatus(2);
collectOrderService.updateByBillNo(order);
if (CollUtil.isNotEmpty(orderResponses))
return ResultVOUtils.success(orderResponses.get(0));
} else {
else {
request.setTagStatus(-1);
orderResponses = collectOrderService.filterList(request);
if (CollUtil.isNotEmpty(orderResponses)) {
order.setBillNo(collectOrderRequest.getBillNo());
order.setUpdateUser(getUserId());
order.setUpdateTime(new Date());
order.setTagStatus(2);
collectOrderService.updateByBillNo(order);
if (CollUtil.isNotEmpty(orderResponses))
return ResultVOUtils.success(orderResponses.get(0));
}
}
return ResultVOUtils.error(500, "未查到待处理单据");
}
@ -407,7 +390,6 @@ public class IoCollectOrderController extends BaseController {
@PostMapping("/udiwms/basic/collect/order/finish")
@Transactional(rollbackFor = Exception.class)
public BaseResponse saveFinishOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
if (!IntUtil.value(collectOrderRequest.getConfirmFinish())) {
//1.校验是否全部自动赋码
CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();

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

@ -1290,24 +1290,32 @@ public class IoCodeTempController extends BaseController {
}
}
//校验工位存量是否存在
if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
//校验码表是否已经存在追溯码 io_code_temp
IoCodeTempEntity codeTempEntity = codeTempService.selectByCode(code,udiEntity.getBatchNo());
if (codeTempEntity != null){
return ResultVOUtils.error(533,"当前追溯码已存在草稿单据中!");
}
IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode());
if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) {
return ResultVOUtils.error(533, "当前追溯码已存在！");
}
} else {
IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode());
if (fifoCodeEntity == null) {
return ResultVOUtils.error(500, "当前追溯码未上货！");
}
IoCodeTempEntity codeTempEntity = codeTempService.selectByCode(code,udiEntity.getBatchNo());
if (codeTempEntity != null){
return ResultVOUtils.error(533,"当前追溯码已存在草稿单据中!");
}
}
//校验码表是否已经存在追溯码 io_code_temp
IoCodeTempEntity codeTempEntity = codeTempService.selectByCode(code,udiEntity.getBatchNo());
if (codeTempEntity != null){
return ResultVOUtils.error(533,"当前追溯码已存在");
}
if (addOrderRequest.getFromCorp() == null || StrUtil.isNotEmpty(addOrderRequest.getSickerAdNum())) {

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

@ -426,12 +426,12 @@ public class IoOrderController extends BaseController {
}
}
}
//退货校验追溯码是否重复
//退货校验追溯码是否存在
if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(codeTempEntity.getCode(), null);
if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) {
return ResultVOUtils.error(500, "当前追溯码:" + fifoCodeEntity.getCode() + "已存在！");
IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(codeTempEntity.getCode(), addOrderRequest.getWorkPlaceCode());
if (fifoCodeEntity == null && StrUtil.isEmpty(fifoCodeEntity.getSerialNo())) {
return ResultVOUtils.error(500, "当前追溯码:" + fifoCodeEntity.getCode() + "未上货!");
}
}
}

6
src/main/java/com/glxp/api/controller/inout/IoSplitController.java
Unescape Escape View File

@ -134,9 +134,9 @@ public class IoSplitController extends BaseController {
return ResultVOUtils.error(500, "未找到单据");
}
if (collectOrder.getTagStatus() == 2) {
return ResultVOUtils.error(501, "当前单据正在处理中,请重新选择单据");
}
// if (collectOrder.getTagStatus() == 2) {
// return ResultVOUtils.error(501, "当前单据正在处理中,请重新选择单据");
// }
SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());

5
src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java
Unescape Escape View File

@ -38,6 +38,11 @@ public class AddOrderCodeRequest {
@NotNull(message = "上货方式不能为空")
private Integer inoutType;
/**
* 单据类型：1.业务单据，2:扫码单据，3:正常单据（只在单据未提交之前有用）
*/
@NotNull(message = "单据类型不能为空")
private Integer orderType;
/**
* 单据号

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

@ -833,4 +833,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
return true;
}
}

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

@ -172,6 +172,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
if (splitFifoInv != null) {
splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()));
splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()) - IntUtil.value(splitFifoInv.getLockCount()));
updateById(splitFifoInv);
}
}

4
src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
Unescape Escape View File

@ -46,10 +46,6 @@
<if test="workplaceName != '' and workplaceName != null">
AND workplaceName LIKE concat('%', #{workplaceName}, '%')
</if>
<if test="busType != null and busType != ''">
AND busType = #{busType}
</if>
<if test="fromCorp != '' and fromCorp != null">
AND (fromCorp LIKE concat('%', #{fromCorp}, '%') or fromCorpName LIKE concat('%', #{fromCorp}, '%'))
</if>

Write Preview
Loading…
Cancel
Save