采购类型相关修改

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

@@ -228,6 +228,9 @@ public class UdiRelevanceController extends BaseController {
     @GetMapping("udiwms/udiinfo/local/filterByUuid")
     public BaseResponse filterLocalByUuid(FilterUdiRelRequest filterUdiRelRequest) {
 
+        if (filterUdiRelRequest.getId() == null) {
+            return ResultVOUtils.error(500, "产品ID主键不能为空！");
+        }
         if (filterUdiRelRequest.getId() == null) {
             return ResultVOUtils.error(500, "产品ID主键不能为空！");
         }
@@ -239,6 +242,7 @@ public class UdiRelevanceController extends BaseController {
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
             for (UdiProductEntity udiProductEntity : udiInfoEntities) {
                 UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse();
+                BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse);
                 BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse);
                 udiRelevanceResponses.add(udiRelevanceResponse);
             }
@@ -553,7 +557,6 @@ public class UdiRelevanceController extends BaseController {
     }
 
 
-
     //获取对照过滤列表
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/udirel/thirdSys/detail")

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

@@ -714,11 +714,11 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "该产品不可配送，请联系院方！");
                 }
 
-                if (bussinessTypeEntity.getVailGroupBuy() == 1 && !udiRelevanceResponse.isGroupBuy()) {       //只采集集采产品
+                if (bussinessTypeEntity.getVailGroupBuy() == 1 && !IntUtil.value(udiRelevanceResponse.getGroupBuy())) {       //只采集集采产品
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "只允许录入集采产品！");
                 }
 
-                if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) {        //只采集非集采产品
+                if (bussinessTypeEntity.getVailGroupBuy() == 2 && IntUtil.value(udiRelevanceResponse.getGroupBuy())) {        //只采集非集采产品
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "只允许录入非集采产品！");
                 }
 

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

