From 4402220c6bc18f3b59c3fcd83a5b579e4eea2a51 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 14 Jul 2023 11:48:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderReviewController.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 aa9f7aa76..abae6753d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -3,7 +3,6 @@ package com.glxp.api.controller.inout; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; @@ -16,15 +15,14 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.EntrustReceEntity; -import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.system.SystemParamConfigEntity; +import com.glxp.api.entity.inout.IoCodeEntity; +import com.glxp.api.entity.inout.IoCodeTempEntity; +import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; import com.glxp.api.req.inout.ReviewFinishRequest; import com.glxp.api.req.inout.ReviewSpmsRequest; import com.glxp.api.req.inout.UpdateExportStatusRequest; -import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.AcceptOrderResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderResponse; @@ -47,7 +45,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.awt.*; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -474,7 +471,8 @@ public class IoOrderReviewController extends BaseController { String billNo = reviewSpmsRequest.getBillNo(); if (StrUtil.isEmpty(reviewSpmsRequest.getBillNo())) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + // return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + return ResultVOUtils.error(999,"请输入单据号!"); } AcceptOrderResponse acceptOrderEntity = new AcceptOrderResponse(); Long userId = getUserId(); From 51fea370b1c4f021fb9db4343ee2682c9a02cf1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Fri, 14 Jul 2023 14:03:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A2=86=E7=94=A8=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=89=8B=E6=9C=AF=E5=AE=A4=E7=9A=84=E8=AF=9D?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=8F=AF=E4=BB=A5=E9=A2=86=E7=94=A8=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E4=B8=AD=E5=BF=83=E5=BA=93=E7=9A=84=E4=BA=A7?= =?UTF-8?q?=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/auth/InvWarehouseController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 641db804c..990567f34 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -188,6 +188,10 @@ public class InvWarehouseController extends BaseController { if (!"".equals(invWarehouseEntity.getParentCode())) { invWarehouseEntities1.add(invWarehouseEntity); } + //领用仓库选择手术室的话，可以领用上一级中心库的产品 + if (filterInvWarehouseRequest.getLocInvCode().equals("1002000") && invWarehouseEntity.getCode().equals("1000000")) { + invWarehouseEntities1.add(invWarehouseEntity); + } } List results = new ArrayList<>(); if (CollUtil.isNotEmpty(invWarehouseEntities1)) { From 447e8f128c5fb582595e698e3b6c8640de7a7993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 14 Jul 2023 15:23:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=87=BA=E5=BA=93bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderMutiController.java | 51 +++++++++++-------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java index cfcfd7fda..6dd5a253e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java @@ -92,24 +92,31 @@ public class IoOrderMutiController { if (StrUtil.isNotBlank(udiEntity.getSerialNo())) { //包含 QueryWrapper ew = new QueryWrapper<>(); - ew.eq("udiCode", ioOrderMutiEntity.getUdiCode()); + ew.eq("nameCode", udiEntity.getUdi()); + ew.eq("batchNo", udiEntity.getBatchNo()); + ew.eq("produceDate", udiEntity.getProduceDate()); + ew.eq("expireDate", udiEntity.getExpireDate()); + ew.eq("serialNo", udiEntity.getSerialNo()); IoOrderMutiEntity ioOrderMutiEntityOne = ioOrderMutiService.getOne(ew); //查询是否被使用过 if (ioOrderMutiEntityOne != null) { + if (ioOrderMutiEntityOne.getStatus() == 1) { + return ResultVOUtils.error(999, "该产品已使用多次出库提交！"); + } if (ioOrderMutiEntityOne.getReCount() == 0) { return ResultVOUtils.error(999, "该产品库存不足！"); } return ResultVOUtils.success(ioOrderMutiEntityOne.getId()); } else { - if(StrUtil.isNotBlank(ioOrderMutiEntity.getMark())){ - QueryWrapper ew1=new QueryWrapper<>(); - ew1.eq("mark",ioOrderMutiEntity.getMark()); + if (StrUtil.isNotBlank(ioOrderMutiEntity.getMark())) { + QueryWrapper ew1 = new QueryWrapper<>(); + ew1.eq("mark", ioOrderMutiEntity.getMark()); long count = ioOrderMutiService.count(ew1); - if(count>0){ + if (count > 0) { return ResultVOUtils.error(999, "标记已存在！"); } - }else{ + } else { return ResultVOUtils.error(999, "标记不能为空！"); } @@ -180,14 +187,14 @@ public class IoOrderMutiController { } } - if(StrUtil.isNotBlank(ioOrderMutiEntity.getMark())){ - QueryWrapper ew=new QueryWrapper<>(); - ew.eq("mark",ioOrderMutiEntity.getMark()); + if (StrUtil.isNotBlank(ioOrderMutiEntity.getMark())) { + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("mark", ioOrderMutiEntity.getMark()); long count = ioOrderMutiService.count(ew); - if(count>0){ + if (count > 0) { return ResultVOUtils.error(999, "标记已存在！"); } - }else{ + } else { return ResultVOUtils.error(999, "标记不能为空！"); } @@ -220,14 +227,14 @@ public class IoOrderMutiController { @PostMapping("/udiwms/inout/order/muti/updateOrderMuti") public BaseResponse updateOrderMuti(@RequestBody IoOrderMutiEntity ioOrderMutiEntity) { - if(StrUtil.isNotBlank(ioOrderMutiEntity.getMark())){ - QueryWrapper ew1=new QueryWrapper<>(); - ew1.eq("mark",ioOrderMutiEntity.getMark()); - IoOrderMutiEntity ioOrderMutiEntityOne= ioOrderMutiService.getOne(ew1); - if(!ioOrderMutiEntityOne.getId().equals(ioOrderMutiEntity.getId())){ + if (StrUtil.isNotBlank(ioOrderMutiEntity.getMark())) { + QueryWrapper ew1 = new QueryWrapper<>(); + ew1.eq("mark", ioOrderMutiEntity.getMark()); + IoOrderMutiEntity ioOrderMutiEntityOne = ioOrderMutiService.getOne(ew1); + if (!ioOrderMutiEntityOne.getId().equals(ioOrderMutiEntity.getId())) { return ResultVOUtils.error(999, "标记已存在！"); } - }else{ + } else { return ResultVOUtils.error(999, "标记不能为空！"); } @@ -252,7 +259,7 @@ public class IoOrderMutiController { if (ioOrderMutiSetEntity == null) { return ResultVOUtils.error(999, "请设置补单条件！"); } - orderNo=ioOrderMutiService.insterOrder(ioOrderMutiEntity,ioOrderMutiSetEntity); + orderNo = ioOrderMutiService.insterOrder(ioOrderMutiEntity, ioOrderMutiSetEntity); } @@ -329,8 +336,8 @@ public class IoOrderMutiController { public BaseResponse addMutiDetail(@RequestBody IoOrderMutiUseEntity ioOrderMutiUseEntity) { - if (ioOrderMutiUseEntity.getCheckType() !=null && ioOrderMutiUseEntity.getCheckType() == 1) { - IoOrderMutiRequest ioOrderMutiRequest=new IoOrderMutiRequest(); + if (ioOrderMutiUseEntity.getCheckType() != null && ioOrderMutiUseEntity.getCheckType() == 1) { + IoOrderMutiRequest ioOrderMutiRequest = new IoOrderMutiRequest(); ioOrderMutiRequest.setStatus(0); ioOrderMutiRequest.setUdiCode(ioOrderMutiUseEntity.getUdiCode()); ioOrderMutiRequest.setMark(ioOrderMutiUseEntity.getMark()); @@ -378,8 +385,8 @@ public class IoOrderMutiController { ioOrderMutiUseService.save(ioOrderMutiUseEntity); //更新主表数量 - ioOrderMutiEntity.setUseCount(ioOrderMutiEntity.getUseCount()+1); - ioOrderMutiEntity.setReCount(ioOrderMutiEntity.getReCount()-1); + ioOrderMutiEntity.setUseCount(ioOrderMutiEntity.getUseCount() + 1); + ioOrderMutiEntity.setReCount(ioOrderMutiEntity.getReCount() - 1); ioOrderMutiEntity.setUpdateTime(new Date()); ioOrderMutiService.updateById(ioOrderMutiEntity); return ResultVOUtils.success();