添加耗材字典对应集采信息，bug修改

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

@@ -31,6 +31,7 @@ import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.RedisUtil;
+import com.glxp.api.util.udi.UdiCalCountUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -103,6 +104,8 @@ public class IoOrderReviewController extends BaseController {
     IoCodeService codeService;
     @Resource
     IoCodeTempService codeTempService;
+    @Resource
+    UdiCalCountUtil calCountUtil;
 
     //前端扫码验收
     @AuthRuleAnnotation("")
@@ -137,7 +140,7 @@ public class IoOrderReviewController extends BaseController {
             for (IoOrderDetailResultResponse orderDetailResultResponse : orderDetailResultResponses) {
                 if (orderDetailResultResponse.getBindRlFk().longValue() == codeEntity.getRelId().longValue() &&
                         StrUtil.trimToEmpty(orderDetailResultResponse.getBatchNo()).equals(StrUtil.trimToEmpty(codeEntity.getBatchNo()))) {
-                    orderDetailResultResponse.setAcceptCount(orderDetailResultResponse.getAcceptCount() + codeEntity.getMyReCount());
+                    orderDetailResultResponse.setAcceptCount(orderDetailResultResponse.getAcceptCount() + calCountUtil.getActCount(codeEntity.getRelId()));
                     if (orderDetailResultResponse.getAcceptCount() > orderDetailResultResponse.getCount()) {
                         return ResultVOUtils.error(500, "数量溢出！");
                     }

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -348,4 +348,10 @@ public class BasicBussinessTypeEntity {
      */
     @TableField(exist = false)
     private boolean select;
+
+    @TableField(value = "vailDispatch")
+    private boolean vailDispatch;       //校验是否可配送
+    @TableField(value = "vailGroupBuy")
+    private int vailGroupBuy;            //校验是否集采产品  0:全部，1：只采集集采产品，2：只采集非集采产品
+
 }

src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java

@@ -37,5 +37,10 @@ public class UdiRelevanceEntity {
     private Integer lowStockNum;
     private Integer overStockNum;
     private Integer recentDateTime;
+
+
+    private Integer useExpireTime;
+    private boolean dispatch;           //是否可配送
+    private boolean groupBuy;           //是否集采产品
     private String relCode;
 }

src/main/java/com/glxp/api/req/auth/BussinessTypeFilterRequest.java

@@ -34,4 +34,7 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
     private List<String> actionList;
     private Boolean preIn;
 
+    private boolean vailDispatch;
+    private int vailGroupBuy;
+
 }

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -272,6 +272,7 @@ public class BussinessTypeSaveRequest {
     private Boolean supplementAll;
 
     private boolean preInBack;
-
+    private boolean vailDispatch;       //校验是否可配送
+    private int vailGroupBuy;            //校验是否集采产品  0:全部，1：只采集集采产品，2：只采集非集采产品
 
 }

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -83,9 +83,13 @@ public class UdiRelevanceSaveRequest {
     private String basicPrductRemak7;
     private String basicPrductRemak8;
     private String price;
-
+    private Integer useExpireTime;
 
     //关联修改提交:true;单独提交:false
     private Boolean relSubmit;
 
+
+    private boolean dispatch;           //是否可配送
+    private boolean groupBuy;           //是否集采产品
+
 }

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -123,5 +123,8 @@ public class BasicBussinessTypeResponse {
      */
     private String originAction;
 
+    private boolean vailDispatch;       //校验是否可配送
+    private int vailGroupBuy;            //校验是否集采产品  0:全部，1：只采集集采产品，2：只采集非集采产品
+
 
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -88,6 +88,8 @@ public class UdiRelevanceResponse {
 
     private Boolean bindCheck;
 
+    private Integer useExpireTime;
+
 
     //关联查询字典
     private String unitFk;          //供应商ID
@@ -95,6 +97,8 @@ public class UdiRelevanceResponse {
 
     //手持终端下载需要主键
     private Long relId;
+    private boolean dispatch;           //是否可配送
+    private boolean groupBuy;           //是否集采产品
 
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

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

@@ -54,7 +54,8 @@
 
     <insert id="insertIgnoreBussinessType" parameterType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
         insert
-        ignore into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit,
+                ignore
+        into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit,
                                    innerOrder, secCheckEnable, checkEnable, checkUdims, checkPdaEd,
                                    checkPdaUn, checkPc, checkWebNew, checkSp, checkChange, secCheckUdims,
                                    secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
@@ -63,9 +64,9 @@
                                    defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv,
                                    entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
                                    checkCopy, secCheckCopy, originAction, advanceType, changeEnable,
-                                                 spUse, preIn, supplementAll, createUser, createTime,preInBack)
+                                   spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch,
-        values (
+                                   vailGroupBuy)
-        #{mainAction},
+        values (#{mainAction},
                 #{action},
                 #{name},
                 #{enable},
@@ -116,8 +117,7 @@
                 #{preIn},
                 #{supplementAll},
                 #{createUser},
-        #{createTime},#{preInBack}
+                #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy})
-        )
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -173,7 +173,8 @@
         select action, name
         from basic_bussiness_type
         where action not in (
-            select code from thr_system_bus_api)
+                select code
+                from thr_system_bus_api)
     </select>
 
     <select id="selectCandidateBusType" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -241,6 +242,8 @@
     </select>
 
     <select id="selectNameByAction" resultType="java.lang.String">
-        select name from basic_bussiness_type where action = #{action}
+        select name
+        from basic_bussiness_type
+        where action = #{action}
     </select>
 </mapper>

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

@@ -312,7 +312,8 @@
                 AND relCode = #{relCode}
             </if>
             <if test="bindType != '' and bindType != null">
-                AND relCode is null or trim(relCode)=''
+                AND relCode is null
+                        or trim(relCode) = ''
             </if>
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%', #{supName}, '%')
@@ -586,7 +587,7 @@
                  isLock,
                  lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
                  updateUser,
-                 remark)
+                 remark, useExpireTime, dispatch, groupBuy)
         values (#{id},
                 #{uuid},
                 #{mainId},
@@ -609,7 +610,7 @@
                 #{modifyTime},
                 #{createUser},
                 #{updateUser},
-                #{remark})
+                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy})
     </insert>
 
     <insert id="insertUdiRelevanceignore" keyProperty="id"
@@ -621,7 +622,7 @@
                  isLock,
                  lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
                  updateUser,
-                 remark)
+                 remark, useExpireTime, dispatch, groupBuy)
         values (#{id},
                 #{uuid},
                 #{mainId},
@@ -644,7 +645,7 @@
                 #{modifyTime},
                 #{createUser},
                 #{updateUser},
-                #{remark})
+                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy})
     </insert>
 
     <delete id="deleteById" parameterType="Map">
