采购计划提交系统繁忙问题，物资字典选入系统繁忙，生产企业查询系统繁忙

src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java

@@ -190,24 +190,27 @@ public class IoPurChangeService {
             List<PurPlanDetailEntity> purPlanDetailEntityList1 = new ArrayList<>(); //有供应商
             List<PurPlanDetailEntity> purPlanDetailEntityList2 = new ArrayList<>(); //无供应商
             for (PurPlanDetailEntity purPlanDetailEntity : purPlanDetailEntityList) {
-                  if(StrUtil.isNotBlank(purPlanDetailEntity.getSupId())){
+                if (StrUtil.isNotBlank(purPlanDetailEntity.getSupId())) {
-                      purPlanDetailEntityList1.add(purPlanDetailEntity);
+                    purPlanDetailEntityList1.add(purPlanDetailEntity);
-                  }else{
+                } else {
-                      purPlanDetailEntityList2.add(purPlanDetailEntity);
+                    purPlanDetailEntityList2.add(purPlanDetailEntity);
-                  }
+                }
             }
 
             //根据供应商分组
             Map<String, List<PurPlanDetailEntity>> purPlanDetailMap = purPlanDetailEntityList1.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
-            purPlanDetailMap.put("not",purPlanDetailEntityList2);
+            purPlanDetailMap.put("not", purPlanDetailEntityList2);
             basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
             if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
                 for (String key : purPlanDetailMap.keySet()) {
                     PurOrderEntity purOrderEntity = new PurOrderEntity();
                     List<PurPlanDetailEntity> purPlanDetailEntitys = purPlanDetailMap.get(key);
+                    if (purPlanDetailEntitys.isEmpty()) {
+                        continue;
+                    }
                     purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
                     purOrderEntity.setBillDate(purPlanEntity.getBillDate());
-                    if(!key.equals("not")){
+                    if (!key.equals("not")) {
                         purOrderEntity.setSupId(key);
                     }
                     purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());

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

@@ -182,6 +182,9 @@ public class UdiContrastService {
         udiProductEntity.setScbssfbhscrq("是");
         udiProductEntity.setScbssfbhsxrq("是");
         udiProductEntity.setScbssfbhxlh("否");
+        if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
+            udiProductEntity.setPrice(null);
+        }
         udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
         udiProductService.insertUdiInfo(udiProductEntity);
     }

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

@@ -207,11 +207,11 @@
                 AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')
             </if>
             <if test="thrPiId != '' and thrPiId != null">
-                and (thirdId LIKE concat('%', #{thrPiId}, '%')
+                and (basic_udirel.thirdId LIKE concat('%', #{thrPiId}, '%')
-                or thirdId1 LIKE concat('%', #{thrPiId}, '%')
+                or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%')
-                or thirdId2 LIKE concat('%', #{thrPiId}, '%')
+                or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%')
-                or thirdId3 LIKE concat('%', #{thrPiId}, '%')
+                or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%')
-                or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
+                or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%'))
             </if>
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
@@ -223,7 +223,7 @@
                 AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="thirdId != '' and thirdId != null">
-                AND thirdId LIKE concat(#{thirdId}, '%')
+                AND basic_udirel.thirdId LIKE concat(#{thirdId}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND basic_udirel.uuid = #{uuid}
@@ -273,7 +273,7 @@
                 </foreach>
             </if>
             <if test="flbm != '' and flbm != null">
-                and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm})
+                and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm}  or tp.cplb = #{flbm})
             </if>
             <if test="companyName != '' and companyName != null">
                 AND basic_corp.name like concat('%', #{companyName}, '%')
@@ -358,13 +358,13 @@
                 AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+                AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
             <if test="entireCpmctymc != '' and entireCpmctymc != null">
-                AND cpmctymc = #{entireCpmctymc}
+                AND basic_products.cpmctymc = #{entireCpmctymc}
             </if>
             <if test="ggxh != '' and ggxh != null">
-                AND ggxh LIKE concat('%', #{ggxh}, '%')
+                AND basic_products.ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
             <if test="unionCode != '' and unionCode != null">
                 and (
@@ -395,7 +395,7 @@
                 AND udplatCode = #{udplatCode}
             </if>
             <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
-                AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
+                AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
             </if>
             <if test="diType != '' and diType != null">
                 AND diType = #{diType}
@@ -444,7 +444,7 @@
                 and originUuid = #{originUuid}
             </if>
             <if test="manufactory != null and manufactory != ''">
-                and manufactory LIKE concat('%', #{manufactory}, '%')
+                and basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
             </if>
             <if test="dispatch != null">
                 and basic_udirel.dispatch = #{dispatch}