代码备份

master
anthonyywj2 3 years ago
parent 08e2f81f3c
commit f7442615dd

@ -65,8 +65,14 @@ public class BussinessLocalTypeController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BussinessLocalTypeEntity> bussinessTypeEntities;
List<BussinessLocalTypeEntity> bussinessTypeEntities = null;
// if (bussinessTypeFilterRequest.getIsFilterBind()) {
// bussinessTypeEntities = bussinessLocalTypeService.filterUnBind(bussinessTypeFilterRequest);
// } else {
bussinessTypeEntities = bussinessLocalTypeService.filterList(bussinessTypeFilterRequest);
// }
PageInfo<BussinessLocalTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BussinessLocalTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
@ -84,18 +90,24 @@ public class BussinessLocalTypeController {
}
String id = deleteRequest.getId();
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.selectById(id);
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction());
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
if (stockOrderEntity != null) {
return ResultVOUtils.error(500, "已存在该类型码业务单据,无法删除!");
BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest();
bussinessTypeFilterRequest.setAction(bussinessLocalTypeEntity.getAction());
List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeService.filterJoin(bussinessTypeFilterRequest);
if (bussinessLocalTypeEntities != null && bussinessLocalTypeEntities.size() > 0) {
return ResultVOUtils.error(500, "该业务单据类型已被扫码单据类型绑定,无法删除!");
} else {
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction());
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
if (stockOrderEntity != null) {
return ResultVOUtils.error(500, "已存在该类型业务单据,无法删除!");
}
}
BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeService.findFirstByAction(bussinessLocalTypeEntity.getAction());
if (bussinessChangeTypeEntity != null && bussinessChangeTypeEntity.getScAction() != null) {
return ResultVOUtils.error(500, "该业务单据类型已绑定流转单据类型,无法删除!");
}
bussinessLocalTypeService.deleteById(id);
return ResultVOUtils.success("删除成功");
}

@ -215,6 +215,7 @@ public class StockOrderDetailController {
public BaseResponse getStockOrderDetailInstrumentById(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
List<StockOrderDetailEntity> originDatas = stockOrderIdsRequest.getStockOrderLists();
for (String id : stockOrderIdsRequest.getIds()) {
FilterUdiInfoRequest companyProductRelevanceRequest = new FilterUdiInfoRequest();
companyProductRelevanceRequest.setId(id);
@ -227,25 +228,47 @@ public class StockOrderDetailController {
stockOrderDetailEntity.setProductId(udiInfoEntity.getId() + "");
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
stockOrderDetailEntity.setCount(0 + "");
stockOrderDetailEntity.setReCount(0 + "");
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
if (stockOrderIdsRequest.getUdiEntity() != null) {
UdiEntity udiEntity = stockOrderIdsRequest.getUdiEntity();
stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo());
stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate());
stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate());
}
stockOrderDetailEntity.setCount(0 + "");
stockOrderDetailEntity.setReCount(0 + "");
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
stockOrderDetailEntityList.add(stockOrderDetailEntity);
if (originDatas != null && originDatas.size() > 0) {
if (!isSameBatch(originDatas, stockOrderDetailEntity)) {
stockOrderDetailEntityList.add(stockOrderDetailEntity);
}
} else {
stockOrderDetailEntityList.add(stockOrderDetailEntity);
}
} else
stockOrderDetailEntityList.add(stockOrderDetailEntity);
}
}
if (originDatas != null && originDatas.size() > 0) {
stockOrderDetailEntityList.addAll(originDatas);
}
if (stockOrderDetailEntityList.size() == 0) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到产品");
}
return ResultVOUtils.success(stockOrderDetailEntityList);
}
public boolean isSameBatch(List<StockOrderDetailEntity> originDatas, StockOrderDetailEntity stockOrderDetailEntity) {
for (StockOrderDetailEntity temp : originDatas) {
if ((temp.getBatchNo() != null && temp.getBatchNo().equals(stockOrderDetailEntity.getBatchNo()))
&& (temp.getProductId().equals(stockOrderDetailEntity.getProductId()))) {
temp.setCount(Integer.parseInt(temp.getCount()) + Integer.parseInt(stockOrderDetailEntity.getCount()) + "");
return true;
}
}
return false;
}
@GetMapping("/udiwms/stock/order/detail/addFromCode")
public BaseResponse addStockOrderDetailFromCode(@RequestParam("orderId") String orderId,
@RequestParam("count") String count,

@ -14,6 +14,8 @@ public interface BussinessLocalTypeDao {
List<BussinessLocalTypeEntity> filterList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterUnBind(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
BussinessLocalTypeEntity findBTByAction(String action);

@ -0,0 +1,37 @@
package com.glxp.api.admin.dao.basic;
import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest;
import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest;
import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface CompanyProductRelevanceDao {
List<CompanyProductRelevanceResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest);
List<CompanyProductRelevanceEntity> filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId);
CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId);
CompanyProductRelevanceEntity findCompanyProductRelevanceByUdiRlIdFk(@Param("udiRlIdFk") String udiRlIdFk, @Param("customerId") String customerId);
CompanyProductRelevanceEntity findCompanyProductRelevanceByProductUuid(CompanyProductRelevanceEntity companyProductRelevanceEntity);
List<CompanyProductRelevanceEntity> getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
boolean updateCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
boolean deleteById(String id);
boolean deleteByRlId(String id);
}

