Merge remote-tracking branch 'origin/dev' into dev

pro
郑明梁 2 years ago
commit d1eb441bca

@ -15,6 +15,7 @@ import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.basic.UdiRlSupEntity;
import com.glxp.api.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.exception.JsonException;
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest;
@ -28,6 +29,7 @@ import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.basic.UdiRlSupResponse;
import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.basic.*;
import com.glxp.api.service.purchase.PurApplyDetailService;
import com.glxp.api.service.system.CompanyService;
import com.glxp.api.util.BeanCopyUtils;
import com.glxp.api.util.SupplementVailUtil;
@ -45,6 +47,7 @@ import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
*
@ -70,6 +73,8 @@ public class UdiRlSupController extends BaseController {
private SupplementVailUtil supplementVailUtil;
@Resource
private UdiProductService udiProductService;
@Resource
private PurApplyDetailService purApplyDetailService;
@AuthRuleAnnotation("")
@GetMapping("/sale/info/company/product/relevance/filter")
@ -154,9 +159,14 @@ public class UdiRlSupController extends BaseController {
//只查找主标识产品信息
companyProductRelevanceRequest.setDiType(1);
}
//查询详情id过滤
List<PurApplyDetailEntity> purApplyDetailEntityList= purApplyDetailService.findByOrderId(companyProductRelevanceRequest.getId());
List<Integer> idList = purApplyDetailEntityList.stream().map(PurApplyDetailEntity::getProductId).collect(Collectors.toList());
List<UdiRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest();
BeanCopyUtils.copy(companyProductRelevanceRequest,filterUdiRelRequest);
filterUdiRelRequest.setIds(idList);
basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest);
PageInfo<UdiRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);