@@ -226,6 +226,7 @@ public class ThrProductsAddDiController {
                     udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
                     udiProductEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
                     udiRelevanceEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
+                    udiRelevanceEntity.setPurType(thrProductsAddDiResponse.getPurType());
                     udiProductEntity.setNameCode(null);
                     udiProductService.updateUdiInfoByUuid(udiProductEntity);
                     UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();

src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java

@@ -32,7 +32,8 @@ public interface BasicBusTypePreDao extends BaseMapperPlus<BasicBusTypePreDao, B
      * @param action
      * @return
      */
-    List<BasicBusTypePreEntity> findByAction(String action);
+    List<BasicBusTypePreEntity> findByAction(@Param("action") String action, @Param("originAction") String originAction);
+
 
     /**
      * 查询单据流转列表数据
@@ -44,4 +45,4 @@ public interface BasicBusTypePreDao extends BaseMapperPlus<BasicBusTypePreDao, B
 
     boolean insertOrUpdate(BasicBusTypePreEntity record);
 
-}
+}

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

@@ -52,7 +52,7 @@ public class BasicBusTypePreEntity {
     private Integer changeType;
 
     /**
-     * 补单默认分库
+     * 补单默认部门
      */
     @TableField(value = "defaultDeptCode")
     private String defaultDeptCode;
@@ -123,24 +123,37 @@ public class BasicBusTypePreEntity {
     @TableField(value = "remark")
     private String remark;
 
-//   创建单模式：1：送货至入库单模式；2.向上级补单模式；3.预验收转入库单模式，4.寄售转入库单模式
-
+    /**
+     * 创建单模式：1：送货至入库单模式；2.向上级补单模式；3.预验收转入库单模式，4.寄售转入库单模式，5.退货向上级补单模式
+     */
     @TableField(value = "createType")
     private int createType;
 
-
     /**
      * 目标业务单
      */
     @TableField(value = "targetBusAction")
     private String targetBusAction;
+    /**
+     * 业务单据补单时间间隔
+     */
     @TableField(value = "busBeforeTime")
     private Integer busBeforeTime;
+    /**
+     * 生成扫码单据单据状态
+     */
     @TableField(value = "auditStatus")
     private Integer auditStatus;
+    /**
+     * 生成业务单据单据状态
+     */
     @TableField(value = "busAuditStatus")
     private Integer busAuditStatus;
-
+    /**
+     * 单据拆单模式：   0：无需拆单，1：入账库；2:预验收库；3:寄售仓库
+     */
+    @TableField(value = "splitOrder")
+    private Integer splitOrder;
     @TableField(exist = false)
     public static final String COL_ID = "id";
 

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

@@ -196,11 +196,10 @@ public class BasicBussinessTypeEntity {
     private boolean secCheckBalance;
 
     /**
-     * 允许科室多次使用出库
+     * 物资使用出库模式 0:正常，1：物资多次使用出库；2：科室集合使用出库
      */
     @TableField(value = "useDyCount")
-    private boolean useDyCount;
-
+    private int useDyCount;
     /**
      * 到期提示
      */

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

@@ -96,7 +96,11 @@ public class UdiRelevanceEntity {
      */
     @TableField(value = "isAdavence")
     private Boolean isAdavence;
-
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    @TableField(value = "purType")
+    private Integer purType;
     /**
      * 是否允许多次使用出库
      */

src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java

@@ -286,6 +286,10 @@ public class ThrProductsAddDiEntity {
     @ApiModelProperty(value = "集采")
     private Boolean groupBuy;
 
+    @TableField(value = "purType")
+    @ApiModelProperty(value = "采购类型")
+    private Integer purType;
+
 
     /**
      * 1第三方2自增

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

@@ -163,7 +163,7 @@ public class BussinessTypeSaveRequest {
     private Boolean secCheckBalance;
 
     /**
-     * 允许科室多次使用出库
+     * 物资使用出库模式 0:正常，1：物资多次使用出库；2：科室集合使用出库
      */
     private Boolean useDyCount;
 

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

@@ -24,6 +24,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
 
     private String thirdCode;
     private String thirdSys;
+    private String mainId;
 
     private String lastUpdateTime;
     private String zczbhhzbapzbh;
@@ -40,6 +41,8 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private Integer filterType;         //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码
     private String customerId;
 
+    private String pinyinInitial;
+    private String code;
 
     private String auditStatus;
     private String companyName;
@@ -47,7 +50,24 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private Boolean isAdavence;
     private String unitFk;
 
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+
     private String corpId;
     private String billType;
+    private String manufactory;
+    private String flbm;
     private List<String> uuids;
+
+    private String basicPrductRemak1;
+    private String basicPrductRemak2;
+    private String basicPrductRemak3;
+    private String basicPrductRemak4;
+    private String basicPrductRemak5;
+    private String basicPrductRemak6;
+    private String basicPrductRemak7;
+    private String basicPrductRemak8;
+    private String category;
 }

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

@@ -45,6 +45,10 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private String udplatCode;
     private String mainId;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
     private String corpId;
     private String billType;
 

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

@@ -46,6 +46,10 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String udplatCode;
     private String mainId;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
     private String corpId;
     private String billType;
 

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

@@ -22,4 +22,5 @@ public class SupplementRequest {
     private String cpms;
     private String price;
     private Boolean groupBuy;
+    private Integer purType;
 }

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

@@ -31,6 +31,10 @@ public class UdiRelevanceRequest {
     private Integer lockStatus;
     private String udplatCode;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
     private String supName;
     private String originUuid;
     private String price;

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

@@ -22,6 +22,10 @@ public class UdiRelevanceSaveRequest {
     private Boolean isLock;
     private Integer lockStatus;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
     private Boolean useMuti;
     private Integer useNum;
     private String supName;

src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java

@@ -50,6 +50,7 @@ public class AddThrDiProductsRequest {
 
     private String deviceRecordKey;
     private Boolean groupBuy;
+    private Integer purType;
 
 
 }

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

@@ -76,6 +76,9 @@ public class BasicBussinessTypeResponse {
 
     private int checkBalance;
     private boolean secCheckBalance;
+    /**
+     * 物资使用出库模式 0:正常，1：物资多次使用出库；2：科室集合使用出库
+     */
     private boolean useDyCount;
 
     private boolean expireTip;

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

@@ -58,7 +58,10 @@ public class CompanyProductRelevanceResponse {
     private String mainId;
     private String mainName;
     private Boolean isAdavence;
-
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
     private String scbssfbhph;
     private String scbssfbhxlh;
     private String scbssfbhscrq;

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

@@ -22,6 +22,10 @@ public class UdiRelevanceResponse {
     private Boolean isLock;
     private Integer lockStatus;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
     private Boolean useMuti;
     private Integer useNum;
     private String supName;
@@ -104,7 +108,7 @@ public class UdiRelevanceResponse {
     //手持终端下载需要主键
     private Long relId;
     private boolean dispatch;           //是否可配送
-    private boolean groupBuy;           //是否集采产品
+    private Boolean groupBuy;           //是否集采产品
     private boolean needCert;           //是否需要资质材料
 
     private String classifyName;        //物资分类名称

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

@@ -59,6 +59,10 @@ public class UdiRlSupResponse {
     private String mainId;
     private String mainName;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
 
     private String scbssfbhph;
     private String scbssfbhxlh;

src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java

@@ -60,6 +60,10 @@ public class UdiInfoResponse {
     private Integer status;
     private String supId;
     private boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
     private boolean isDisable;
     private boolean useMuti;
 

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

@@ -20,6 +20,7 @@ public interface IBasicBusTypePreService extends IService<BasicBusTypePreEntity>
      * @return
      */
     List<BasicBusTypePreEntity> filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest);
+
     /**
      * 根据ID删除补单单据类型
      *
@@ -62,6 +63,8 @@ public interface IBasicBusTypePreService extends IService<BasicBusTypePreEntity>
      */
     List<BasicBusTypePreEntity> findByAction(String action);
 
+    List<BasicBusTypePreEntity> findByOiginActions(String originAction);
+
     /**
      * 查询单据流转列表数据
      *

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

@@ -101,4 +101,7 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
      * @return
      */
     String getRelIdByUdiCode(String code);
+
+    Integer findPurType(Long relId);
+
 }

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

@@ -62,7 +62,12 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl<BasicBusTypePreDao,
 
     @Override
     public List<BasicBusTypePreEntity> findByAction(String action) {
-        return basicBusTypePreDao.findByAction(action);
+        return basicBusTypePreDao.findByAction(action, null);
+    }
+
+    @Override
+    public List<BasicBusTypePreEntity> findByOiginActions(String originAction) {
+        return basicBusTypePreDao.findByAction(null, originAction);
     }
 
     @Override
@@ -83,14 +88,17 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl<BasicBusTypePreDao,
 
     @Override
     public boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity) {
+
+        // 校验是否有相同的单据类型流转配置
         QueryWrapper<BasicBusTypePreEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("action", basicBusTypePreEntity.getAction())
                 .eq("originAction", basicBusTypePreEntity.getOriginAction())
-                .eq("invCode", basicBusTypePreEntity.getInvCode())
+                .eq(null != basicBusTypePreEntity.getInvCode(), "invCode", basicBusTypePreEntity.getInvCode())
                 .eq(null != basicBusTypePreEntity.getBeforeTime(), "beforeTime", basicBusTypePreEntity.getBeforeTime())
                 .eq(null != basicBusTypePreEntity.getDefaultInvCode(), "defaultInvCode", basicBusTypePreEntity.getDefaultInvCode())
-                .eq(null != basicBusTypePreEntity.getSupplementAll(), "supplementAll", basicBusTypePreEntity.getSupplementAll());
-
+                .eq(null != basicBusTypePreEntity.getSupplementAll(), "supplementAll", basicBusTypePreEntity.getSupplementAll())
+                .eq(null != basicBusTypePreEntity.getAuditStatus(), "auditStatus", basicBusTypePreEntity.getAuditStatus())
+                .eq(null != basicBusTypePreEntity.getBusAuditStatus(), "busAuditStatus", basicBusTypePreEntity.getBusAuditStatus());
         List<BasicBusTypePreEntity> list = basicBusTypePreDao.selectList(wrapper);
         if (CollUtil.isNotEmpty(list)) {
             if (null != basicBusTypePreEntity.getId()) {

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

@@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantStatus;
@@ -405,4 +406,11 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
         UdiEntity udi = FilterUdiUtils.getUdi(code);
         return udiRelevanceDao.selectRelIdByNameCode(udi.getUdi());
     }
+
+
+    @Override
+    public Integer findPurType(Long relId) {
+        UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectOne(new QueryWrapper<UdiRelevanceEntity>().select("purType").eq("id", relId).last("limit 1"));
+        return IntUtil.value(udiRelevanceEntity.getPurType());
+    }
 }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java

@@ -131,6 +131,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             thrProductsAddDiEntity.setSpmc(thrDiProductsRequest.getSpmc());
             thrProductsAddDiEntity.setCpms(thrDiProductsRequest.getCpms());
             thrProductsAddDiEntity.setPrice(thrDiProductsRequest.getPrice());
+            thrProductsAddDiEntity.setPurType(thrDiProductsRequest.getPurType());
 
             thrProductsAddDiEntity.setCreateTime(date);
             thrProductsAddDiEntity.setUpdateTime(new Date());
@@ -157,6 +158,8 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname());
             udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
             udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice());
+            udiInfoResponse.setPurType(thrProductsAddDiEntity.getPurType());
+
             udiInfoResponse.setBasicPrductRemak1(thrProductsAddDiEntity.getBasicPrductRemak1());
             udiInfoResponse.setBasicPrductRemak2(thrProductsAddDiEntity.getBasicPrductRemak2());
             udiInfoResponse.setBasicPrductRemak3(thrProductsAddDiEntity.getBasicPrductRemak3());

src/main/java/com/glxp/api/util/SupplementVailUtil.java

@@ -84,7 +84,12 @@ public class SupplementVailUtil {
                     return "请选择是否集采";
                 }
             }
-
+            basicProductSetEntity = basicProductSetEntityMap.get("purType");
+            if (isMustFill(type, basicProductSetEntity)) {
+                if (StrUtil.isEmptyIfStr(supplementRequest.getPurType())) {
+                    return "采购类型不能为空";
+                }
+            }
 
             basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak1");
             if (isMustFill(type, basicProductSetEntity)) {

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

@@ -19,12 +19,19 @@
 
     <select id="findByAction" resultType="com.glxp.api.entity.basic.BasicBusTypePreEntity">
         select basic_bustype_pre.*,
-               basic_bussiness_type.name
+        basic_bussiness_type.name
         from basic_bustype_pre
-                     left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action
-                     left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code
-                     left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code
-        where basic_bustype_pre.action = #{action}
+        left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action
+        left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code
+        left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code
+        <where>
+            <if test="originAction != null and originAction != ''">
+                AND basic_bustype_pre.originAction like concat('%', #{originAction}, '%')
+            </if>
+            <if test="action != null and action != ''">
+                AND basic_bustype_pre.action like concat('%', #{action}, '%')
+            </if>
+        </where>
     </select>
 
     <select id="selectBusTypePreResList" resultType="com.glxp.api.res.basic.BasicBusTypePreResponse">

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

@@ -99,6 +99,7 @@
                customer_info.companyName,
                basic_udirel.mainId,
                basic_udirel.isAdavence,
+               basic_udirel.purType,
                basic_products.scbssfbhph,
                basic_products.scbssfbhxlh,
                basic_products.scbssfbhscrq,

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

@@ -326,7 +326,8 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName,basic_products.cphhhbh,
+               basic_products.categoryName,
+               basic_products.cphhhbh,
                company_product_relevance.unitFk,
                basic_corp.name companyName
         FROM basic_udirel
@@ -465,7 +466,7 @@
                basic_products.categoryName,
                basic_products.groupBuy,
                basic_products.basicPrductRemak8,
-        basic_products.cphhhbh
+               basic_products.cphhhbh
         FROM basic_products
                      inner JOIN basic_udirel
                 ON basic_products.uuid = basic_udirel.uuid
@@ -647,7 +648,8 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName,basic_products.cphhhbh
+               basic_products.categoryName,
+               basic_products.cphhhbh
         FROM basic_products
                      inner JOIN basic_udirel
                 ON basic_products.uuid = basic_udirel.uuid
@@ -822,7 +824,8 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName,basic_products.cphhhbh
+               basic_products.categoryName,
+               basic_products.cphhhbh
         from basic_udirel
                      INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
         <where>
@@ -959,7 +962,8 @@
                 INTO basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+                 lockStatus, isAdavence, purType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+                 createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert)
         values (#{id},
@@ -975,7 +979,7 @@
                 #{isDisable},
                 #{isLock},
                 #{lockStatus},
-                #{isAdavence},
+                #{isAdavence}, #{purType},
                 #{useMuti},
                 #{useNum},
                 #{supName},
@@ -994,7 +998,8 @@
         INTO basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+                 lockStatus, isAdavence, purType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+                 createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert)
         values (#{id},
@@ -1010,7 +1015,7 @@
                 #{isDisable},
                 #{isLock},
                 #{lockStatus},
-                #{isAdavence},
+                #{isAdavence}, #{purType},
                 #{useMuti},
                 #{useNum},
                 #{supName},
@@ -1084,6 +1089,9 @@
             <if test="isAdavence != null">
                 isAdavence=#{isAdavence},
             </if>
+            <if test="purType != null">
+                purType=#{purType},
+            </if>
             <if test="useMuti != null">
                 useMuti=#{useMuti},
             </if>
@@ -1163,7 +1171,8 @@
                 into basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+                 lockStatus, isAdavence, purType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+                 createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert)
                 values
@@ -1182,7 +1191,7 @@
              #{item.isDisable},
              #{item.isLock},
              #{item.lockStatus},
-             #{item.isAdavence},
+             #{item.isAdavence}, #{item.purType},
              #{item.useMuti},
              #{item.useNum},
              #{item.supName},
@@ -1256,7 +1265,8 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName,basic_products.cphhhbh
+               basic_products.categoryName,
+               basic_products.cphhhbh
         FROM basic_udirel
                      INNER JOIN basic_products
                 on basic_udirel.uuid = basic_products.uuid
@@ -1376,7 +1386,8 @@
                basic_products.mjfs,
                basic_products.categoryName,
                company_product_relevance.unitFk,
-               basic_corp.name companyName,basic_products.cphhhbh
+               basic_corp.name companyName,
+               basic_products.cphhhbh
         FROM basic_udirel
                      inner JOIN basic_products
                 ON basic_products.uuid = basic_udirel.uuid

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

@@ -46,6 +46,7 @@
                basic_udirel.lockStatus,
                basic_udirel.mainId,
                basic_udirel.isAdavence,
+               basic_udirel.purType,
                basic_udirel.lowStockNum,
                basic_udirel.overStockNum,
                basic_udirel.recentDateTime,
@@ -110,7 +111,8 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName,basic_products.cphhhbh,
+               basic_products.categoryName,
+               basic_products.cphhhbh,
                basic_udirel.groupBuy,
                basic_udirel.id   as uid,
                basic_corp.name      companyName

src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -16,7 +16,7 @@
                                          qxlb, tyshxydm, zczbhhzbapzbh,
                                          ylqxzcrbarmc, ylqxzcrbarywmc, updateTime,
                                          supName, model, `standard`,
-                                         qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy)
+                                         qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType)
                 values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{item.uuid},
@@ -42,7 +42,7 @@
                     , #{item.flbm}, #{item.qxlb}, #{item.tyshxydm}, #{item.zczbhhzbapzbh}
                     , #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.updateTime}, #{item.supName}, #{item.model}
                     , #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type},
-             #{item.deviceRecordKey}, #{item.groupBuy})
+             #{item.deviceRecordKey}, #{item.groupBuy}, #{item.purType})
         </foreach>
     </insert>
 
@@ -127,6 +127,9 @@
             <if test="groupBuy != null">
                 `groupBuy`=#{groupBuy},
             </if>
+            <if test="purType != null">
+                `purType`=#{purType},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -232,9 +235,9 @@
             <if test="status != null">
                 AND tdi.status = #{status}
             </if>
-<!--            <if test="diType != null">-->
-        <!--                AND updateTime &lt;= "2023-04-5 00:00:00"-->
-        <!--            </if>-->
+            <!--            <if test="diType != null">-->
+            <!--                AND updateTime &lt;= "2023-04-5 00:00:00"-->
+            <!--            </if>-->
         </where>
     </select>
 </mapper>

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

@@ -672,3 +672,15 @@ CALL Pro_Temp_ColumnWork('sys_menu_help', 'helpType', 'int', 1);
 #   字段新增  urlPath  字段注释：跳转url
 CALL Pro_Temp_ColumnWork('sys_menu_help', 'urlPath', 'varchar(255)', 1);
 
+CALL Pro_Temp_ColumnWork('thr_corp', 'kfdm', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'purType', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'purType', 'tinyint', 1);
+INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`,
+                                     `sort`, `localEdit`)
+VALUES (33, '采购类型', 'purType', 1, 1, 1, 0, '采购类型是否必填字段', 65, 1);
+
+
+
+
+