UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

申购，相关查询修改

Browse Source
pro
anthonywj 2 years ago
parent c3e32fd7ad
commit 70c0784584
8 changed files with 188 additions and 182 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -33,6 +33,7 @@ import com.glxp.api.req.inv.FilterInvoiceRequest;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.basic.UdiRlSupResponse;
import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailBizResponse;
import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse;
@ -291,9 +292,9 @@ public class IoOrderDetailBizController extends BaseController {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
thrOrderDetailEntity.getProductId(); thrOrderDetailEntity.getProductId();
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.selectListByThirdId(thrOrderDetailEntity.getProductId(), thrOrderEntity.getThirdSysFk()); List<UdiRlSupResponse> udiRelevanceEntities = udiRelevanceService.selectListByThirdId(thrOrderDetailEntity.getProductId(), thrOrderEntity.getThirdSysFk());
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
UdiRelevanceResponse udiRelevanceResponse = null; UdiRlSupResponse udiRelevanceResponse = null;
if (udiRelevanceEntities.size() == 1) { if (udiRelevanceEntities.size() == 1) {
udiRelevanceResponse = udiRelevanceEntities.get(0); udiRelevanceResponse = udiRelevanceEntities.get(0);
ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId()); ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
@ -305,7 +306,8 @@ public class IoOrderDetailBizController extends BaseController {
ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory()); ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname()); ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh()); ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice()); ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(Double.valueOf(udiRelevanceResponse.getPrice())));
ioOrderDetailBizEntity.setSupId(udiRelevanceResponse.getCustomerId() + "");
} else { } else {
ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName()); ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName());
ioOrderDetailBizEntity.setCertCode(thrOrderDetailEntity.getZczbhhzbapzbh()); ioOrderDetailBizEntity.setCertCode(thrOrderDetailEntity.getZczbhhzbapzbh());
@ -316,7 +318,7 @@ public class IoOrderDetailBizController extends BaseController {
if (udiRelevanceEntities.size() > 1) { if (udiRelevanceEntities.size() > 1) {
String bindRlIds = ""; String bindRlIds = "";
for (UdiRelevanceResponse temp : udiRelevanceEntities) { for (UdiRlSupResponse temp : udiRelevanceEntities) {
bindRlIds = bindRlIds + "," + temp.getId(); bindRlIds = bindRlIds + "," + temp.getId();
} }
ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1)); ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1));

2
src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
Unescape Escape View File

@ -35,7 +35,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private String thrPiId; private String thrPiId;
private Boolean isCheck; private Boolean isCheck;
private Integer filterType; //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码 private Integer filterType; //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码
@ -52,5 +51,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private String corpId; private String corpId;
private String billType; private String billType;
private String flbm;
private List<String> uuids; private List<String> uuids;
} }

1
src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java
Unescape Escape View File

@ -13,4 +13,5 @@ public class FilterCompanyProductRelevanceRequest extends ListPageRequest {
private String unitFk; private String unitFk;
private String lastUpdateTime; private String lastUpdateTime;
private String key; private String key;
private String flbm;
} }

3
src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.basic.UdiRlSupResponse;
import java.util.List; import java.util.List;
@ -71,7 +72,7 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys); UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys);
List<UdiRelevanceResponse> selectListByThirdId(String thirdId, String thirdSys); List<UdiRlSupResponse> selectListByThirdId(String thirdId, String thirdSys);
boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);

12
src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
Unescape Escape View File

