Merge remote-tracking branch 'origin/dev' into dev

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<InvWarehouseEntity> results = new ArrayList<>();
         if (CollUtil.isNotEmpty(invWarehouseEntities1)) {

src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java

@@ -92,24 +92,31 @@ public class IoOrderMutiController {
             if (StrUtil.isNotBlank(udiEntity.getSerialNo())) {
                 //包含
                 QueryWrapper<IoOrderMutiEntity> 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())){
+                    if (StrUtil.isNotBlank(ioOrderMutiEntity.getMark())) {
-                        QueryWrapper<IoOrderMutiEntity> ew1=new QueryWrapper<>();
+                        QueryWrapper<IoOrderMutiEntity> ew1 = new QueryWrapper<>();
-                        ew1.eq("mark",ioOrderMutiEntity.getMark());
+                        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())){
+            if (StrUtil.isNotBlank(ioOrderMutiEntity.getMark())) {
-                QueryWrapper<IoOrderMutiEntity> ew=new QueryWrapper<>();
+                QueryWrapper<IoOrderMutiEntity> ew = new QueryWrapper<>();
-                ew.eq("mark",ioOrderMutiEntity.getMark());
+                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())){
+        if (StrUtil.isNotBlank(ioOrderMutiEntity.getMark())) {
-            QueryWrapper<IoOrderMutiEntity> ew1=new QueryWrapper<>();
+            QueryWrapper<IoOrderMutiEntity> ew1 = new QueryWrapper<>();
-            ew1.eq("mark",ioOrderMutiEntity.getMark());
+            ew1.eq("mark", ioOrderMutiEntity.getMark());
-            IoOrderMutiEntity ioOrderMutiEntityOne= ioOrderMutiService.getOne(ew1);
+            IoOrderMutiEntity ioOrderMutiEntityOne = ioOrderMutiService.getOne(ew1);
-            if(!ioOrderMutiEntityOne.getId().equals(ioOrderMutiEntity.getId())){
+            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) {
+        if (ioOrderMutiUseEntity.getCheckType() != null && ioOrderMutiUseEntity.getCheckType() == 1) {
-            IoOrderMutiRequest ioOrderMutiRequest=new IoOrderMutiRequest();
+            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.setUseCount(ioOrderMutiEntity.getUseCount() + 1);
-        ioOrderMutiEntity.setReCount(ioOrderMutiEntity.getReCount()-1);
+        ioOrderMutiEntity.setReCount(ioOrderMutiEntity.getReCount() - 1);
         ioOrderMutiEntity.setUpdateTime(new Date());
         ioOrderMutiService.updateById(ioOrderMutiEntity);
         return ResultVOUtils.success();

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.inout.IoCodeEntity;
-import com.glxp.api.entity.system.SystemParamConfigEntity;
+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();