打印，包装规格，第三方产品审核等问题

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

@@ -217,7 +217,7 @@ public class BasicOrderPrintController {
                 for (IoCodeEntity obj : ioCodeEntityList) {
                     //查询业务表
                     for (IoOrderDetailBizEntity ioObj : ioOrderDetailBizEntityList) {
-                        if (ioObj.getBatchNo().equals(obj.getBatchNo()) && ioObj.getBindRlFk().equals(obj.getRelId())) {
+                        if (StrUtil.trimToEmpty(ioObj.getBatchNo()).equals(StrUtil.trimToEmpty(obj.getBatchNo())) && ioObj.getBindRlFk().equals(obj.getRelId())) {
                             ioOrderDetailBizEntity = ioObj;
                             break;
                         }

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

@@ -201,7 +201,7 @@ public class IoOrderDetailBizController extends BaseController {
                 }
             }
 
-            if(bussinessTypeEntity != null && udiRelevanceResponse != null) {
+            if (bussinessTypeEntity != null && udiRelevanceResponse != null) {
                 //是否校验耗材材质  1：高值耗材；2.普通耗材
                 if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) {
                     if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {

src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java

@@ -243,9 +243,7 @@ public class ThrProductsAddDiController {
                     udiRelevanceEntity.setUuid(udiProductEntity.getUuid());
                     udiRelevanceEntity.setSupName(thrProductsAddDiEntity.getSupName());
                     udiRelevanceEntity.setIsDisable(false);
-
-
-                    udiProductEntity.setNameCode(null);
+//                    udiProductEntity.setNameCode(null);
                     udiProductService.insertUdiInfo(udiProductEntity);
                     udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
                     //回填关联关系到关联表

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

@@ -634,6 +634,12 @@ CALL Pro_Temp_ColumnWork('basic_products', 'bzgg',
                          1);
 
 
+CALL Pro_Temp_ColumnWork('thr_products', 'bzgg',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''包装规格''',
+                         1);
+
+
+
 UPDATE auth_menu
 SET `menu_name`   = '选入入院产品',
     `parent_id`   = 1819,