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

# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql

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

@@ -321,6 +321,7 @@ public class UdiRlSupController extends BaseController {
         udiRelevanceEntity.setId(Long.parseLong(rlidStr));
         udiRelevanceEntity.setLockStatus(1);
         udiRelevanceEntity.setProductsType(2);
+        udiRelevanceEntity.setUpdateTime(new Date());
         udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         UdiProductEntity udiProductEntity = new UdiProductEntity();
         udiProductEntity.setProductsType(2);

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

@@ -786,7 +786,8 @@ public class IoCodeTempController extends BaseController {
                 if (unitFk == null)
                     return ResultVOUtils.error(500, "耗材字典不存在此产品！");
                 else
-                    return ResultVOUtils.error(500, "当前供应商不存在此配送产品！");
+                    return ResultVOUtils.error(500, "83720660090080653605" +
+                            "！");
             }
 
             //校验供应商是否配送此产品

src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java

@@ -179,4 +179,11 @@ public class IoOrderDetailCodeResponse {
     //金额
     private BigDecimal amount;
 
+
+    private String bzgg;
+    private String packUnit;
+    private String prepnSpec;
+    private String prepnUnit;
+
+
 }

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -280,6 +280,7 @@ public class UdiProductServiceImpl implements UdiProductService {
             udiRelevanceEntity.setHcType(addProductRequest.getHcType());
             udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
 
+
             if (CollUtil.isNotEmpty(addProductRequest.getDrugLevelLists())) {
                 for (UpdateLevelDrugRequest updateLevelDrugRequest : addProductRequest.getDrugLevelLists()) {
                     UdiProductEntity udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode());
@@ -301,6 +302,8 @@ public class UdiProductServiceImpl implements UdiProductService {
                     udiProductEntity.setZczbhhzbapzbh(addProductRequest.getRegisterNo());
                     udiProductEntity.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
                     udiProductEntity.setUuid(udiProductEntity.getUuid());
+                    //药品扫码 过滤 三期
+                    udiProductEntity.setAllowNoSerial(true);
                     if (IntUtil.value(udiProductEntity.getPackLevel()) == 1 || addProductRequest.getDrugLevelLists().size() == 1) {
                         udiProductEntity.setDiType(1);
                         if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) {

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

@@ -181,23 +181,27 @@
     </select>
     <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
         replace
-                INTO basic_products
-                (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
-                 zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
-                 ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
-                 manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
-                 allowNoBatch, allowNoExpire,
-                 allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
-                 basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
-                 basicPrductRemak8, updateTime
-                        , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName,
-                 catalogname1,
-                 catalogname2,
-                 catalogname3,
-                 matrial,
-                 catalogCode1,
-                 catalogCode2,
-                 catalogCode3)
+            INTO basic_products
+        (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
+         zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
+         ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
+         manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
+         allowNoBatch, allowNoExpire,
+         allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
+         basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
+         basicPrductRemak8, updateTime
+            , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName,
+         pinyinInitial,
+         updateUser,
+         createTime,
+         createUser,
+         catalogname1,
+         catalogname2,
+         catalogname3,
+         matrial,
+         destinyType,
+         productsType,prepnUnit,prepnSpec,storageCondition,transportCondition,indate,packMatrial,majorType,majorStatus,physicType,medicareType,bzgg,
+         requireScanCode)
         values (#{id}, #{uuid},
                 #{originUuid},
                 #{nameCode},
@@ -249,15 +253,29 @@
                 #{basicPrductRemak6},
                 #{basicPrductRemak7},
                 #{basicPrductRemak8}, #{updateTime}
-                       , #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs},
-                #{categoryName},
+                   , #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs},
+                #{categoryName}, #{pinyinInitial},
+                #{updateUser},
+                #{createTime},
+                #{createUser},
                 #{catalogname1},
                 #{catalogname2},
                 #{catalogname3},
                 #{matrial},
-                #{catalogCode1},
-                #{catalogCode2},
-                #{catalogCode3})
+                #{destinyType},
+                #{productsType},
+                #{prepnUnit},
+                #{prepnSpec},
+                #{storageCondition},
+                #{transportCondition},
+                #{indate},
+                #{packMatrial},
+                #{majorType},
+                #{majorStatus},
+                #{physicType},
+                #{medicareType},
+                #{bzgg},
+                #{requireScanCode})
     </insert>
 
     <insert id="insertUdiInfos" parameterType="java.util.List">

src/main/resources/mybatis/mapper/inout/IoCodeDao.xml

@@ -132,9 +132,6 @@
             <if test="code != null and code != ''">
                 AND ic.code = #{code}
             </if>
-            <if test="productType != null and productType != ''">
-                AND bp.productsType = #{productType}
-            </if>
             <if test="orderId != null and orderId != ''">
                 AND ic.orderId like concat('%', #{orderId}, '%')
             </if>

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -42,9 +42,6 @@
             <if test="relId != null">
                 AND bindRlFk = #{relId}
             </if>
-            <if test="productType != null">
-                AND bp.productsType = #{productType}
-            </if>
             <if test="batchNo != null and batchNo != ''">
                 AND batchNo = #{batchNo}
             </if>

src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml

@@ -3,6 +3,10 @@
 <mapper namespace="com.glxp.api.dao.inout.IoOrderDetailCodeDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
         select io_order_detail_code.*,
+        bp.bzgg,
+        bp.prepnUnit,
+        bp.prepnSpec,
+        bp.packUnit,
                (select `name` from basic_corp where erpId = io_order_detail_code.supId) supName
         from io_order_detail_code
                      left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk
@@ -45,9 +49,6 @@
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
             </if>
-            <if test="productType != null">
-                AND bp.productsType = #{productType}
-            </if>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
             </if>

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

@@ -972,6 +972,9 @@ CALL Pro_Temp_ColumnWork('thr_products_add_di', 'productType',
                          ' tinyint NULL DEFAULT b''1'' COMMENT ''产品类型 1:耗材 2:药品''',
                          1);
 CALL Pro_Temp_ColumnWork('basic_products', 'pinyinInitial', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_products', 'destinyType',
+                         ' int(0)  NULL DEFAULT NULL COMMENT''类型：1：定数包，内部使用；2：项目、组套外部关联''',
+                         1);
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailHcType',
                          'tinyint    NULL DEFAULT NULL COMMENT '' 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材''', 1);