@ -9,9 +9,12 @@ import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity;
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.basic.UdiRlSupResponse;
import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.basic.UdiRlSupService;
import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.service.thrsys.ThrSystemService;
import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -27,6 +30,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
@Resource @Resource
UdiRelevanceDao udiRelevanceDao; UdiRelevanceDao udiRelevanceDao;
@Resource @Resource
UdiRlSupService udiRlSupService;
@Resource
ThrSystemService basicThirdSysService; ThrSystemService basicThirdSysService;
@Override @Override
@ -320,12 +325,12 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
} }
@Override @Override
public List<UdiRelevanceResponse> selectListByThirdId(String thirdId, String thirdSys) { public List<UdiRlSupResponse> selectListByThirdId(String thirdId, String thirdSys) {
if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) { if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) {
return null; return null;
} }
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); CompanyProductRelevanceRequest filterUdiRelRequest = new CompanyProductRelevanceRequest();
if ("thirdId".equals(thirdSys)) { if ("thirdId".equals(thirdSys)) {
filterUdiRelRequest.setThirdId(thirdId); filterUdiRelRequest.setThirdId(thirdId);
} else if ("thirdId1".equals(thirdSys)) { } else if ("thirdId1".equals(thirdSys)) {
@ -337,7 +342,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
} else if ("thirdId4".equals(thirdSys)) { } else if ("thirdId4".equals(thirdSys)) {
filterUdiRelRequest.setThirdId4(thirdId); filterUdiRelRequest.setThirdId4(thirdId);
} }
List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest); filterUdiRelRequest.setDiType(1);
List<UdiRlSupResponse> data = udiRlSupService.filterUdiGp(filterUdiRelRequest);
return data; return data;
} }

76
src/main/java/com/glxp/api/service/sync/HeartService.java
Unescape Escape View File

@ -1327,7 +1327,6 @@ public class HeartService {
}); });
if (response.getCode() == 20000 && response.getData() != null) { if (response.getCode() == 20000 && response.getData() != null) {
JSONArray fileJson = JSONUtil.parseObj(response.getData()).getJSONArray("syncFiles"); JSONArray fileJson = JSONUtil.parseObj(response.getData()).getJSONArray("syncFiles");
SpsSyncOrderResponse syncDataResponse = JSONObject.parseObject(response.getData(), new TypeReference<SpsSyncOrderResponse>() { SpsSyncOrderResponse syncDataResponse = JSONObject.parseObject(response.getData(), new TypeReference<SpsSyncOrderResponse>() {
}); });
@ -1342,54 +1341,47 @@ public class HeartService {
basicDownloadStatusEntity.setRemark(syncDataResponse.getSyncRemark()); basicDownloadStatusEntity.setRemark(syncDataResponse.getSyncRemark());
basicDownloadStatusEntity.setScheduleType(1); basicDownloadStatusEntity.setScheduleType(1);
basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) { if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) {
try { List<IoOrderEntity> orderEntities = syncDataResponse.getOrderEntities();
List<IoOrderEntity> orderEntities = syncDataResponse.getOrderEntities(); for (IoOrderEntity orderEntity : orderEntities) {
for (IoOrderEntity orderEntity : orderEntities) { SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2);
SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2); orderEntity.setUpdateTime(null);
orderEntity.setUpdateTime(null); orderEntity.setFromType(ConstantStatus.FROM_UDISP);
orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST); orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);
orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); if (syncDataBustypeEntity != null) {
if (syncDataBustypeEntity != null) { if (syncDataBustypeEntity.getSyncStatus() != null && syncDataBustypeEntity.getSyncStatus().compareTo(1) == 0) {
if (syncDataBustypeEntity.getSyncStatus() != null && syncDataBustypeEntity.getSyncStatus().compareTo(1) == 0) { orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT);
orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); }
} if (syncDataBustypeEntity.isSyncChange()) {
if (syncDataBustypeEntity.isSyncChange()) { orderEntity.setOutChangeEnable(syncDataBustypeEntity.isSyncChange());
orderEntity.setOutChangeEnable(syncDataBustypeEntity.isSyncChange());
}
} }
IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); }
if (temp == null) { IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo());
orderEntity.setId(null); if (temp == null) {
orderService.insertOrder(orderEntity); orderEntity.setId(null);
insetOrderDb(syncDataResponse, orderEntity); orderService.insertOrder(orderEntity);
insetOrderDb(syncDataResponse, orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE) {
addInoutService.dealProcess(orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE) { if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
addInoutService.dealProcess(orderEntity); ioCheckInoutService.check(orderEntity.getBillNo());
orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
ioCheckInoutService.check(orderEntity.getBillNo());
}
} }
} else {
updateOrderDb(syncDataResponse, orderEntity);
} }
} else {
updateOrderDb(syncDataResponse, orderEntity);
} }
if (fileJson != null && fileJson.size() > 0) { }
List<String> syncFiles = fileJson.toList(String.class); if (fileJson != null && fileJson.size() > 0) {
if (CollUtil.isNotEmpty(syncFiles)) { List<String> syncFiles = fileJson.toList(String.class);
idcService.batchDownloadFile(spGetHttp.getIpUrl(), syncFiles.toArray(new String[syncFiles.size()])); if (CollUtil.isNotEmpty(syncFiles)) {
} idcService.batchDownloadFile(spGetHttp.getIpUrl(), syncFiles.toArray(new String[syncFiles.size()]));
} }
} catch (Exception e) {
e.printStackTrace();
} }
} }
spGetHttp.finishTask(basicExportStatusEntity.getId()); spGetHttp.finishTask(basicExportStatusEntity.getId());
basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setUpdateTime(new Date());
@ -1867,7 +1859,7 @@ public class HeartService {
List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
orderInvoiceService.insertInvoice(orderInvoiceEntity); ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
} }
} }
} }

