From db7acbb48c16dda57d7ec2241b483dee618b522c Mon Sep 17 00:00:00 2001 From: yewj Date: Sat, 14 Sep 2024 14:12:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoCollectOrderCodeManController.java | 10 ++++-- .../collect/IoCollectOrderController.java | 22 ++++++++++-- .../collect/IoCollectOrderBizService.java | 15 ++++---- .../collect/IoCollectOrderCodeManService.java | 35 ++++++++----------- 4 files changed, 51 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index b02610c4e..ff1c1cb6d 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -7,6 +7,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectOrderCodeManRequest; import com.glxp.api.req.inout.AddTagCodeReqeust; import com.glxp.api.req.inout.DeleteTageCodeRequest; @@ -97,11 +98,16 @@ public class IoCollectOrderCodeManController extends BaseController { VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse(); addTagCodeReqeust.setCode(code); vailCodeResultResponse.setCode(code); + vailCodeResultResponse.setStatus(1); try { collectOrder = collectOrderCodeManService.prescribeTagCode(addTagCodeReqeust); - } catch (Exception e) { + } catch (JsonException e) { + if (e.getCode() == 502) { + vailCodeResultResponse.setStatus(3); + } else { + vailCodeResultResponse.setStatus(2); + } vailCodeResultResponse.setErrMsg(e.getMessage()); - vailCodeResultResponse.setStatus(2); } vailCodeResultResponses.add(vailCodeResultResponse); } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 852c21aa8..bc97ddd78 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -10,6 +10,7 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.WorkOperType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; @@ -233,7 +234,7 @@ public class IoCollectOrderController extends BaseController { } collectOrderService.remove(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, billNo)); //更改 原始单据表 为未处理 - collectOrderOriginService.update(new LambdaUpdateWrapper().eq(IoCollectOrderOrigin::getBillNo,billNo).set(IoCollectOrderOrigin::getTagStatus,0)); + collectOrderOriginService.update(new LambdaUpdateWrapper().eq(IoCollectOrderOrigin::getBillNo, billNo).set(IoCollectOrderOrigin::getTagStatus, 0)); return ResultVOUtils.success(); } @@ -297,6 +298,8 @@ public class IoCollectOrderController extends BaseController { return ResultVOUtils.success(); } + @Resource + IoCollectOrderCodeManService collectOrderCodeManService; /** * 单据取消操作 @@ -312,7 +315,22 @@ public class IoCollectOrderController extends BaseController { collectOrder.setUpdateTime(new Date()); collectOrder.setUpdateUser(getUserId()); collectOrderService.updateById(collectOrder); - return ResultVOUtils.success(); + collectOrderCodeManService.removeByBillNo(collectOrder.getBillNo()); + + SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(null, collectOrderRequest.getBusType()); + if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_GEN_ORDER) { + collectOrderBizService.removeByBillNo(collectOrder.getBillNo()); + } else { + List collectOrderBizs = collectOrderBizService.listByBillNo(collectOrderRequest.getBillNo()); + for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) { + collectOrderBiz.setScanCount(0); + collectOrderBiz.setScanActCount(0); + collectOrderBiz.setTempSplitCount(0); + collectOrderBiz.setTempWorkPlaceCount(0); + } + collectOrderBizService.updateBatchById(collectOrderBizs); + } + return ResultVOUtils.success("取消成功"); } @Resource diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java index 671afef3a..2d9619a00 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java @@ -1,22 +1,19 @@ package com.glxp.api.service.collect; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; +import com.glxp.api.dao.collect.IoCollectOrderBizMapper; +import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.req.collect.CollectOrderBizRequest; -import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; -import com.glxp.api.res.collect.IoCollectOrderResponse; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.collect.IoCollectOrderBiz; -import com.glxp.api.dao.collect.IoCollectOrderBizMapper; - @Service public class IoCollectOrderBizService extends ServiceImpl { @@ -43,4 +40,8 @@ public class IoCollectOrderBizService extends ServiceImpl().eq(IoCollectOrderBiz::getOrderIdFk, billNo)); + } } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 7d1cfa3db..8db24aab5 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -4,30 +4,25 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.WorkOperType; -import com.glxp.api.dao.basic.BasicSkPrescribeItemCodeMapper; -import com.glxp.api.dao.collect.IoCollectOrderCodeAutoMapper; +import com.glxp.api.dao.collect.IoCollectOrderCodeManMapper; import com.glxp.api.entity.auth.SysWorkplace; -import com.glxp.api.entity.basic.BasicCollectBustypeEntity; -import com.glxp.api.entity.basic.BasicSkPrescribeItemCode; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBiz; -import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; +import com.glxp.api.entity.collect.IoCollectOrderCodeMan; import com.glxp.api.entity.inout.IoSplitCodeEntity; import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.collect.CollectOrderCodeAutoRequest; import com.glxp.api.req.collect.CollectOrderCodeManRequest; import com.glxp.api.req.inout.AddTagCodeReqeust; import com.glxp.api.res.basic.UdiRelevanceResponse; -import com.glxp.api.res.collect.CollectOrderCodeAutoResponse; import com.glxp.api.res.collect.CollectOrderCodeManResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.SysWorkplaceService; @@ -44,6 +39,7 @@ import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -51,11 +47,6 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.collect.IoCollectOrderCodeMan; -import com.glxp.api.dao.collect.IoCollectOrderCodeManMapper; -import org.springframework.transaction.annotation.Transactional; - @Service public class IoCollectOrderCodeManService extends ServiceImpl { @Resource @@ -214,7 +205,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl 0) { if (vailInSplit(collectOrderBiz, collectOrder.getWorkPlaceCode(), needCount)) { - throw new JsonException(502, "当前拆零数量还有剩余，是否继续扫码？"); + throw new JsonException(502, collectOrderBiz.getCpmctymc() + "拆零数量还有剩余，是否继续添加？"); } } throw new JsonException(500, "扫码数量超出！"); @@ -225,7 +216,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl 0) { if (vailInSplit(collectOrderBiz, collectOrder.getWorkPlaceCode(), needCount)) { - throw new JsonException(502, "当前拆零数量还有剩余，是否继续扫码？"); + throw new JsonException(502, collectOrderBiz.getCpmctymc() + "拆零数量还有剩余，是否继续扫码？"); } } - throw new JsonException(502, "扫码数量超出！"); + throw new JsonException(502, "扫码数量超出，是否继续添加！"); } collectOrderBiz.setScanCount(count1); collectOrderBiz.setScanActCount(actCount1); @@ -310,7 +301,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl 0) { if (vailInSplit(collectOrderBiz, collectOrder.getWorkPlaceCode(), needCount)) { - throw new JsonException(502, "当前拆零数量还有剩余，是否继续扫码？"); + throw new JsonException(502, collectOrderBiz.getCpmctymc() + "拆零数量还有剩余，是否继续添加？"); } } - throw new JsonException(502, "扫码数量超出！"); + throw new JsonException(502, collectOrderBiz.getCpmctymc() + "扫码数量超出,是否继续添加"); } collectOrderBiz.setScanCount(count1); collectOrderBiz.setScanActCount(actCount1); @@ -481,4 +472,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl().eq(IoCollectOrderCodeMan::getOrderIdFk, billNo)); + } + }