@@ -736,6 +737,15 @@
             <if test="remark != null">
                 remark=#{remark},
             </if>
+            <if test="useExpireTime != null">
+                useExpireTime=#{useExpireTime},
+            </if>
+            <if test="dispatch != null">
+                dispatch=#{dispatch},
+            </if>
+            <if test="groupBuy != null">
+                groupBuy=#{groupBuy},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -763,7 +773,7 @@
                  isLock,
                  lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
                  updateUser,
-                 remark)
+                 remark, useExpireTime, dispatch, groupBuy)
                 values
 
         <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
@@ -789,7 +799,7 @@
              #{item.modifyTime},
              #{item.createUser},
              #{item.updateUser},
-                    # {item.remark})
+             #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy})
         </foreach>
     </insert>
 
@@ -862,7 +872,6 @@
             <if test="isDisable != null  and isDisable == false">
                 AND (isDisable is null or isDisable = false)
             </if>
-
         </where>
 
         group by basic_udirel.id
@@ -879,10 +888,8 @@
         <foreach collection="list" item="item" separator=";">
             update
                     basic_udirel
-            set
+            set `relCode` = #{item.relCode}
-            `relCode` = #{item.relCode}
+            where id = #{item.id}
-            where
-            id = #{item.id}
         </foreach>
     </update>
 

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

@@ -275,10 +275,10 @@
     <insert id="insertCompanyProductRelevance"
             parameterType="com.glxp.api.entity.basic.UdiRlSupEntity">
         replace
-        INTO company_product_relevance(customerId,productId,enterpriseId,registrationId,
+                INTO company_product_relevance(customerId, productId, enterpriseId, registrationId,
-        createTime,updateTime,auditStatus,productUuid,udiRlIdFk,unitFk,price,createUser,updateUser) values
+                                               createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
-       (
+                                               price, createUser, updateUser)
-        #{customerId},
+        values (#{customerId},
                 #{productId},
                 #{enterpriseId},
                 #{registrationId},
@@ -290,18 +290,17 @@
                 #{unitFk},
                 #{price},
                 #{createUser},
-        #{updateUser}
+                #{updateUser})
-        )
     </insert>
 
 
     <insert id="importCompanyProductRelevance"
             parameterType="com.glxp.api.entity.basic.UdiRlSupEntity">
         replace
-        INTO company_product_relevance(id,customerId,productId,enterpriseId,registrationId,
+                INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId,
-        createTime,updateTime,auditStatus,productUuid,udiRlIdFk,unitFk,price,createUser,updateUser) values
+                                               createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
-       (
+                                               price, createUser, updateUser)
-        #{id},
+        values (#{id},
                 #{customerId},
                 #{productId},
                 #{enterpriseId},
@@ -314,8 +313,7 @@
                 #{unitFk},
                 #{price},
                 #{createUser},
-        #{updateUser}
+                #{updateUser})
-        )
     </insert>
 
     <delete id="deleteById" parameterType="Map">
@@ -338,6 +336,8 @@
     </select>
 
     <select id="selectUnitFkByRelId" resultType="java.lang.String">
-        select unitFk from company_product_relevance where udiRlIdFk = #{relId}
+        select unitFk
+        from company_product_relevance
+        where udiRlIdFk = #{relId}
     </select>
 </mapper>

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

@@ -12,5 +12,8 @@ CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);
 
 CALL Pro_Temp_ColumnWork('basic_udirel', 'relCode', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1);
-
+CALL Pro_Temp_ColumnWork('basic_udirel', 'useExpireTime', 'int', 1);
-
+CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1);