From 23bbe2166ca32eb39aac4d5951983bfe407fb311 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 20 Sep 2023 17:15:35 +0800 Subject: [PATCH] =?UTF-8?q?pda=E5=8D=95=E6=8D=AE=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/LoginController.java | 8 +++-- .../inout/IoOrderReviewController.java | 34 +++++++++++++++---- .../api/service/inout/IoAddInoutService.java | 14 ++++---- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index b496ab4a5..33aac23af 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -204,9 +204,13 @@ public class LoginController extends BaseController { LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); BeanUtil.copyProperties(authAdmin, loginUserInfoResponse); DeptEntity deptEntity = deptService.selectByCode(authAdmin.getLocDeptCode()); + if (deptEntity != null) { + loginUserInfoResponse.setLocDeptName(deptEntity.getName()); + } InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(authAdmin.getLocInvCode()); - loginUserInfoResponse.setLocDeptName(deptEntity.getName()); - loginUserInfoResponse.setLocInvName(invWarehouseEntity.getName()); + if (invWarehouseEntity != null) { + loginUserInfoResponse.setLocInvName(invWarehouseEntity.getName()); + } return ResultVOUtils.success(loginUserInfoResponse); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index b02444319..8ac36cbba 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -581,12 +581,7 @@ public class IoOrderReviewController extends BaseController { */ private String checkReviewAuth(String orderId, String userId, String action) { IoOrderEntity orderEntity = orderService.findByBillNo(orderId); - if (StrUtil.isNotEmpty(action)) { - if (!orderEntity.getAction().equals(action)) { - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(action); - return "非" + bussinessTypeEntity.getName() + "单据，无法审核!"; - } - } + if (orderEntity == null) { ReviewSpmsRequest reviewSpmsRequest = new ReviewSpmsRequest(); @@ -598,7 +593,12 @@ public class IoOrderReviewController extends BaseController { return "单据不存在！"; } } - + if (StrUtil.isNotEmpty(action)) { + if (!orderEntity.getAction().equals(action)) { + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(action); + return "非" + bussinessTypeEntity.getName() + "单据，无法审核!"; + } + } if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { return "单据非未审核状态,无法审核！"; @@ -636,6 +636,26 @@ public class IoOrderReviewController extends BaseController { } + + /** + * PDA获取需要复制单据 + */ + @AuthRuleAnnotation("") + @GetMapping("/udiwms/pda/order/copy/getOrder") + public BaseResponse getPdaCopyOrder(PdaCheckRequest pdaCheckRequest) { + IoOrderResponse orderEntity = orderService.findGroupBillNo(pdaCheckRequest.getBillNo()); + if (orderEntity == null) { + return ResultVOUtils.error(500, "单据不存在！"); + } + boolean isExit = invBusUserService.exitBus(getUserId() + "", orderEntity.getAction()); + if (!isExit) { + return ResultVOUtils.error(500, "无复制权限！"); + } + return ResultVOUtils.success(orderEntity); + + } + + /** * PDA获取待核对单据-单据详情 */ diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index ad9e98f12..7bab572af 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -436,7 +436,7 @@ public class IoAddInoutService { BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); - BaseResponse baseResponse = checkInv(bussinessTypeEntity, pdaPostOrderRequest.getOrderDetailCodeEntities(), orderEntity, pdaPostOrderRequest.getCodeTempEntities()); + BaseResponse baseResponse = checkInv(bussinessTypeEntity, pdaPostOrderRequest.getOrderDetailBizEntities(), orderEntity, pdaPostOrderRequest.getCodeTempEntities()); if (baseResponse != null) return baseResponse; @@ -823,7 +823,7 @@ public class IoAddInoutService { /** * 手持终端上传校验库存 */ - public BaseResponse checkInv(BasicBussinessTypeEntity bussinessTypeEntity, List orderDetailCodeEntities, IoOrderEntity orderEntity, List codeTempEntities) { + public BaseResponse checkInv(BasicBussinessTypeEntity bussinessTypeEntity, List orderDetailBizEntities, IoOrderEntity orderEntity, List codeTempEntities) { if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_PREIN); @@ -840,35 +840,35 @@ public class IoAddInoutService { } else count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreInSpaceCode()); } - if (count <= 0) { + if (count < IntUtil.value(codeTempEntity.getReCount())) { return ResultVOUtils.error(500, "UDI码：" + codeTempEntity.getCode() + "预验收库存数量不足！"); } } } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_ADVANCE); - for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) { + for (IoOrderDetailBizEntity orderDetailCodeEntity : orderDetailBizEntities) { int count = 0; if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) { count = invPreProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), null, invWarehouseEntity.getCode(), null); } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) { count = invPreProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), null, invWarehouseEntity.getCode(), orderEntity.getPreCurSpaceCode()); } - if (count <= 0) { + if (count < orderDetailCodeEntity.getScanCount()) { return ResultVOUtils.error(500, "提交失败，" + orderDetailCodeEntity.getCoName() + "库存数量不足！"); } } } else { //校验普通库存 if (bussinessTypeEntity.isVailInv() && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) { + for (IoOrderDetailBizEntity orderDetailCodeEntity : orderDetailBizEntities) { int count = 0; if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) { count = invProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode(), null); } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) { count = invProductDetailService.vailStockCount(orderDetailCodeEntity.getBindRlFk(), orderDetailCodeEntity.getBatchNo(), orderDetailCodeEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode(), orderEntity.getCurSpaceCode()); } - if (count <= 0) { + if (count < orderDetailCodeEntity.getScanCount()) { return ResultVOUtils.error(500, "提交失败，" + orderDetailCodeEntity.getCoName() + "库存数量不足！"); } }