资质证书相关修改

master
anthonywj 2 years ago
parent c90dece32b
commit 303392dbff

@ -188,6 +188,19 @@ public class UdiRelevanceController extends BaseController {
}
//资质证书选入产品列表 产品名称,生产企业过滤
@AuthRuleAnnotation("")
@GetMapping("/udi/cert/filterUdi")
public BaseResponse filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) {
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterCertUdi(filterUdiRelRequest);
PageInfo<UdiRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(udiRelevanceResponses);
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(udiRelevanceResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
/**
* DI
*/
@ -322,6 +335,7 @@ public class UdiRelevanceController extends BaseController {
udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch());
udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire());
udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct());
udiProductEntity.setAllowNoSerial(udiRelevanceSaveRequest.getAllowNoBatch());
udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum());
udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1());
udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2());

@ -152,7 +152,7 @@ public class IoOrderDetailBizController extends BaseController {
// todo 查询产品是否已经通过认证
if (isVailCert && udiRelevanceResponse.isNeedCert()) {
SupProductEntity supProductEntity = supProductService.findByRelIdFk(udiRelevanceResponse.getId() + "");
SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
} else {

@ -493,7 +493,7 @@ public class SupCertController {
supData.put("productType", supProductEntity.getProductType() == null ? ' ' : supProductEntity.getProductType());
supData.put("productDirectoryCode", supProductEntity.getProductDirectoryCode() == null ? ' ' : supProductEntity.getProductDirectoryCode());
supData.put("specification", supProductEntity.getSpecification() == null ? ' ' : supProductEntity.getSpecification());
supData.put("cpms", supProductEntity.getCpms() == null ? ' ' : supProductEntity.getCpms());
// supData.put("cpms", supProductEntity.getCpms() == null ? ' ' : supProductEntity.getCpms());
supData.put("remark1", supProductEntity.getRemark() == null ? ' ' : supProductEntity.getRemark());
supData.put("index", String.valueOf(i));

@ -150,10 +150,12 @@ public class SupProductController {
@PostMapping("/sup/product/selectBind")
public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(Long.valueOf(selectProductBindRequest.getRelIdFk()));
SupProductEntity supProductEntity = new SupProductEntity();
SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
if (supProductEntity != null) {
return ResultVOUtils.error(500, "资质证书已存在,请勿重复添加!");
}
supProductEntity = new SupProductEntity();
BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
supProductEntity.setProductId(selectProductBindRequest.getProductId());
supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());

@ -17,6 +17,8 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceResponse> filterCertUdi(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceResponse> filterUdiGp(FilterUdiRelRequest filterUdiRelRequest);

@ -69,7 +69,7 @@ public class BasicProductsEntity {
private Integer bhzxxsbzsl;
/**
* 使:
* 使:
使
*/
@TableField(value = "zxxsbzbhsydysl")
@ -229,7 +229,7 @@ public class BasicProductsEntity {
*
*/
@TableField(value = "allowNoBatch")
private Byte allowNoBatch;
private Boolean allowNoBatch;
/**
*
@ -461,4 +461,4 @@ public class BasicProductsEntity {
public static final String COL_UPDATEUSER = "updateUser";
public static final String COL_REMARK = "remark";
}
}

@ -47,6 +47,7 @@ public class UdiProductEntity {
private Boolean allowNoBatch;
private Boolean allowNoExpire;
private Boolean allowNoProduct;
private Boolean allowNoSerial;
private String spmc;
private String cplx;
private String hchzsb;
@ -95,6 +96,9 @@ public class UdiProductEntity {
return false;
return allowNoProduct;
}
public Boolean getAllowNoSerial() {
if (allowNoSerial == null)
return false;
return allowNoSerial;
}
}

@ -169,4 +169,7 @@ public class UdiRelevanceEntity {
@TableField(value = "needCert")
private boolean needCert; //是否需要资质材料
@TableField(value = "certIdFk")
private String certIdFk;
}

@ -10,7 +10,7 @@ import java.util.Date;
/**
* <p>
*
*
* </p>
*
* @author
@ -18,7 +18,7 @@ import java.util.Date;
*/
@TableName("sup_product")
@Data
public class SupProductEntity{
public class SupProductEntity {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ -209,8 +209,6 @@ public class SupProductEntity{
@TableField("measname")
private String measname;
@TableField("cpms")
private String cpms;
/**
*
@ -254,10 +252,38 @@ public class SupProductEntity{
@TableField("updateTime")
private Date updateTime;
@TableField(value = "manufactory")
private String manufactory;
/**
* ID
*/
@TableField(exist = false)
private String companyName;
/**
*
*/
@TableField(value = "allowNoBatch")
private Boolean allowNoBatch;
/**
*
*/
@TableField(value = "allowNoExpire")
private Boolean allowNoExpire;
/**
*
*/
@TableField(value = "allowNoProduct")
private Boolean allowNoProduct;
/**
*
*/
@TableField(value = "allowNoSerial")
private Boolean allowNoSerial;
}

@ -34,7 +34,7 @@ public class AsyncIdcTask implements SchedulingConfigurer {
scheduledRequest.setCronName("syncIdc");
logger.info("syncIdc----------------");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
String cron = scheduledEntity != null ? scheduledEntity.getCron() : "5 * * * * ?";
String cron = scheduledEntity != null ? scheduledEntity.getCron() : "* 0/30 * * * ?";
if (cron.isEmpty()) {
logger.error("cron is null");

@ -63,5 +63,6 @@ public class FilterUdiRelRequest extends ListPageRequest {
private String bindRlIds;
private String relCode;
private String bindType;
private String certIdFk;
private String manufactory;
}

@ -62,7 +62,7 @@ public class UdiInfoRequest {
private boolean allowNoBatch;
private boolean allowNoExpire;
private boolean allowNoProduct;
private boolean allowNoSerial;
private String price;
private String cplx;
private String hchzsb;

@ -70,6 +70,7 @@ public class UdiRelevanceSaveRequest {
private Boolean allowNoBatch;
private Boolean allowNoExpire;
private Boolean allowNoProduct;
private Boolean allowNoSerial;
private String spmc;
private String cplx;
private String hchzsb;
@ -98,4 +99,5 @@ public class UdiRelevanceSaveRequest {
private boolean dispatch; //是否可配送
private boolean groupBuy; //是否集采产品
private boolean needCert; //是否需要资质材料
private String certIdFk;
}

@ -12,7 +12,7 @@ public class FilterPoductRequest extends ListPageRequest {
private String recordCode;
private String recordProductName;
private String recordPeopleName;
private String manufactory;
private String productId;
private String manufacturerIdFk;

@ -68,6 +68,7 @@ public class CompanyProductRelevanceResponse {
private boolean allowNoBatch;
private boolean allowNoExpire;
private boolean allowNoProduct;
private boolean allowNoSerial;
private String spmc;
private Integer productType;
private String price;

@ -70,6 +70,7 @@ public class UdiRelevanceResponse {
private Boolean allowNoBatch;
private Boolean allowNoExpire;
private Boolean allowNoProduct;
private Boolean allowNoSerial;
private String spmc;
private String cplx;
private String hchzsb;
@ -108,6 +109,8 @@ public class UdiRelevanceResponse {
private String classifyName; //物资分类名称
private String certIdFk;
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
@ -134,7 +137,11 @@ public class UdiRelevanceResponse {
return false;
return allowNoProduct;
}
public Boolean getAllowNoSerial() {
if (allowNoSerial == null)
return false;
return allowNoSerial;
}
public Boolean getUseDy() {
if (isUseDy == null)

@ -68,6 +68,7 @@ public class UdiRlSupResponse {
private boolean allowNoBatch;
private boolean allowNoExpire;
private boolean allowNoProduct;
private boolean allowNoSerial;
private String spmc;
private Integer productType;
private String price;

@ -67,6 +67,7 @@ public class UdiInfoResponse {
private boolean allowNoBatch;
private boolean allowNoExpire;
private boolean allowNoProduct;
private boolean allowNoSerial;
private String price;
private String cplx;

@ -14,6 +14,8 @@ public interface UdiRelevanceService {
List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceResponse> filterCertUdi(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceEntity> filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest);

@ -13,6 +13,7 @@ import com.glxp.api.req.basic.FilterBussinessTypeRequest;
import com.glxp.api.res.basic.BasicBussinessTypeResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.system.SystemParamConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -191,6 +192,10 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
return list;
}
@Resource
SystemParamConfigService systemParamConfigService;
@Override
public List<BasicBussinessTypeEntity> findByVueType(String vueType) {
@ -204,18 +209,26 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
case Constant.ORDER_ACTION_PRE_DETAIL:
bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.eq("actionType", 3).eq("inStock", true).eq("enable",true));
.eq("actionType", 3).eq("inStock", true).eq("enable", true));
break;
case Constant.ORDER_ACTION_SUP_DELIVERY:
bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
.eq("spUse", true).eq("inStock", false).eq("enable",true));
//允许送货单直接入库变更库存,则不判断送货单是否入库
String deliveryInstock = systemParamConfigService.selectValueByParamKey("deliveryInstock");
if (StrUtil.isNotEmpty(deliveryInstock) && deliveryInstock.equals("1")) {
bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
.eq("spUse", true).eq("enable", true));
} else {
bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
.eq("spUse", true).eq("inStock", false).eq("enable", true));
}
break;
case Constant.ORDER_ACTION_SUP_INVOICE:
bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
.eq("spUse", true).eq("actionType", 1).eq("enable",true));
.eq("spUse", true).eq("actionType", 1).eq("enable", true));
break;
default:
break;

@ -39,6 +39,22 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
return data;
}
@Override
public List<UdiRelevanceResponse> filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) {
if (filterUdiRelRequest == null) {
return Collections.emptyList();
}
if (filterUdiRelRequest.getPage() != null) {
int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
}
List<UdiRelevanceResponse> data = udiRelevanceDao.filterCertUdi(filterUdiRelRequest);
return data;
}
@Override
public List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest) {
if (filterUdiRelRequest == null) {
@ -177,6 +193,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
return data.get(0);
return null;
}
@Override
public UdiRelevanceResponse selectSupGroupById(Long id) {
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();

@ -16,6 +16,9 @@ public interface SupProductService {
SupProductEntity findByRelIdFk(String relIdFk);
SupProductEntity findByManufactury(String cpmctymc, String manufactory);
SupProductResponse findByPassByReCert(String registerCert);
SupProductResponse findJoinRegistration(Long id);

@ -79,6 +79,16 @@ public class SupProductServiceImpl implements SupProductService {
else return null;
}
@Override
public SupProductEntity findByManufactury(String cpmctymc, String manufactory) {
List<SupProductEntity> supProductEntities = supProductDao.selectList(new QueryWrapper<SupProductEntity>().eq("manufactory", manufactory)
.eq("recordProductName", cpmctymc)
.last("LIMIT 1"));
if (CollUtil.isNotEmpty(supProductEntities))
return supProductEntities.get(0);
else return null;
}
@Override
public SupProductEntity findRegistrationByName(String recordProductName) {
return supProductDao.findRegistrationByName(recordProductName);

@ -74,6 +74,7 @@
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.productType,
basic_products.nameCode,
basic_products.packRatio,

File diff suppressed because it is too large Load Diff

@ -43,6 +43,8 @@
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
@ -161,6 +163,7 @@
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
@ -289,6 +292,7 @@
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
@ -404,6 +408,169 @@
ORDER BY modifyTime DESC
</select>
<!-- 资质证书选入产品分组查询-->
<select id="filterCertUdi" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*,
bht.name classifyName,
basic_products.originUuid,
basic_products.nameCode,
basic_products.deviceRecordKey,
basic_products.packRatio,
basic_products.packUnit,
basic_products.packLevel,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.ybbm,
basic_products.sptm,
basic_products.manufactory,
basic_products.measname,
basic_products.productType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
basic_products.cpdls,
basic_products.price,
basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
left join basic_hosp_type bht on basic_udirel.relCode = bht.code
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if>
<if test="manufactory != '' and manufactory != null">
AND manufactory LIKE concat('%', #{manufactory}, '%')
</if>
<if test="relCode != '' and relCode != null">
AND relCode = #{relCode}
</if>
<if test="bindType != '' and bindType != null">
AND relCode is null
or trim(relCode) = ''
</if>
<if test="supName != '' and supName != null">
AND supName LIKE concat('%', #{supName}, '%')
</if>
<if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode}, '%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
</if>
<if test="ggxh != '' and ggxh != null">
AND ggxh LIKE concat('%', #{ggxh}, '%')
</if>
<if test="unionCode != '' and unionCode != null">
and (
nameCode LIKE concat('%', #{unionCode}, '%')
or ybbm LIKE concat('%', #{unionCode}, '%')
or sptm LIKE concat('%', #{unionCode}, '%'))
</if>
<if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
</if>
<if test="thrPiId != '' and thrPiId != null">
and (thirdId LIKE concat('%', #{thrPiId}, '%')
or thirdId1 LIKE concat('%', #{thrPiId}, '%')
or thirdId2 LIKE concat('%', #{thrPiId}, '%')
or thirdId3 LIKE concat('%', #{thrPiId}, '%')
or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
</if>
<if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid}
</if>
<if test="thirdId != '' and thirdId != null">
AND thirdId = #{thirdId}
</if>
<if test="udplatCode != '' and udplatCode != null">
AND udplatCode = #{udplatCode}
</if>
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
</if>
<if test="diType != '' and diType != null">
AND diType = #{diType}
</if>
<if test="filterType != null and filterType == 1">
AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 2">
AND basic_products.originUuid is NULL
</if>
<if test="filterType != null and filterType == 3">
AND (mainId is NULL or mainId = '')
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 4">
AND thirdId1 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 5">
AND thirdId2 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 6">
AND thirdId3 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 7">
AND thirdId4 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 10">
AND basic_udirel.updateTime is NULL
</if>
<if test="lockStatus != '' and lockStatus != null">
AND basic_udirel.lockStatus = #{lockStatus}
</if>
<if test="mainId != '' and mainId != null">
AND mainId = #{mainId}
</if>
<if test="id != '' and id != null">
AND basic_udirel.id = #{id}
</if>
</where>
GROUP BY cpmctymc, manufactory
</select>
<select id="contrastJoinSelect" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*,
@ -444,6 +611,7 @@
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
@ -863,6 +1031,7 @@
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,

@ -91,6 +91,7 @@
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,

@ -33,7 +33,9 @@
<if test="relIdFk != null and relIdFk != ''">
and sup_product.relIdFk = #{relIdFk}
</if>
<if test="manufactory != null and manufactory != ''">
and sup_product.manufactory = #{manufactory}
</if>
<if test="recordCode != null and recordCode != ''">
and sup_product.recordCode like concat('%', #{recordCode}, '%')
@ -126,7 +128,9 @@
<if test="relIdFk != null and relIdFk != ''">
and sup_product.relIdFk = #{relIdFk}
</if>
<if test="manufactory != null and manufactory != ''">
and sup_product.manufactory = #{manufactory}
</if>
<if test="auditStatus == 22">
and (sup_product.auditStatus = 1 or sup_product.auditStatus = 4)
</if>
@ -247,15 +251,27 @@
<if test="measname != null">
measname=#{measname},
</if>
<if test="cpms != null">
cpms=#{cpms},
</if>
<if test="hchzsb != null">
hchzsb=#{hchzsb},
</if>
<if test="relIdFk != null">
relIdFk=#{relIdFk},
</if>
<if test="manufactory != null">
manufactory=#{manufactory},
</if>
<if test="allowNoBatch != null">
allowNoBatch=#{allowNoBatch},
</if>
<if test="allowNoExpire != null">
allowNoExpire=#{allowNoExpire},
</if>
<if test="allowNoProduct != null">
allowNoProduct=#{allowNoProduct},
</if>
<if test="allowNoSerial != null">
allowNoSerial=#{allowNoSerial},
</if>
</set>
WHERE id = #{id}
</update>
@ -272,7 +288,8 @@
specification, structure, `scope`,
other, filePath, remark,
createTime, updateTime, manufacturerIdFk, customerId, productId
, auditStatus, auditComment, sptm, ybbm, measname, cpms, hchzsb, relIdFk)
, auditStatus, auditComment, sptm, ybbm, measname, hchzsb, relIdFk, manufactory, allowNoBatch,
allowNoExpire, allowNoProduct, allowNoSerial)
values (#{enterpriseId},
#{recordCode},
#{recordProductName},
@ -311,8 +328,8 @@
#{sptm},
#{ybbm},
#{measname},
#{cpms},
#{hchzsb}, #{relIdFk})
#{hchzsb}, #{relIdFk}, #{manufactory}, #{allowNoBatch}, #{allowNoExpire}, #{allowNoProduct},
#{allowNoSerial})
</insert>
<delete id="deleteById" parameterType="Map">

@ -24,6 +24,10 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_udirel', 'certIdFk', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'allowNoSerial', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1);
@ -89,4 +93,14 @@ CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originReCount', 'int', 1);
CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255)', 1);
INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
`paramType`, `paramExplain`)
VALUES (20040, 0, '允许送货单直接入库变更库存', 'deliveryInstock', '0', 1, 0, '01');
CALL Pro_Temp_ColumnWork('sup_product', 'manufactory', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('sup_product', 'allowNoBatch', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('sup_product', 'allowNoExpire', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('sup_product', 'allowNoProduct', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('sup_product', 'allowNoSerial', 'tinyint', 1);

Loading…
Cancel
Save