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/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();