Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java

@@ -260,9 +260,10 @@ public class SysWorkplaceQueueController extends BaseController {
             return ResultVOUtils.error("UDI码不能为空");
         }
 
+
         UdiProductEntity byNameCode = udiProductService.findByNameCode(udiCode);
         if (byNameCode == null) {
-            return ResultVOUtils.error("UDI码未能识别出对应产品");
+            return ResultVOUtils.error("无法识别该编码");
         }
 
         String relId = byNameCode.getRelId();

src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java

@@ -84,7 +84,7 @@ public class SyncDataSetEntity {
     private int produceBusiness;//生产企业 PRODUCE_BUSINESS_DATA
 
     /**
-     * 设备任务
+     * 药品关联关系同步
      */
     private int drugDataTask;
 

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

@@ -13,6 +13,7 @@ import com.glxp.api.dao.basic.SupEvaluateDetailMapper;
 import com.glxp.api.dao.basic.UdiProductDao;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.entity.basic.SupEvaluateDetailEntity;
+import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.entity.thrsys.CodeRel;
@@ -107,8 +108,15 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
     }
 
     public UdiProductEntity findByNameCode(String nameCode) {
-        String prefix = FilterUdiUtils.getDiStr(nameCode);
-        return udiProductDao.findByNameCode(prefix);
+//        String prefix = FilterUdiUtils.getDiStr(nameCode);
+
+        if (nameCode.length() > 13) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(nameCode);
+            if (udiEntity != null) {
+                nameCode = udiEntity.getUdi();
+            }
+        }
+        return udiProductDao.findByNameCode(nameCode);
     }
 
     public UdiProductEntity findById(String id) {

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

@@ -170,7 +170,7 @@
         SELECT basic_products.*, basic_udirel.purType, basic_udirel.hcType, basic_udirel.id as relId
         FROM basic_products
         LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid
-        WHERE (basic_products.nameCode = #{nameCode})
+        WHERE (basic_products.nameCode = #{nameCode} or basic_products.ybbm = #{nameCode})
         limit 1
     </select>
     <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
@@ -194,7 +194,8 @@
         catalogname3,
         matrial,
         destinyType,
-                productsType,prepnUnit,prepnSpec,storageCondition,transportCondition,indate,packMatrial,majorType,majorStatus,physicType,medicareType,bzgg,
+        productsType, prepnUnit, prepnSpec, storageCondition, transportCondition, indate, packMatrial, majorType,
+        majorStatus, physicType, medicareType, bzgg,
         requireScanCode)
         values (#{id}, #{uuid},
         #{originUuid},
@@ -1002,7 +1003,6 @@
             <if test="matrial != null">
                 matrial=#{matrial},
             </if>
-
         </trim>
         where id = #{id}
     </update>
@@ -1291,6 +1291,7 @@
     </select>
     <select id="selectListByUuid" resultType="com.glxp.api.entity.basic.UdiProductEntity">
         select *
-        from basic_products where uuid = #{uuid}
+        from basic_products
+        where uuid = #{uuid}
     </select>
 </mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -4825,3 +4825,9 @@ CREATE TABLE IF NOT EXISTS `third_ali_drug`
   CHARACTER SET = utf8mb4
   COLLATE = utf8mb4_0900_ai_ci
   ROW_FORMAT = Dynamic;
+
+
+
+CALL Pro_Temp_ColumnWork('sync_data_set', 'drugDataTask',
+                         ' tinyint  NULL DEFAULT NULL COMMENT ''药品关联关系同步''',
+                         1);