@ -17,4 +17,6 @@ public class BussinessLocalTypeEntity {
private Boolean changeEnable;
private int corpType;
private boolean genUnit;
private String storageCode;
private Boolean spUse;
}

@ -18,8 +18,6 @@ public class BussinessTypeEntity {
private boolean innerOrder;
private boolean secCheckEnable;
private String thirdSys;
private boolean checkUdims;
private boolean checkPdaEd;
private boolean checkPdaUn;
@ -37,6 +35,6 @@ public class BussinessTypeEntity {
private boolean secCheckSp;
private Integer index;
private int corpType;
private String storageCode;
}

@ -0,0 +1,24 @@
package com.glxp.api.admin.entity.basic;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class CompanyProductRelevanceEntity {
private Integer id;
private Long customerId;
private Long productId;
private Long enterpriseId;
private Long registrationId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date create_time;
private Date update_time;
private String auditStatus;
private String productUuid;
private Integer udiRlIdFk;
private String unitFk;
}

@ -11,4 +11,6 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest {
private Boolean enabled;
private String originAction;
private Boolean changeEnable;
private Boolean isFilterBind;
private Boolean spUse;
}

@ -0,0 +1,48 @@
package com.glxp.api.admin.req.basic;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class CompanyProductRelevanceRequest extends ListPageRequest {
private String ylqxzcrbarmc;
private String cpmctymc;
private String nameCode;
private String uuid;
private String ggxh;
private String thirdId;
private String id;
private String thirdId1;
private String thirdId2;
private String thirdId3;
private String thirdId4;
private String thirdCode;
private String thirdSys;
private String lastUpdateTime;
private String zczbhhzbapzbh;
private Integer diType;
private String unionCode;
private String udiCode;
private String thrPiId;
private Boolean isCheck;
private Integer filterType; //0:全部1.对照完成2.未对照DI3.未对照产品编码4.未对照其他产品编码
private String customerId;
private String auditStatus;
private String companyName;
private Integer lockStatus;
private Boolean isAdavence;
private String unitFk;
}

@ -0,0 +1,14 @@
package com.glxp.api.admin.req.basic;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class FilterCompanyProductRelevanceRequest extends ListPageRequest {
private Long customerId;
private Long productId;
private String productUuid;
private String udiRlIdFk;
private String unitFk;
}

@ -1,6 +1,7 @@
package com.glxp.api.admin.req.business;
import com.glxp.api.admin.entity.basic.UdiEntity;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import lombok.Data;
import java.util.List;
@ -12,4 +13,5 @@ public class StockOrderIdsRequest {
List<String> ids;
boolean filterUDIType;
UdiEntity udiEntity;
List<StockOrderDetailEntity> stockOrderLists;
}

@ -39,4 +39,8 @@ public class BussinessTypResponse {
private boolean secCheckSp;
private int corpType;
private String storageCode;
}

@ -0,0 +1,61 @@
package com.glxp.api.admin.res.info;
import lombok.Data;
@Data
public class CompanyProductRelevanceResponse {
private int id;
private Integer rlId;
private String thirdId;
private String thirdName;
private String uuid;
private String nameCode;
private String packLevel;
private String packRatio;
private Integer bhxjsl;
private Integer bhzxxsbzsl;
private Integer zxxsbzbhsydysl;
private String bhxjcpbm;
private String sjcpbm; //
private String bzcj;
private String deviceRecordKey;
private int isUseDy;
private String cpmctymc;
private String cplb;
private String flbm;
private String ggxh;
private String qxlb;
private String tyshxydm;
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private String ylqxzcrbarywmc;
private String sydycpbs;
private int versionNumber;
private int diType;
private String thirdId1;
private String thirdId2;
private String thirdId3;
private String thirdId4;
private String thirdName1;
private String thirdName2;
private String thirdName3;
private String thirdName4;
private String ybbm;
private String sptm;
private String manufactory;
private String measname;
private long customerId;
private String auditStatus;
private Boolean isLock;
private Integer lockStatus;
private String companyName;
private String mainId;
private String mainName;
private Boolean isAdavence;
}

@ -11,6 +11,8 @@ public interface BussinessLocalTypeService {
List<BussinessLocalTypeEntity> filterList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterUnBind(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
BussinessLocalTypeEntity findBTByAction(String action);

@ -37,6 +37,11 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
return data;
}
@Override
public List<BussinessLocalTypeEntity> filterUnBind(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) {
return bussinessLocalTypeDao.filterUnBind(bussinessTypeFilterRequest);
}
@Override
public List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) {

@ -0,0 +1,36 @@
package com.glxp.api.admin.service.info;
import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest;
import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest;
import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse;
import java.util.List;
public interface CompanyProductRelevanceService {
List<CompanyProductRelevanceResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest);
List<CompanyProductRelevanceEntity> filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId);
CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId);
CompanyProductRelevanceEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId);
CompanyProductRelevanceEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk);
CompanyProductRelevanceEntity findCompanyProductRelevanceByProductUuid(CompanyProductRelevanceEntity companyProductRelevanceEntity);
List<CompanyProductRelevanceEntity> getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
boolean updateCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
boolean deleteById(String id);
boolean deleteByRlId(String id);
}

