From 125b6c9736a8e3c4afb23c5cc12a63775549ab2f Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 8 Oct 2024 19:46:57 +0800 Subject: [PATCH] =?UTF-8?q?10/8=20=E7=8E=B0=E5=9C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderBackupController.java | 4 ++-- .../controller/inout/IoCodeTempController.java | 16 ++++++++++++---- .../api/controller/inout/IoOrderController.java | 3 +++ .../service/collect/IoSplitDesOrderService.java | 4 ++-- .../service/collect/down/YPCF002Download.java | 3 +++ .../api/service/inout/IoCheckInoutService.java | 4 ++-- .../api/service/inout/IoCodeTempService.java | 2 +- .../inout/impl/IoCodeTempServiceImpl.java | 3 ++- .../service/inout/impl/IoOrderServiceImpl.java | 4 ++-- 9 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index db16b9bd9..cf46cd435 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -40,8 +40,8 @@ public class IoCollectOrderBackupController extends BaseController { private BasicCollectUserService basicCollectUserService; - @PostMapping("/udiwms/basic/collect/orderFinish/filter") - public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) { + @GetMapping("/udiwms/basic/collect/orderFinish/filter") + public BaseResponse filterOrder( CollectOrderRequest collectOrderRequest) { List workPlaceCodes = null; List page; diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 394aaf9c9..593fff30c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -20,6 +20,7 @@ import com.glxp.api.service.collect.IoCollectOrderService; import com.glxp.api.service.collect.IoCollectOriginService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductDetailService; +import org.aspectj.weaver.ast.Var; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; @@ -161,7 +162,7 @@ public class IoCodeTempController extends BaseController { //查询原始单据查到为异常提示 IoCollectOrderOrigin ioCollectOrigin = collectOriginService.getOrderByCode(code); if (ioCollectOrigin != null) { - BaseResponse response = ResultVOUtils.error(501, "单据已下载,转化异常"); + BaseResponse response = ResultVOUtils.error(501, "单据已下载,业务不匹配"); response.setData(code); return response; } @@ -190,7 +191,7 @@ public class IoCodeTempController extends BaseController { response.setData(collectOrder); return response; } else { - BaseResponse response = ResultVOUtils.error(501, "查无此单据号"); + BaseResponse response = ResultVOUtils.error(501, baseResponse.getMessage()); response.setData(code); return response; } @@ -1293,7 +1294,7 @@ public class IoCodeTempController extends BaseController { if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) { - return ResultVOUtils.error(500, "当前追溯码已存在！"); + return ResultVOUtils.error(533, "当前追溯码已存在！"); } } else { IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); @@ -1302,6 +1303,13 @@ public class IoCodeTempController extends BaseController { } } + //校验码表是否已经存在追溯码 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())) { String fromCorp = ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum()); addOrderRequest.setFromCorp(fromCorp); @@ -2056,7 +2064,7 @@ public class IoCodeTempController extends BaseController { } IoCodeTempEntity tempEntity = codeTempService.selectById(codeTempEntity.getId()); - codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode())); + codeTempEntity.setReCount(codeTempEntity.getReCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode())); codeTempService.updateById(codeTempEntity); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(tempEntity.getAction()); BaseResponse invRes = null; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 3eb2478aa..d5e3892bc 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -352,6 +352,9 @@ public class IoOrderController extends BaseController { } + if (addOrderRequest.getAction().equals(ConstantType.SPLIT_RETURN) || addOrderRequest.getAction().equals(ConstantType.SPLIT_OUT)){ + orderEntity.setStatus(1); + } orderEntity.setFromCorp(ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum())); orderEntity.setAction(addOrderRequest.getAction()); orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java index c57eb32a7..de614771f 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java @@ -258,8 +258,8 @@ public class IoSplitDesOrderService extends ServiceImpl list = baseResponse.getData().getList(); + if (list == null){ + return ResultVOUtils.error(500, "未查到此业务单据"); + } thrOrderDownload.importThrOrder(list, collectOrderRequest); if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) { page++; diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index ba77bb17d..e947245f4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -805,9 +805,9 @@ public class IoCheckInoutService { if (checkCount(bizEntity, codeEntity) == null) { bizResponse.setCheckSuccess(true); codeEntity.setCheckSuccess(true); - bizResponse.setScanCount(codeEntity.getReCount()); + bizResponse.setScanCount(codeEntity.getCount()); } else { - bizResponse.setScanCount(codeEntity.getReCount()); + bizResponse.setScanCount(codeEntity.getCount()); bizResponse.setCheckSuccess(false); } break; diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index 2853d1e1a..fff4ae69f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -50,5 +50,5 @@ public interface IoCodeTempService { Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity); - IoCodeTempEntity selectByCode(String code); + IoCodeTempEntity selectByCode(String code,String batchNo); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java index 8f1097950..2e3e04927 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java @@ -154,9 +154,10 @@ public class IoCodeTempServiceImpl implements IoCodeTempService { } @Override - public IoCodeTempEntity selectByCode(String code) { + public IoCodeTempEntity selectByCode(String code,String batchNo) { QueryWrapper ew = new QueryWrapper<>(); ew.eq("code",code); + ew.eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo); return ioCodeTempDao.selectOne(ew); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 8cf6586e0..146a27a41 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -1074,10 +1074,10 @@ public class IoOrderServiceImpl implements IoOrderService { @Override public IoOrderResponse findByWorkPlaceCode(String workPlaceCode,Long userId) { - //查询单据表 + //根据用户和状态查找处理中的订单查询单据表 FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setWorkPlaceCode(workPlaceCode); - filterOrderRequest.setStatus(9); + filterOrderRequest.setStatus(3);//处理中的订单 filterOrderRequest.setUpdateUser(userId + ""); List ioOrderResponses = orderDao.filterList(filterOrderRequest); // QueryWrapper ew = new QueryWrapper<>();