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

# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
#	src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

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

@@ -429,8 +429,7 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-
-        if(udiInfoEntity.getRequireScanCode() == 1){
+//        if(udiInfoEntity.getRequireScanCode() == 1){
             //是否校验耗材材质  1：高值耗材；2.普通耗材
             if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
                 if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
@@ -441,7 +440,7 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
                 }
             }
-        }
+//        }
 
         String orderId = addOrderRequest.getBillNo();
 

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

@@ -201,8 +201,7 @@ public class IoOrderDetailBizController extends BaseController {
                 }
             }
 
-
-            if(udiRelevanceResponse.getRequireScanCode() == 1) {
+//            if(udiRelevanceResponse.getRequireScanCode() == 1) {
                 //是否校验耗材材质  1：高值耗材；2.普通耗材
                 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
                     if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
@@ -213,7 +212,7 @@ public class IoOrderDetailBizController extends BaseController {
                         return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
                     }
                 }
-            }
+//            }
 
             if (IntUtil.value(bussinessTypeEntity.getCheckCertExpire()) == 2 && udiRelevanceResponse.isNeedCert()) {
                 SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), authAdmin.getCustomerId());

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

@@ -1404,6 +1404,7 @@
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
                basic_products.categoryName,
+               basic_products.requireScanCode,
                company_product_relevance.unitFk,
                basic_corp.name companyName,
                basic_products.cphhhbh