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 14ed604ac..5b6043811 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -159,8 +159,8 @@ public class IoCodeTempController extends BaseController { IoCollectOrderResponse collectOrder = collectOrderService.unionSearch(null, addEnterCodeRequest.getBusType(), code); if (collectOrder == null) { //查询原始单据查到为异常提示 - IoCollectOrderOrigin ioCollectOrigin = collectOriginService.getOrderByCode(code); - if (ioCollectOrigin != null){ + IoCollectOrderOrigin ioCollectOrigin = collectOriginService.getOrderByCode(code); + if (ioCollectOrigin != null) { BaseResponse response = ResultVOUtils.error(501, "单据已下载,转化异常"); response.setData(code); return response; @@ -580,7 +580,7 @@ public class IoCodeTempController extends BaseController { addOrderRequest.setBillNo(ioOrderEntity.getBillNo()); } //TODO 退货校验是否有库存 提示产品不存在 - if(StrUtil.equals("return",addOrderRequest.getSplitType())){ + if (StrUtil.equals("return", addOrderRequest.getSplitType())) { //ioSplitFifoInvService.getOne(new LambdaQueryWrapper().eq(IoSplitFifoInv::getInvCode,"").last("limit 1")); } if (IntUtil.value(udiEntity.getProductType()) == 2) { diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index 2475a641b..36c39ef94 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -355,8 +355,8 @@ public class IoSplitCodeService extends ServiceImpl collectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo()); for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) { diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml index 8d9b6757e..2be5487fc 100644 --- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml @@ -104,6 +104,7 @@ AND workPlaceCode = #{workPlaceCode} + group by io_split_fifo_code.id