@ -190,24 +190,27 @@ public class IoPurChangeService {
List<PurPlanDetailEntity> purPlanDetailEntityList1 = new ArrayList<>(); //有供应商
List<PurPlanDetailEntity> purPlanDetailEntityList2 = new ArrayList<>(); //无供应商
for (PurPlanDetailEntity purPlanDetailEntity : purPlanDetailEntityList) {
if(StrUtil.isNotBlank(purPlanDetailEntity.getSupId())){
purPlanDetailEntityList1.add(purPlanDetailEntity);
}else{
purPlanDetailEntityList2.add(purPlanDetailEntity);
}
if (StrUtil.isNotBlank(purPlanDetailEntity.getSupId())) {
purPlanDetailEntityList1.add(purPlanDetailEntity);
} else {
purPlanDetailEntityList2.add(purPlanDetailEntity);
}
}
//根据供应商分组
Map<String, List<PurPlanDetailEntity>> purPlanDetailMap = purPlanDetailEntityList1.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
purPlanDetailMap.put("not",purPlanDetailEntityList2);
purPlanDetailMap.put("not", purPlanDetailEntityList2);
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
for (String key : purPlanDetailMap.keySet()) {
PurOrderEntity purOrderEntity = new PurOrderEntity();
List<PurPlanDetailEntity> purPlanDetailEntitys = purPlanDetailMap.get(key);
if (purPlanDetailEntitys.isEmpty()) {
continue;
}
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
purOrderEntity.setBillDate(purPlanEntity.getBillDate());
if(!key.equals("not")){
if (!key.equals("not")) {
purOrderEntity.setSupId(key);
}
purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());

@ -162,9 +162,7 @@ public class PurApplyController {
purApplyEntity.setAuditTime(new Date());
purApplyEntity.setAuditUser(userId + "");
purApplyService.update(purApplyEntity);
//System.out.println("666666666666666666++"+purApplyRequest.getStatus());
if (purApplyRequest.getStatus() == 3) {
// generateDocument(purApplyEntity);
purChangeService.purApplyChange(purApplyEntity);
}
@ -479,10 +477,14 @@ public class PurApplyController {
*/
@RepeatSubmit()
@PostMapping("/purchase/apply/addDetail")
public BaseResponse addDetail(@RequestBody PurApplyDetailEntity purApplyDetailEntity) {
public BaseResponse addDetail(@RequestBody List<PurApplyDetailEntity> list) {
purApplyDetailService.insert(purApplyDetailEntity);
return ResultVOUtils.success(purApplyDetailEntity.getOrderIdFk());
for (PurApplyDetailEntity purApplyDetailEntity : list) {
purApplyDetailService.insert(purApplyDetailEntity);
}
return ResultVOUtils.success(list.get(0).getOrderIdFk());
}
/**

@ -1,11 +1,17 @@
package com.glxp.api.controller.thrsys;
import cn.hutool.core.collection.CollUtil;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.system.SyncDataBustypeEntity;
import com.glxp.api.entity.system.SyncUploadDataSetEntity;
import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.service.system.SyncUploadDataBustypeService;
import com.glxp.api.service.system.SyncUploadDataSetService;
import com.glxp.api.service.thrsys.ThrOrderUploadBustypesService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -13,15 +19,21 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@RestController
public class ThirdUploadSetController {
@Resource
SyncUploadDataSetService syncUploadDataSetService;
@Resource
ThrOrderUploadBustypesService thrOrderUploadBustypesService;
@AuthRuleAnnotation("system/third/syncData/config")
@GetMapping("/system/third/syncData/config")
public BaseResponse list() {
SyncUploadDataSetEntity syncDataSetResponse = syncUploadDataSetService.selectSet();
return ResultVOUtils.success(syncDataSetResponse);
}
@ -37,4 +49,68 @@ public class ThirdUploadSetController {
return ResultVOUtils.success();
}
@AuthRuleAnnotation("system/third/syncData/getBus")
@GetMapping("/system/third/syncData/getBus")
public BaseResponse getBuslist() {
List<ThrOrderUploadBustypesEntity> thrOrderUploadBustypesEntities = thrOrderUploadBustypesService.list();
return ResultVOUtils.success(thrOrderUploadBustypesEntities);
}
// 添加单据类型
@AuthRuleAnnotation("system/third/syncData/addBus")
@PostMapping("/system/third/syncData/addBus")
public BaseResponse addBus(@RequestBody @Valid SyncUploadDataSetEntity syncUploadDataSetEntity
) {
if (CollUtil.isEmpty(syncUploadDataSetEntity.getBusTypes())) {
return ResultVOUtils.error(500, "未选入单据类型");
}
List<ThrOrderUploadBustypesEntity> bustypesEntities = syncUploadDataSetEntity.getBusTypes();
if (CollUtil.isNotEmpty(bustypesEntities)) {
for (ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity : bustypesEntities) {
if (!thrOrderUploadBustypesService.isExit(thrOrderUploadBustypesEntity.getAction())) {
thrOrderUploadBustypesEntity.setOrderStatus(3);
thrOrderUploadBustypesEntity.setUpdateTime(new Date());
thrOrderUploadBustypesEntity.setCreateTime(new Date());
thrOrderUploadBustypesEntity.setOrderSource(Arrays.asList("2"));
thrOrderUploadBustypesService.save(thrOrderUploadBustypesEntity);
}
}
}
return ResultVOUtils.success();
}
// 移除单据类型
@AuthRuleAnnotation("system/third/syncData/removeBus")
@PostMapping("/system/third/syncData/removeBus")
public BaseResponse removeBus(@RequestBody @Valid DeleteRequest deleteRequest
) {
thrOrderUploadBustypesService.removeById(deleteRequest.getId());
return ResultVOUtils.success("删除成功!");
}
// 单据类型编辑
@AuthRuleAnnotation("system/third/syncData/editBus")
@PostMapping("/system/third/syncData/editBus")
public BaseResponse editBus(@RequestBody @Valid ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity
) {
thrOrderUploadBustypesService.updateById(thrOrderUploadBustypesEntity);
return ResultVOUtils.success("更新成功!");
}
//编辑
@AuthRuleAnnotation("system/third/syncData/update")
@GetMapping("/system/third/syncData/update")
public BaseResponse update(@RequestBody @Valid SyncUploadDataSetEntity syncUploadDataSetEntity) {
// 保存更新后的数据集信息
boolean b = syncUploadDataSetService.updateById(syncUploadDataSetEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success();
}
}

@ -103,7 +103,7 @@ public class ThrSystemController {
ThrSystemEntity thrSystemEntity = thrSystemService.selectByThirdId(filterBasicThirdSysDetailRequest.getThirdSysFk());
return ResultVOUtils.success(thrSystemEntity);
}
//接口设置编辑
@PostMapping("/udiwms/basic/thirdsys/update")
public BaseResponse save(@RequestBody @Valid ThrSystemEntity thrSystemEntity,
BindingResult bindingResult) {

@ -10,4 +10,7 @@ public interface SyncUploadDataSetDao {
boolean insert(SyncUploadDataSetEntity syncDataSetEntity);
SyncUploadDataSetEntity getById(Long dataSetId);
boolean updateById(SyncUploadDataSetEntity oldDataSet);
}

@ -61,4 +61,4 @@ public class PurApplyDetailEntity {
public static final String COL_SUPID = "supId";
public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh";
}
}

@ -1,5 +1,6 @@
package com.glxp.api.entity.system;
import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity;
import lombok.Data;
import java.util.List;
@ -26,5 +27,5 @@ public class SyncUploadDataSetEntity {
private String orderStartTime;
private List<SyncDataBustypeEntity> busTypes;
private List<ThrOrderUploadBustypesEntity> busTypes;
}

@ -7,12 +7,15 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@Data
@TableName(value = "thr_order_upload_bustypes")
@TableName(value = "thr_order_upload_bustypes", autoResultMap = true)
public class ThrOrderUploadBustypesEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
@ -33,8 +36,8 @@ public class ThrOrderUploadBustypesEntity implements Serializable {
/**
* ()
*/
@TableField(value = "orderSource", typeHandler = FastjsonTypeHandler.class)
private String orderSource;
@TableField(value = "orderSource", typeHandler = JacksonTypeHandler.class)
private List<String> orderSource;
/**
*
@ -42,6 +45,14 @@ public class ThrOrderUploadBustypesEntity implements Serializable {
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField(value = "`orderStartTime`")
private Date orderStartTime;
/**
*
*/

@ -52,6 +52,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private String corpId;
private String billType;
private String manufactory;
private String flbm;
private List<String> uuids;
}

@ -74,5 +74,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
private Boolean groupBuy;
private List<String> uuids;
private List<Integer> ids;
private String flbm;
}

@ -182,6 +182,9 @@ public class UdiContrastService {
udiProductEntity.setScbssfbhscrq("是");
udiProductEntity.setScbssfbhsxrq("是");
udiProductEntity.setScbssfbhxlh("否");
if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
udiProductEntity.setPrice(null);
}
udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
udiProductService.insertUdiInfo(udiProductEntity);
}

@ -27,6 +27,7 @@ import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.inv.*;
import com.glxp.api.entity.system.SyncDataBustypeEntity;
import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity;
import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
import com.glxp.api.entity.thrsys.ThrSystemEntity;
@ -41,7 +42,9 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.inout.*;
import com.glxp.api.service.inv.*;
import com.glxp.api.service.system.SyncUploadDataBustypeService;
import com.glxp.api.service.thrsys.ThrOrderUploadBustypesService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.udi.UdiCalCountUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@ -634,7 +637,7 @@ public class IoOrderServiceImpl implements IoOrderService {
filterOrderRequest.setDealStatuses(Arrays.asList(2));
break;
case Constant.ORDER_STATUS_CHECKED_ERROR:
filterOrderRequest.setStatuses(Arrays.asList(6,4));
filterOrderRequest.setStatuses(Arrays.asList(6, 4));
filterOrderRequest.setDealStatuses(Arrays.asList(2));
break;
case Constant.ORDER_STATUS_CHECK_SUCCESS:
@ -818,7 +821,6 @@ public class IoOrderServiceImpl implements IoOrderService {
public BaseResponse submitToThrSys(String billNo) {
//查询单据类型
String billType = orderDao.selectActionByBillNo(billNo);
//查询此单据类型对应的第三方系统ID
ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiDao.selectByCode(billType);
//查询第三方系统
@ -849,6 +851,10 @@ public class IoOrderServiceImpl implements IoOrderService {
return orderDao.exists(new QueryWrapper<IoOrderEntity>().eq("action", action));
}
@Resource
ThrOrderUploadBustypesService thrOrderUploadBustypesService;
@Override
public BaseResponse submitOrderToThrSys(ThrSystemDetailEntity thrSystemDetailEntity) {
//查询可以提交到第三方系统的单据
@ -856,7 +862,34 @@ public class IoOrderServiceImpl implements IoOrderService {
if (CollUtil.isNotEmpty(billNos)) {
log.info("开始提交单据到第三方系统,本次提交单据数量:{}", billNos.size());
for (String billNo : billNos) {
submitToThrSys(billNo);
IoOrderEntity orderEntity = findByBillNo(billNo);
ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity = thrOrderUploadBustypesService.findByAction(orderEntity.getAction());
if (thrOrderUploadBustypesEntity == null) {
log.error(billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传");
return ResultVOUtils.error(500, billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传");
}
if (thrOrderUploadBustypesEntity.getOrderSource().contains(orderEntity.getFromType() + "")) {
log.error(billNo + ":" + "单据来源不允许自动提交");
return ResultVOUtils.error(500, billNo + ":" + "单据来源不允许自动提交");
}
if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 1) {
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) {
log.error(billNo + ":" + "非待审核单据");
return ResultVOUtils.error(500, billNo + ":" + "非待审核单据");
}
} else if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 2) {
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_AUDITED) {
log.error(billNo + ":" + "非已审核单据");
return ResultVOUtils.error(500, billNo + ":" + "非已审核单据");
}
} else if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 3) {
if (IntUtil.value(orderEntity.getCheckStatus()) != 1) {
log.error(billNo + ":" + "非已确认单据");
return ResultVOUtils.error(500, billNo + ":" + "非已确认单据");
}
}
return submitToThrSys(billNo);
}
log.info("单据提交完成");
}

@ -26,8 +26,6 @@ public class SyncDataBustypeServiceImpl extends ServiceImpl<SyncDataBustypeDao,
@Override
public SyncDataBustypeEntity findByAction(String action, Integer direct) {
List<SyncDataBustypeEntity> syncDataBustypeEntities = syncDataBustypeDao.selectList(new QueryWrapper<SyncDataBustypeEntity>().eq(direct != null, "direct", direct).eq("action", action));
if (CollUtil.isNotEmpty(syncDataBustypeEntities)) {
return syncDataBustypeEntities.get(0);

@ -11,4 +11,8 @@ public interface SyncUploadDataSetService {
boolean insert(SyncUploadDataSetEntity syncUploadDataSetEntity);
SyncUploadDataSetEntity getById(Long dataSetId);
boolean updateById(SyncUploadDataSetEntity oldDataSet);
}

@ -17,8 +17,6 @@ public class SyncUploadDataSetServiceImpl implements SyncUploadDataSetService {
@Resource
SyncUploadDataSetDao syncUploadDataSetDao;
@Resource
SyncUploadDataBustypeService syncUploadDataBustypeService;
@Override
public SyncUploadDataSetEntity findSet() {
@ -36,8 +34,6 @@ public class SyncUploadDataSetServiceImpl implements SyncUploadDataSetService {
syncDataSetEntity.setOrderSyncTime(1);
syncUploadDataSetDao.insert(syncDataSetEntity);
}
List<SyncDataBustypeEntity> syncDataBustypeEntities = syncUploadDataBustypeService.findAll();
syncDataSetEntity.setBusTypes(syncDataBustypeEntities);
return syncDataSetEntity;
}
@ -47,4 +43,14 @@ public class SyncUploadDataSetServiceImpl implements SyncUploadDataSetService {
return syncUploadDataSetDao.insert(syncDataSetEntity);
}
@Override
public SyncUploadDataSetEntity getById(Long dataSetId) {
return syncUploadDataSetDao.getById(dataSetId);
}
@Override
public boolean updateById(SyncUploadDataSetEntity oldDataSet) {
return syncUploadDataSetDao.updateById(oldDataSet);
}
}

@ -1,10 +1,26 @@
package com.glxp.api.service.thrsys;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.dao.thrsys.ThrOrderUploadBustypesMapper;
import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity;
import javax.annotation.Resource;
@Service
public class ThrOrderUploadBustypesService extends ServiceImpl<ThrOrderUploadBustypesMapper, ThrOrderUploadBustypesEntity> {
@Resource
ThrOrderUploadBustypesMapper thrOrderUploadBustypesMapper;
public boolean isExit(String action) {
return thrOrderUploadBustypesMapper.exists(new QueryWrapper<ThrOrderUploadBustypesEntity>().eq("action", action));
}
public ThrOrderUploadBustypesEntity findByAction(String action) {
return thrOrderUploadBustypesMapper.selectOne(new QueryWrapper<ThrOrderUploadBustypesEntity>().eq("action", action));
}
}

@ -8,6 +8,7 @@ import com.glxp.api.entity.system.SyncDataSetEntity;
import com.glxp.api.req.system.ScheduledRequest;
import com.glxp.api.service.sync.HeartService;
import com.glxp.api.util.RedisUtil;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.EnableScheduling;
@ -81,7 +82,9 @@ public class SyncHeartTask implements SchedulingConfigurer {
redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1);
}
} catch (Exception e) {
logger.error(ExceptionUtils.getStackTrace(e));
e.printStackTrace();
}
@ -100,6 +103,7 @@ public class SyncHeartTask implements SchedulingConfigurer {
redisUtil.set("SPS_SYNC_UPLOAD_ORDER", curTime2);
}
} catch (Exception e) {
logger.error(ExceptionUtils.getStackTrace(e));
e.printStackTrace();
}
@ -117,11 +121,13 @@ public class SyncHeartTask implements SchedulingConfigurer {
heartService.dlAllOrder();
} catch (Exception e) {
e.printStackTrace();
logger.error(ExceptionUtils.getStackTrace(e));
}
try {
heartService.dlAllDiProducts();
} catch (Exception e) {
e.printStackTrace();
logger.error(ExceptionUtils.getStackTrace(e));
}
Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> {
heartService.pullData(i);

@ -179,35 +179,55 @@
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
company_product_relevance.unitFk,
basic_corp.erpId as customerId,
basic_corp.name companyName
basic_corp.erpId as customerId,
basic_corp.name companyName
FROM basic_udirel
inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid
left join company_product_relevance
on basic_udirel.id = company_product_relevance.udiRlIdFk
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 thr_products tp on tp.code = basic_udirel.mainId
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
AND basic_products.ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if>
<if test="manufactory != '' and manufactory != null">
AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
</if>
<if test="supName != '' and supName != null">
AND supName LIKE concat('%', #{supName}, '%')
</if>
<if test="ids != null and ids.size() > 0">
and basic_udirel.id not in
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="pinyinInitial != null and pinyinInitial != ''">
AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')
</if>
<if test="thrPiId != '' and thrPiId != null">
and (basic_udirel.thirdId LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%'))
</if>
<if test="ggxh != '' and ggxh != null">
AND ggxh LIKE concat('%', #{ggxh}, '%')
AND basic_products.ggxh LIKE concat('%', #{ggxh}, '%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
</if>
<if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode}, '%')
</if>
<if test="thirdId != '' and thirdId != null">
AND thirdId LIKE concat(#{thirdId}, '%')
AND basic_udirel.thirdId LIKE concat(#{thirdId}, '%')
</if>
<if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid}
@ -228,7 +248,7 @@
AND basic_udirel.lockStatus = #{lockStatus}
</if>
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
</if>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
@ -256,6 +276,12 @@
#{item}
</foreach>
</if>
<if test="flbm != '' and flbm != null">
and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm} or tp.cplb = #{flbm})
</if>
<if test="companyName != '' and companyName != null">
AND basic_corp.name like concat('%', #{companyName}, '%')
</if>
</where>
</select>
@ -336,13 +362,13 @@
AND nameCode LIKE concat(#{nameCode}, '%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
</if>
<if test="entireCpmctymc != '' and entireCpmctymc != null">
AND cpmctymc = #{entireCpmctymc}
AND basic_products.cpmctymc = #{entireCpmctymc}
</if>
<if test="ggxh != '' and ggxh != null">
AND ggxh LIKE concat('%', #{ggxh}, '%')
AND basic_products.ggxh LIKE concat('%', #{ggxh}, '%')
</if>
<if test="unionCode != '' and unionCode != null">
and (
@ -354,7 +380,7 @@
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
</if>
<if test="isDisable == true">
AND basic_udirel.isDisable = true
AND basic_udirel.isDisable = true
</if>
<if test="thrPiId != '' and thrPiId != null">
and (thirdId LIKE concat('%', #{thrPiId}, '%')
@ -373,7 +399,7 @@
AND udplatCode = #{udplatCode}
</if>
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
</if>
<if test="diType != '' and diType != null">
AND diType = #{diType}
@ -422,7 +448,7 @@
and originUuid = #{originUuid}
</if>
<if test="manufactory != null and manufactory != ''">
and manufactory LIKE concat('%', #{manufactory}, '%')
and basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
</if>
<if test="dispatch != null">
and basic_udirel.dispatch = #{dispatch}
@ -1266,14 +1292,12 @@
</select>
<select id="selectRelIdByName" resultType="java.lang.String">
SELECT
b2.id
FROM
basic_products b1
LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
SELECT b2.id
FROM basic_products b1
LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
<where>
<if test="productName != '' and productName != null">
AND b1.cpmctymc like concat('%', #{productName}, '%')
AND b1.cpmctymc like concat('%', #{productName}, '%')
</if>
</where>
</select>

@ -2,6 +2,25 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.system.SyncUploadDataSetDao">
<update id="updateById">
UPDATE thr_order_upload
<set>
<if test="orderUnCheck != null">orderUnCheck=#{orderUnCheck},</if>
<if test="orderUnReceive != null">orderUnReceive=#{orderUnReceive},</if>
<if test="orderScanFinish != null">orderScanFinish=#{orderScanFinish},</if>
<if test="checkUdims != null">checkUdims=#{checkUdims},</if>
<if test="checkPdaEd != null">checkPdaEd=#{checkPdaEd},</if>
<if test="checkPdaUn != null">checkPdaUn=#{checkPdaUn},</if>
<if test="checkPc != null">checkPc=#{checkPc},</if>
<if test="checkWebNew != null">checkWebNew=#{checkWebNew},</if>
<if test="checkChange != null">checkChange=#{checkChange},</if>
<if test="checkSp != null">checkSp=#{checkSp},</if>
<if test="checkBalacne != null">checkBalacne=#{checkBalacne},</if>
</set>
WHERE id = #{id}
</update>
<select id="selectSet"
@ -9,6 +28,11 @@
SELECT *
FROM thr_order_upload limit 1
</select>
<select id="getById" resultType="com.glxp.api.entity.system.SyncUploadDataSetEntity">
SELECT *
FROM thr_order_upload_bustypes WHERE id = ?
</select>
<insert id="insert" parameterType="com.glxp.api.entity.system.SyncUploadDataSetEntity">

@ -481,4 +481,9 @@ CALL Pro_Temp_ColumnWork('io_stat_year', 'deptCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_code', 'updateTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'pinyinInitial', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'pinyinInitial', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('thr_order_upload_bustypes', 'orderStatus', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('thr_order_upload_bustypes', 'orderStartTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('thr_order_upload_bustypes', 'orderSource', 'varchar(1024)', 1);

Loading…
Cancel
Save