@ -0,0 +1,110 @@
package com.glxp.api.admin.service.info.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.CompanyProductRelevanceDao;
import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest;
import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest;
import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse;
import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class CompanyProductRelevanceServiceImpl implements CompanyProductRelevanceService {
@Resource
CompanyProductRelevanceDao companyProductRelevanceDao;
@Override
public List<CompanyProductRelevanceResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest) {
if (basicInstrumentMaintainRequest == null) {
return Collections.emptyList();
}
if (basicInstrumentMaintainRequest.getPage() != null) {
int offset = (basicInstrumentMaintainRequest.getPage() - 1) * basicInstrumentMaintainRequest.getLimit();
PageHelper.offsetPage(offset, basicInstrumentMaintainRequest.getLimit());
}
List<CompanyProductRelevanceResponse> data = companyProductRelevanceDao.filterUdiGp(basicInstrumentMaintainRequest);
return data;
}
@Override
public List<CompanyProductRelevanceEntity> filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) {
if (filterCompanyProductRelevanceRequest == null) {
return Collections.emptyList();
}
if (filterCompanyProductRelevanceRequest.getPage() != null) {
int offset = (filterCompanyProductRelevanceRequest.getPage() - 1) * filterCompanyProductRelevanceRequest.getLimit();
PageHelper.offsetPage(offset, filterCompanyProductRelevanceRequest.getLimit());
}
return companyProductRelevanceDao.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
}
@Override
public CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId) {
return companyProductRelevanceDao.findCompanyProductRelevance(CustomerId);
}
@Override
public List<CompanyProductRelevanceEntity> getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) {
if (filterCompanyProductRelevanceRequest == null) {
return Collections.emptyList();
}
int offset = (filterCompanyProductRelevanceRequest.getPage() - 1) * filterCompanyProductRelevanceRequest.getLimit();
PageHelper.offsetPage(offset, filterCompanyProductRelevanceRequest.getLimit());
List<CompanyProductRelevanceEntity> companyEntities = companyProductRelevanceDao.getCompanyProductRelevance(filterCompanyProductRelevanceRequest);
return companyEntities;
}
@Override
public CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId) {
return companyProductRelevanceDao.findCompanyProductRelevanceByProductId(productId);
}
@Override
public CompanyProductRelevanceEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId) {
return companyProductRelevanceDao.findCompanyProductRelevanceByUdiRlIdFk(udiRlIdFk, customerId);
}
@Override
public CompanyProductRelevanceEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk) {
FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest();
filterCompanyProductRelevanceRequest.setUdiRlIdFk(udiRlIdFk);
filterCompanyProductRelevanceRequest.setUnitFk(unitFk);
List<CompanyProductRelevanceEntity> companyProductRelevanceEntities = companyProductRelevanceDao.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
if (companyProductRelevanceEntities.size() > 0) {
return companyProductRelevanceEntities.get(0);
}
return null;
}
@Override
public CompanyProductRelevanceEntity findCompanyProductRelevanceByProductUuid(CompanyProductRelevanceEntity companyProductRelevanceEntity) {
return companyProductRelevanceDao.findCompanyProductRelevanceByProductUuid(companyProductRelevanceEntity);
}
@Override
public boolean updateCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity) {
return companyProductRelevanceDao.updateCompanyProductRelevance(companyProductRelevanceEntity);
}
@Override
public boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity) {
return companyProductRelevanceDao.insertCompanyProductRelevance(companyProductRelevanceEntity);
}
@Override
public boolean deleteById(String id) {
return companyProductRelevanceDao.deleteById(id);
}
@Override
public boolean deleteByRlId(String id) {
return companyProductRelevanceDao.deleteByRlId(id);
}
}

