Merge branch 'dev_drug' of http://116.204.71.86:3000/UDI/udi-spms-java into dev_drug

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
@@ -20,24 +19,18 @@ import com.glxp.api.controller.BaseController;
 import com.glxp.api.dao.inout.IoCodeDao;
 import com.glxp.api.dao.inout.IoCodeTempDao;
 import com.glxp.api.entity.auth.AuthAdmin;
-import com.glxp.api.entity.auth.CustomerInfoEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.EntrustReceEntity;
-import com.glxp.api.entity.collect.RelCodeBatch;
-import com.glxp.api.entity.collect.RelCodeDetail;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
-import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.alihealth.AlihealthYljgSinglerelationReqeust;
 import com.glxp.api.req.alihealth.AlihealthYljgUploadinoutbillReqeust;
-import com.glxp.api.req.alihealth.local.AlihealthRelCodeInsertReqeust;
 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.alihealth.AlihealthKytSinglerelationResponse;
 import com.glxp.api.res.alihealth.AlihealthYljgSinglerelationResponse;
 import com.glxp.api.res.inout.AcceptOrderResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
@@ -45,8 +38,6 @@ import com.glxp.api.res.sync.SpsSyncOrderResponse;
 import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.service.basic.EntrustReceService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
-import com.glxp.api.service.basic.impl.BasicBussinessTypeServiceImpl;
-import com.glxp.api.service.basic.impl.EntrustReceServiceImpl;
 import com.glxp.api.service.collect.RelCodeBatchService;
 import com.glxp.api.service.collect.RelCodeDetailService;
 import com.glxp.api.service.inout.*;
@@ -65,8 +56,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
 
 //单据验收
 @Slf4j
@@ -304,7 +297,6 @@ public class IoOrderReviewController extends BaseController {
 
     @Resource
     IBasicBussinessTypeService basicBussinessTypeService;
-
     @Resource
     GennerOrderUtils gennerOrderUtils;
     @Resource

src/main/java/com/glxp/api/res/alihealth/AlihealthYljgCodedetailResponse.java

@@ -51,7 +51,7 @@ public class AlihealthYljgCodedetailResponse extends AlihealthKytCommonParameter
     public List<IoCodeLostEntity> disposeRelCodeBatch(){
         List<IoCodeLostEntity> ioCodeLostEntityList = new ArrayList();
         List<JSONObject> list  = (List)this.getCode_full_info_dto();
-        if(list != null & list.size() >0){
+        if(list != null && list.size() >0){
             for (JSONObject jsonObject : list) {
                 IoCodeLostEntity connLostEntity = new IoCodeLostEntity();
                 connLostEntity.setId(IdUtil.getSnowflakeNextId());

src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java

@@ -327,7 +327,7 @@ public class IoCodeTempService {
         //判断此产品是否开启允许无批次号
         UdiProductEntity udiInfoEntity = udiProductService.findByNameCode(udiEntity.getUdi());
         if (udiInfoEntity == null) {
-            return ResultVOUtils.error(500, "耗材字典不存在此产品！");
+            return ResultVOUtils.error(500, "药品字典不存在此产品！");
         }
 
         String orderId = addOrderRequest.getBillNo();
@@ -727,7 +727,7 @@ public class IoCodeTempService {
         } else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息，一般不会出现
             codeEnttity.setRelId(null);
             codeEnttity.setStatus(2);
-            return ResultVOUtils.error(501, "耗材字典不存在此产品！");
+            return ResultVOUtils.error(501, "药品字典不存在此产品！");
         } else {
             codeEnttity.setStatus(0);
             if (codeEnttity.getRelId() == null)