4
src/main/java/com/glxp/api/task/SyncHeartTask.java
Unescape Escape View File

@ -20,8 +20,8 @@ import javax.annotation.Resource;
import java.util.Arrays; import java.util.Arrays;
//@Component @Component
//@EnableScheduling @EnableScheduling
public class SyncHeartTask implements SchedulingConfigurer { public class SyncHeartTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class); final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);

262
src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
Unescape Escape View File

@ -30,88 +30,88 @@
<select id="filterUdiGp" parameterType="com.glxp.api.req.basic.CompanyProductRelevanceRequest" <select id="filterUdiGp" parameterType="com.glxp.api.req.basic.CompanyProductRelevanceRequest"
resultType="com.glxp.api.res.basic.UdiRlSupResponse"> resultType="com.glxp.api.res.basic.UdiRlSupResponse">
select company_product_relevance.id, select company_product_relevance.id,
company_product_relevance.customerId, company_product_relevance.customerId,
company_product_relevance.auditStatus, company_product_relevance.auditStatus,
company_product_relevance.price, company_product_relevance.price,
basic_udirel.uuid, basic_udirel.uuid,
basic_udirel.thirdId, basic_udirel.thirdId,
basic_udirel.id rlId, basic_udirel.id rlId,
basic_udirel.isUseDy, basic_udirel.isUseDy,
basic_udirel.useMuti, basic_udirel.useMuti,
basic_udirel.isLock, basic_udirel.isLock,
basic_udirel.thirdId1, basic_udirel.thirdId1,
basic_udirel.thirdId2, basic_udirel.thirdId2,
basic_udirel.thirdId3, basic_udirel.thirdId3,
basic_udirel.thirdId4, basic_udirel.thirdId4,
basic_udirel.lockStatus, basic_udirel.lockStatus,
basic_udirel.mainId, basic_udirel.mainId,
basic_udirel.isAdavence, basic_udirel.isAdavence,
basic_udirel.lowStockNum, basic_udirel.lowStockNum,
basic_udirel.overStockNum, basic_udirel.overStockNum,
basic_udirel.recentDateTime, basic_udirel.recentDateTime,
basic_udirel.isDateBy, basic_udirel.isDateBy,
bht.name classifyName, bht.name classifyName,
basic_products.id as PRId, basic_products.id as PRId,
basic_products.originUuid, basic_products.originUuid,
basic_products.nameCode, basic_products.nameCode,
basic_products.deviceRecordKey, basic_products.deviceRecordKey,
basic_products.packRatio, basic_products.packRatio,
basic_products.packUnit, basic_products.packUnit,
basic_products.packLevel, basic_products.packLevel,
basic_products.bhxjsl, basic_products.bhxjsl,
basic_products.bhzxxsbzsl, basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl, basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm, basic_products.bhxjcpbm,
basic_products.bzcj, basic_products.bzcj,
basic_products.cpmctymc, basic_products.cpmctymc,
basic_products.cplb, basic_products.cplb,
basic_products.flbm, basic_products.flbm,
basic_products.ggxh, basic_products.ggxh,
basic_products.qxlb, basic_products.qxlb,
basic_products.tyshxydm, basic_products.tyshxydm,
basic_products.ylqxzcrbarmc, basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh, basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc, basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs, basic_products.sydycpbs,
basic_products.sjcpbm, basic_products.sjcpbm,
basic_products.versionNumber, basic_products.versionNumber,
basic_products.diType, basic_products.diType,
basic_products.ybbm, basic_products.ybbm,
basic_products.sptm, basic_products.sptm,
basic_products.manufactory, basic_products.manufactory,
basic_products.measname, basic_products.measname,
basic_products.productType, basic_products.productType,
basic_products.scbssfbhph, basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq, basic_products.scbssfbhsxrq,
basic_products.cpms, basic_products.cpms,
basic_products.allowNoBatch, basic_products.allowNoBatch,
basic_products.allowNoExpire, basic_products.allowNoExpire,
basic_products.allowNoProduct, basic_products.allowNoProduct,
basic_products.allowNoSerial, basic_products.allowNoSerial,
basic_products.spmc, basic_products.spmc,
basic_products.cplx, basic_products.cplx,
basic_products.hchzsb, basic_products.hchzsb,
basic_products.cpdls, basic_products.cpdls,
basic_products.basicPrductRemak1, basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2, basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3, basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4, basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5, basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6, basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7, basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8, basic_products.basicPrductRemak8,
basic_corp.name companyName basic_corp.name companyName
FROM company_product_relevance FROM company_product_relevance
inner JOIN basic_udirel inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id ON company_product_relevance.udiRlIdFk = basic_udirel.id
inner JOIN basic_products inner JOIN basic_products
ON basic_udirel.uuid = basic_products.uuid ON basic_udirel.uuid = basic_products.uuid
left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
left join basic_hosp_type bht on basic_udirel.relCode = bht.code left join basic_hosp_type bht on basic_udirel.relCode = bht.code
left join thr_products tp on tp.code = basic_udirel.mainId left join thr_products tp on tp.code = basic_udirel.mainId
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%') AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
@ -127,19 +127,19 @@
</if> </if>
<if test="unionCode != '' and unionCode != null"> <if test="unionCode != '' and unionCode != null">
and ( and (
nameCode LIKE concat('%', #{unionCode}, '%') nameCode LIKE concat('%', #{unionCode}, '%')
or basic_products.ybbm LIKE concat('%', #{unionCode}, '%') or basic_products.ybbm LIKE concat('%', #{unionCode}, '%')
or basic_products.sptm LIKE concat('%', #{unionCode}, '%') or basic_products.sptm LIKE concat('%', #{unionCode}, '%')
) )
</if> </if>
<if test="thrPiId != '' and thrPiId != null"> <if test="thrPiId != '' and thrPiId != null">
and ( and (
basic_udirel.thirdId LIKE concat('%', #{thrPiId}, '%') basic_udirel.thirdId LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%') or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%') or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%') or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%') or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%')
) )
</if> </if>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}
@ -155,15 +155,15 @@
</if> </if>
<if test="filterType != null and filterType == 1"> <if test="filterType != null and filterType == 1">
AND (basic_udirel.thirdId <![CDATA[<>]]> '' or basic_udirel.thirdId1 <![CDATA[<>]]> '' or AND (basic_udirel.thirdId <![CDATA[<>]]> '' or basic_udirel.thirdId1 <![CDATA[<>]]> '' or
basic_udirel.thirdId2 <![CDATA[<>]]> '' or basic_udirel.thirdId2 <![CDATA[<>]]> '' or
basic_udirel.thirdId3 <![CDATA[<>]]> '' or basic_udirel.thirdId4 <![CDATA[<>]]> '') basic_udirel.thirdId3 <![CDATA[<>]]> '' or basic_udirel.thirdId4 <![CDATA[<>]]> '')
and basic_products.originUuid <![CDATA[<>]]> '' and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 2"> <if test="filterType != null and filterType == 2">
AND basic_products.originUuid is NULL AND basic_products.originUuid is NULL
</if> </if>
<if test="filterType != null and filterType == 3"> <if test="filterType != null and filterType == 3">
AND (basic_udirel.thirdId IS NULL or basic_udirel.thirdId='') AND (basic_udirel.thirdId IS NULL or basic_udirel.thirdId = '')
and basic_products.originUuid <![CDATA[<>]]> '' and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 4"> <if test="filterType != null and filterType == 4">
@ -215,6 +215,10 @@
<if test="isDisable == false"> <if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false) AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
</if> </if>
<if test="flbm != '' and flbm != null">
and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm})
</if>
</where> </where>
ORDER BY company_product_relevance.updateTime DESC ORDER BY company_product_relevance.updateTime DESC
</select> </select>
@ -239,7 +243,7 @@
SELECT * SELECT *
FROM company_product_relevance FROM company_product_relevance
where udiRlIdFk = #{udiRlIdFk} where udiRlIdFk = #{udiRlIdFk}
and customerId = #{customerId} and customerId = #{customerId}
</select> </select>
@ -289,45 +293,45 @@
<insert id="insertCompanyProductRelevance" <insert id="insertCompanyProductRelevance"
parameterType="com.glxp.api.entity.basic.UdiRlSupEntity"> parameterType="com.glxp.api.entity.basic.UdiRlSupEntity">
replace 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, createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
price, createUser, updateUser) price, createUser, updateUser)
values (#{id},#{customerId}, values (#{id}, #{customerId},
#{productId}, #{productId},
#{enterpriseId}, #{enterpriseId},
#{registrationId}, #{registrationId},
#{createTime}, #{createTime},
#{updateTime}, #{updateTime},
#{auditStatus}, #{auditStatus},
#{productUuid}, #{productUuid},
#{udiRlIdFk}, #{udiRlIdFk},
#{unitFk}, #{unitFk},
#{price}, #{price},
#{createUser}, #{createUser},
#{updateUser}) #{updateUser})
</insert> </insert>
<insert id="importCompanyProductRelevance" <insert id="importCompanyProductRelevance"
parameterType="com.glxp.api.entity.basic.UdiRlSupEntity"> parameterType="com.glxp.api.entity.basic.UdiRlSupEntity">
replace 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, createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
price, createUser, updateUser) price, createUser, updateUser)
values (#{id}, values (#{id},
#{customerId}, #{customerId},
#{productId}, #{productId},
#{enterpriseId}, #{enterpriseId},
#{registrationId}, #{registrationId},
#{createTime}, #{createTime},
#{updateTime}, #{updateTime},
#{auditStatus}, #{auditStatus},
#{productUuid}, #{productUuid},
#{udiRlIdFk}, #{udiRlIdFk},
#{unitFk}, #{unitFk},
#{price}, #{price},
#{createUser}, #{createUser},
#{updateUser}) #{updateUser})
</insert> </insert>
<delete id="deleteById" parameterType="Map"> <delete id="deleteById" parameterType="Map">
@ -358,9 +362,9 @@
<select id="selectSupRlCount" resultType="java.lang.Long"> <select id="selectSupRlCount" resultType="java.lang.Long">
select count(*) select count(*)
FROM company_product_relevance FROM company_product_relevance
inner JOIN basic_udirel inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id ON company_product_relevance.udiRlIdFk = basic_udirel.id
inner JOIN basic_products ON basic_udirel.uuid = basic_products.uuid inner JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
<where> <where>
<if test="nameCode != '' and nameCode != null"> <if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode}, '%') AND nameCode LIKE concat(#{nameCode}, '%')

Write Preview
Loading…
Cancel
Save