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