@ -23,12 +23,35 @@
</select>
<select id="filterUnBind" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
select basic_bustype_local.* from basic_bustype_local
LEFT JOIN basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction
<where>
localAction is NULL
<if test="name != ''and name != null">
AND name LIKE concat(#{name},'%')
</if>
<if test="action != ''and action != null">
AND action LIKE concat(#{action},'%')
</if>
<if test="enabled != ''and enabled != null">
AND enable =#{enabled}
</if>
<if test="originAction != ''and originAction != null">
AND originAction =#{originAction}
</if>
</where>
</select>
<select id="filterJoin" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
SELECT basic_bustype_local.name localName, basic_bustype_local.action localAction,originAction,
basic_bussiness_type.name ,basic_bussiness_type.corpType,basic_bussiness_type.genUnit,
SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action localAction,originAction,
basic_bussiness_type.name ,
basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable
FROM basic_bustype_local left join
, basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType
FROM basic_bustype_local inner join
basic_bussiness_type
on basic_bustype_local.action = basic_bussiness_type.localAction
<where>
@ -41,7 +64,12 @@
<if test="enabled != ''and enabled != null">
AND basic_bustype_local.enable =#{enabled}
</if>
<if test="enabled != ''and enabled != null">
AND basic_bussiness_type.enable =#{enabled}
</if>
<if test="spUse != ''and spUse != null">
AND spUse =#{spUse}
</if>
</where>
</select>
@ -73,11 +101,15 @@
</update>
<delete id="deleteById" parameterType="Map">
DELETE FROM basic_bustype_local WHERE id = #{id}
DELETE
FROM basic_bustype_local
WHERE id = #{id}
</delete>
<select id="selectById" parameterType="Map" resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
select * FROM basic_bustype_local WHERE id = #{id}
select *
FROM basic_bustype_local
WHERE id = #{id}
</select>
</mapper>

@ -72,7 +72,7 @@
(`index`,action,name,enable,remark,mainAction,localAction,thirdSysFk
,checkEnable,genUnit,innerOrder,secCheckEnable,
checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,checkSp,secCheckSp,thirdAction)
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,checkSp,secCheckSp,thirdAction,storageCode,corpType)
values
(
#{index},
@ -101,7 +101,8 @@
#{secCheckChange},
#{checkSp},
#{secCheckSp},
#{thirdAction}
#{thirdAction},
#{storageCode},#{corpType}
)
</insert>
@ -113,7 +114,7 @@
(`index`,action,name,enable,remark,mainAction,localAction,thirdSysFk
,checkEnable,genUnit,innerOrder,secCheckEnable,
checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,checkSp,secCheckSp,thirdAction)
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,checkSp,secCheckSp,thirdAction,storageCode,corpType)
values
(
#{index},
@ -142,7 +143,8 @@
#{secCheckChange},
#{checkSp},
#{secCheckSp},
#{thirdAction}
#{thirdAction},
#{storageCode},#{corpType}
)
</insert>
@ -176,7 +178,8 @@
<if test="secCheckSp != null">secCheckSp=#{secCheckSp},</if>
<if test="index != null">index=#{index},</if>
<if test="thirdAction != null">thirdAction=#{thirdAction},</if>
<if test="storageCode != null">storageCode=#{storageCode},</if>
<if test="corpType != null">corpType=#{corpType},</if>
thirdSysFk=#{thirdSysFk},
</trim>
WHERE id = #{id}

