bug修改

src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

@@ -55,6 +55,7 @@ public class BasicCorpController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<BasicCorpResponse> basicUnitMaintainEntities;
+        basicUnitMaintainFilterRequest.setCompanyIdFk(Long.parseLong(getCompanyId()));
         basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
 
 
@@ -66,6 +67,7 @@ public class BasicCorpController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+
     @Resource
     UserCompanyService userCompanyService;
 

src/main/java/com/glxp/api/controller/basic/UdiProductController.java

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -245,5 +246,42 @@ public class UdiProductController extends BaseController {
         }
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("udiwms/udiinfo/superSearch")
+    public BaseResponse superSearch(FilterUdiInfoRequest filterUdiInfoRequest) {
+
+        if (StrUtil.isEmpty(filterUdiInfoRequest.getNameCode()) && StrUtil.isEmpty(filterUdiInfoRequest.getUdiCode())) {
+            return ResultVOUtils.error(500, "DI不能为空！");
+        }
+
+        if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode())) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
+            if (udiEntity == null)
+                return ResultVOUtils.error(500, "UDI码格式错误！");
+            filterUdiInfoRequest.setNameCode(udiEntity.getUdi());
+        }
+
+        ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
+        productInfoFilterRequest.setNameCode(filterUdiInfoRequest.getNameCode());
+        productInfoFilterRequest.setPage(filterUdiInfoRequest.getPage());
+        productInfoFilterRequest.setLimit(filterUdiInfoRequest.getLimit());
+        try {
+            BaseResponse<List<ProductInfoEntity>> listBaseResponse = asyncDiDlHelper.dlByDiRes(productInfoFilterRequest.getNameCode());
+            if (listBaseResponse.getCode() == 20000) {
+                List<ProductInfoEntity> productInfoEntityList = listBaseResponse.getData();
+                if (CollUtil.isNotEmpty(productInfoEntityList)) {
+                    productInfoService.insertProductInfos(productInfoEntityList);
+                } else {
+                    ResultVOUtils.error(500, "未查询到该产品DI");
+                }
+            } else {
+                return listBaseResponse;
+            }
+            return listBaseResponse;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultVOUtils.error(500, "连接UDI数据下载服务出错！");
+        }
+    }
 
 }

src/main/java/com/glxp/api/controller/trace/UdiTraceController.java

@@ -13,6 +13,7 @@ import com.glxp.api.config.rabbit.TopicRabbitConfig;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.UdiEntity;
+import com.glxp.api.entity.stat.AnncmntProductEntity;
 import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.entity.trace.*;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
@@ -24,6 +25,7 @@ import com.glxp.api.res.basic.BasicUdiRelResponse;
 import com.glxp.api.res.sup.UserCompanyResponse;
 import com.glxp.api.res.trace.TraceSearchReponse;
 import com.glxp.api.service.basic.BasicUdiRelService;
+import com.glxp.api.service.stat.AnncmntProductService;
 import com.glxp.api.service.sup.UserCompanyService;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.service.trace.*;
@@ -297,6 +299,24 @@ public class UdiTraceController extends BaseController {
     }
 
 
+    @Resource
+    AnncmntProductService anncmntProductService;
+
+    /**
+     * UDI扫码校验不良信息库
+     */
+    @ApiOperation(value = "UDI扫码校验不良信息库", response = TraceOrderEntity.class)
+    @GetMapping("udi/trace/badDb/search")
+    public BaseResponse badDbSearch(TraceRecordRequest traceRecordRequest) {
+
+        UdiEntity udiEntity = FilterUdiUtils.getUdi(traceRecordRequest.getUdiCode());
+        AnncmntProductEntity anncmntProductEntity = anncmntProductService.getOne(new QueryWrapper<AnncmntProductEntity>().eq("nameCode", udiEntity.getUdi()).last("limit 1"));
+        if (anncmntProductEntity != null) {
+            return ResultVOUtils.success(anncmntProductEntity);
+        }
+        return ResultVOUtils.error(500, "无异常！");
+    }
+
 //    /**
 //     * 客户端根据任务上传出入库单据
 //     *

src/main/java/com/glxp/api/entity/stat/AnncmntProductBatchEntity.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -36,7 +38,7 @@ public class AnncmntProductBatchEntity implements Serializable {
      * 批次号
      */
     @TableField(value = "batchNo")
-    private Integer batchNo;
+    private String batchNo;
 
     /**
      * 生产日期

src/main/java/com/glxp/api/service/basic/BasicUdiRelService.java

@@ -56,22 +56,24 @@ public class BasicUdiRelService extends ServiceImpl<BasicUdiRelMapper, BasicUdiR
     //查找源头企业，1.先找出生产企业；2.找出代理商与购买方
     public List<UserCompanyResponse> findSourceByNameCode(String nameCode) {
         List<UserCompanyResponse> userCompanyEntities = basicUdiRelMapper.findByNameCode(nameCode);
-        List<UserCompanyResponse> manuCompanyList = new ArrayList<>();
+//        List<UserCompanyResponse> manuCompanyList = new ArrayList<>();
-        List<UserCompanyResponse> agentCompanyList = new ArrayList<>();
+//        List<UserCompanyResponse> agentCompanyList = new ArrayList<>();
-        if (CollUtil.isNotEmpty(userCompanyEntities)) {
+//        if (CollUtil.isNotEmpty(userCompanyEntities)) {
-            for (UserCompanyResponse userCompanyEntity : userCompanyEntities) {
+//            for (UserCompanyResponse userCompanyEntity : userCompanyEntities) {
-                if (IntUtil.value(userCompanyEntity.getCompanyType()) == 1) {//生产企业
+//                if (IntUtil.value(userCompanyEntity.getCompanyType()) == 1) {//生产企业
-                    manuCompanyList.add(userCompanyEntity);
+//                    manuCompanyList.add(userCompanyEntity);
-                } else {
+//                } else {
-                    agentCompanyList.add(userCompanyEntity);
+//                    agentCompanyList.add(userCompanyEntity);
-                }
+//                }
-            }
+//            }
-        }
+//        }
-        if (CollUtil.isNotEmpty(manuCompanyList)) {
+//        if (CollUtil.isNotEmpty(manuCompanyList)) {
-            return manuCompanyList.stream().distinct().collect(Collectors.toList());
+//            return manuCompanyList.stream().distinct().collect(Collectors.toList());
-        } else {
+//        } else {
-            return agentCompanyList.stream().distinct().collect(Collectors.toList());
+//            return agentCompanyList.stream().distinct().collect(Collectors.toList());
-        }
+//        }
+        return userCompanyEntities.stream().distinct().collect(Collectors.toList());
+
     }
 
     public List<UserCompanyResponse> findByNameCode(String nameCode) {

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_cpt2?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_cpt3?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -86,6 +86,11 @@
             <if test="corpType != null">
                 AND corpType = #{corpType}
             </if>
+            <if test="companyIdFk != null">
+                AND companyIdFk = #{companyIdFk}
+            </if>
+
+
             <if test="outType != null">
                 AND (outType <![CDATA[ <> ]]> #{outType} or outType is NULL)
             </if>

src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml

@@ -80,7 +80,7 @@
                 and batchNo = #{batchNo}
             </if>
         </where>
-        order by trace_order.updateTime desc ,trace_order.billDate
+        order by trace_order.billDate, trace_order.updateTime desc
     </select>