@ -0,0 +1,275 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.info.CompanyProductRelevanceDao">
<select id="filterCompanyProductRelevance"
parameterType="com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest"
resultType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
select * from company_product_relevance
<where>
<if test="customerId != '' and customerId!=null">
and customerId = #{customerId}
</if>
<if test="udiRlIdFk != '' and udiRlIdFk!=null">
and udiRlIdFk = #{udiRlIdFk}
</if>
<if test="unitFk != null and unitFk != ''">
and unitFk = #{unitFk}
</if>
</where>
ORDER BY id DESC
</select>
<select id="filterUdiGp" parameterType="com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest"
resultType="com.glxp.api.admin.res.info.CompanyProductRelevanceResponse">
select
company_product_relevance.id,company_product_relevance.customerId,company_product_relevance.auditStatus,
basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.id rlId,
basic_udirel.isUseDy, basic_udirel.isLock,
basic_udirel.thirdId1,basic_udirel.thirdId2,
basic_udirel.thirdId3,basic_udirel.thirdId4,
basic_udirel.thirdName1,basic_udirel.thirdName2,
basic_udirel.thirdName3,basic_udirel.thirdName4,
basic_udirel.ybbm,basic_udirel.sptm,
basic_udirel.manufactory,basic_udirel.measname,basic_udirel.lockStatus,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl,
basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,
basic_products.bzcj,basic_products.addType,
basic_products.deviceRecordKey,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.uuid,
basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,
customer_info.companyName, basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence
FROM company_product_relevance
inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id
inner JOIN basic_products
ON basic_udirel.uuid = basic_products.uuid
inner JOIN customer_info on customer_info.customerId = company_product_relevance.customerId
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat(#{cpmctymc},'%')
</if>
<if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode},'%')
</if>
<if test="unionCode != '' and unionCode != null">
and (
nameCode LIKE concat('%',#{unionCode},'%')
or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%')
or basic_udirel.sptm LIKE concat('%',#{unionCode},'%')
)
</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="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.flbm <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 2">
AND basic_products.flbm is NULL
</if>
<if test="filterType != null and filterType == 3">
AND thirdId is NULL and basic_products.flbm <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 4">
AND thirdId1 is NULL and basic_products.flbm <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 5">
AND thirdId2 is NULL and basic_products.flbm <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 6">
AND thirdId3 is NULL and basic_products.flbm <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 7">
AND thirdId4 is NULL and basic_products.flbm <![CDATA[<>]]> ''
</if>
<if test="customerId != '' and customerId != null">
AND company_product_relevance.customerId = #{customerId}
</if>
<if test="auditStatus != '' and auditStatus != null">
AND company_product_relevance.auditStatus = #{auditStatus}
</if>
<if test="id != '' and id != null">
AND basic_udirel.id = #{id}
</if>
<if test="companyName != '' and companyName != null">
AND customer_info.companyName = #{companyName}
</if>
<if test="lockStatus != '' and lockStatus != null">
AND basic_udirel.lockStatus = #{lockStatus}
</if>
<if test="isAdavence != '' and isAdavence != null">
AND basic_udirel.isAdavence = #{isAdavence}
</if>
<if test="unitFk != null and unitFk != ''">
and unitFk = #{unitFk}
</if>
</where>
ORDER BY updateTime DESC
</select>
<select id="findCompanyProductRelevance" parameterType="java.lang.Long"
resultType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
SELECT *
FROM company_product_relevance
where customerId = #{customerId}
</select>
<select id="findCompanyProductRelevanceByProductId" parameterType="java.lang.String"
resultType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
SELECT *
FROM company_product_relevance
where productId = #{productId}
</select>
<select id="findCompanyProductRelevanceByUdiRlIdFk" parameterType="java.lang.String"
resultType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
SELECT *
FROM company_product_relevance
where udiRlIdFk = #{udiRlIdFk}
and customerId = #{customerId}
</select>
<select id="findCompanyProductRelevanceByProductUuid"
parameterType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity"
resultType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
SELECT * FROM company_product_relevance
<where>
<if test="customerId != null and customerId != ''">
and customerId = #{customerId}
</if>
<if test="productId != null and productId != ''">
and productId = #{productId}
</if>
<if test="productUuid != null and productUuid != ''">
and productUuid = #{productUuid}
</if>
<if test="unitFk != null and unitFk != ''">
and unitFk = #{unitFk}
</if>
</where>
</select>
<select id="getCompanyProductRelevance"
parameterType="com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest"
resultType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
SELECT * FROM company_product_relevance
<where>
<if test="customerId != null and customerId != ''">
and customerId = #{customerId}
</if>
<if test="productId != null and productId != ''">
and productId = #{productId}
</if>
<if test="productUuid != null and productUuid != ''">
and productUuid = #{productUuid}
</if>
<if test="unitFk != null and unitFk != ''">
and unitFk = #{unitFk}
</if>
</where>
</select>
<update id="updateCompanyProductRelevance"
parameterType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
UPDATE company_product_relevance
<set>
<if test="customerId != null">customerId=#{customerId},</if>
<if test="productId != null">name=#{name},</if>
<if test="enterpriseId != null">tel=#{tel},</if>
<if test="registrationId != null">phone=#{phone},</if>
<if test="create_time != null">create_time=#{create_time},</if>
<if test="update_time != null">update_time=#{update_time},</if>
<if test="auditStatus != null">auditStatus=#{auditStatus},</if>
<if test="productUuid != null">productUuid=#{productUuid},</if>
<if test="udiRlIdFk != null">udiRlIdFk=#{udiRlIdFk},</if>
<if test="unitFk != null">unitFk=#{unitFk},</if>
</set>
WHERE id = #{id}
</update>
<insert id="insertCompanyProductRelevance"
parameterType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
replace
INTO company_product_relevance(customerId,productId,enterpriseId,registrationId,
create_time,update_time,auditStatus,productUuid,udiRlIdFk,unitFk) values
(
#{customerId},
#{productId},
#{enterpriseId},
#{registrationId},
#{create_time},
#{update_time},
#{auditStatus},
#{productUuid},
#{udiRlIdFk},
#{unitFk}
)
</insert>
<insert id="importCompanyProductRelevance"
parameterType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
replace
INTO company_product_relevance(id,customerId,productId,enterpriseId,registrationId,
create_time,update_time,auditStatus,productUuid,udiRlIdFk,unitFk) values
(
#{id},
#{customerId},
#{productId},
#{enterpriseId},
#{registrationId},
#{create_time},
#{update_time},
#{auditStatus},
#{productUuid},
#{udiRlIdFk},
#{unitFk}
)
</insert>
<delete id="deleteById" parameterType="Map">
DELETE
FROM company_product_relevance
WHERE id = #{id}
</delete>
<delete id="deleteByRlId" parameterType="Map">
DELETE
FROM company_product_relevance
WHERE udiRlIdFk = #{id}
</delete>
</mapper>

@ -66,10 +66,9 @@
<if test="fromType != null">fromType=#{fromType},</if>
<if test="contrastStatus != null">contrastStatus=#{contrastStatus},</if>
<if test="erpFk != null">erpFk=#{erpFk},</if>
<if test="signStatus != null">signStatus=#{signStatus}</if>
<if test="stockCheckFk != null">stockCheckFk=#{stockCheckFk}</if>
<if test="locStorageCode != null">locStorageCode=#{locStorageCode}</if>
<if test="signStatus != null">signStatus=#{signStatus},</if>
<if test="stockCheckFk != null">stockCheckFk=#{stockCheckFk},</if>
<if test="locStorageCode != null">locStorageCode=#{locStorageCode},</if>
</trim>
WHERE id = #{id}
</update>

Loading…
Cancel
Save