diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java index c27bd16cb..58f29d8e9 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java @@ -68,7 +68,7 @@ public class BasicdataStoreBrandEntity extends TenantEntity { * 品牌编码 */ @ApiModelProperty(value = "品牌ID") - private String brandId; + private Long brandId; /** * 品牌名称 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataClientExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataClientExcel.java index c0736f5d9..5f4074de0 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataClientExcel.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataClientExcel.java @@ -134,6 +134,14 @@ public class BasicdataClientExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("三方商场编码") private String tripartiteCoding; + + /** + * 三方商场品牌 + */ + @ColumnWidth(20) + @ExcelProperty("三方商场品牌") + private String tripartiteMallBrand; + /** * 三方商场 */ @@ -167,4 +175,15 @@ public class BasicdataClientExcel implements Serializable { @ExcelProperty("合同结束时间") private Date contractEntTime; + + /** + * 默认付款方式 + */ + @ColumnWidth(20) + @ExcelProperty("默认付款方式") + private String defaultPaymentMethods; + + + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index ce8255162..96bcad3bb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java @@ -18,6 +18,7 @@ package com.logpm.basicdata.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -31,11 +32,13 @@ import com.logpm.basicdata.vo.BasicdataClientVO; import com.logpm.basicdata.vo.ClientInfoVO; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; +import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.cache.DictBizCache; import org.springblade.system.entity.DictBiz; import org.springblade.system.feign.IUserClient; @@ -47,6 +50,8 @@ import java.security.NoSuchAlgorithmException; import java.util.*; import java.util.stream.Collectors; +import static org.springblade.common.constant.DictBizConstant.OPEN_ORDER_PAY_WAY; + /** * 基础客户表 服务实现类 * @@ -59,25 +64,25 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl selectBasicdataClientPage(IPage page, BasicdataClientVO basicdataClient) { @@ -105,7 +110,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl list = basicdataStoreBusinessService.list(Wrappers.query().lambda() .eq(BasicdataStoreBusinessEntity::getClientId, basicdataClient.getId()) ); - if (list.size() > 0) { + if (!list.isEmpty()) { //有数据 List stringList = new ArrayList<>(); list.forEach(i -> { @@ -158,18 +163,16 @@ public class BasicdataClientServiceImpl extends BaseServiceImplquery().lambda() .eq(BasicdataClientEntity::getClientCode, basicdataClient.getClientCode()) - .or() + .or() .eq(BasicdataClientEntity::getClientName, basicdataClient.getClientName()) ); - if(ObjectUtils.isNotNull(basicdataClient1)){ + if (ObjectUtils.isNotNull(basicdataClient1)) { throw new ServiceException("客户编码或客户名称已存在"); } //添加 this.save(basicdataClient); // //绑定客户账号和客户关系 -// this.saveCustomerAndAddAcount(phone,linkman,basicdataClient.getId()); - //添加联系人 BasicdataStoreContactEntity basicdataStoreContactEntity = new BasicdataStoreContactEntity(); @@ -181,9 +184,8 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl 0) { + if (!basicdataClient.getTypeServiceList().isEmpty()) { for (String s : basicdataClient.getTypeServiceList()) { //添加服务类型 BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = new BasicdataStoreBusinessEntity(); @@ -195,7 +197,6 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl listCode(String code) { return baseMapper.selectList(Wrappers.query().lambda() - .eq(BasicdataClientEntity::getClientCode,code) + .eq(BasicdataClientEntity::getClientCode, code) ); } @Override public List dictList() { BasicdataWarehouseEntity myCurrentWarehouse = warehouseService.getMyCurrentWarehouse(); - if (null == myCurrentWarehouse){ + if (null == myCurrentWarehouse) { return new ArrayList(); } - List list = baseMapper.selectListDict(myCurrentWarehouse.getId()); + List list = baseMapper.selectListDict(myCurrentWarehouse.getId()); return list; } /** * 导入数据 + * * @param data * @param isCovered */ @@ -301,153 +303,165 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl dictBizs = DictBizCache.getList(DictBizConstant.DISTRIBUTION_TYPE);//商 市 自 List clientBiz = DictBizCache.getList(DictBizConstant.CLIENT_TYPE); //客 工 List freightBiz = DictBizCache.getList(DictBizConstant.BASIC_FREIGHT_TYPE); //客 工 - Set set =new HashSet<>(); + Set set = new HashSet<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); List basicdataClients = baseMapper.selectList(queryWrapper); + + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(BasicdataBrandEntity::getIsDeleted, 0); + List basicdataBrandEntityList = basicdataBrandService.list(lambdaQueryWrapper); + for (BasicdataClientExcel i : data) { - log.info("导入数据《》《》{}",i); - if(set.isEmpty()){ - set.add(i.getClientCode()); - }else{ - boolean b = set.stream().anyMatch(a -> a.equals(i.getClientCode())); - if(b){ - continue; - } + + // 处理下空格 换行 + i.setClientName(i.getClientName().trim()); + i.setClientCode(i.getClientCode().trim()); + + log.info("导入数据《》《》{}", i); + if (set.isEmpty()) { + set.add(i.getClientCode()); + } else { + boolean b = set.stream().anyMatch(a -> a.equals(i.getClientCode())); + if (b) { + continue; } - if(ObjectUtils.isNull(i.getClientCode()) || ObjectUtils.isNull(i.getClientName())){ + } + if (ObjectUtils.isNull(i.getClientCode()) || ObjectUtils.isNull(i.getClientName())) { throw new ServiceException("客户编码或客户名称不能为空！"); } - BasicdataClientEntity basicdataClient = new BasicdataClientEntity(); - BeanUtil.copyProperties(i,basicdataClient); - log.info("比对对象>>>:{}",basicdataClient); - log.info("查询客户信息>>>:{}",basicdataClients); + BasicdataClientEntity basicdataClient = new BasicdataClientEntity(); + BeanUtil.copyProperties(i, basicdataClient); + + log.info(">>>>>> basicdataClient.getClientCode() {}",basicdataClient.getClientCode()); //查询客户编码和客户名称是否存在 boolean b = basicdataClients.stream().anyMatch(ii -> ii.getClientCode().equals(basicdataClient.getClientCode()) - || ii.getClientName().equals(basicdataClient.getClientName())); + || ii.getClientName().equals(basicdataClient.getClientName().trim())); - if(b){ + if (b) { List basicdataClientEntities = basicdataClients.stream().filter(ii -> ii.getClientCode().equals(basicdataClient.getClientCode()) || ii.getClientName().equals(basicdataClient.getClientName())).collect(Collectors.toList()); - log.info("###############basicdataClientEntities重复客户:{}",basicdataClientEntities); + log.info("###############basicdataClientEntities重复客户:{}", basicdataClientEntities); throw new ServiceException("客户编码或客户名称已存在"); } // Optional first = dictBizs.stream().filter(ii -> ii.getDictValue().equals(i.getTypeService())).findFirst(); - Optional clientFirst = clientBiz.stream().filter(ii -> ii.getDictValue().equals(i.getClientType())).findFirst(); + Optional clientFirst = clientBiz.stream().filter(ii -> ii.getDictValue().equals(i.getClientType())).findFirst(); // i.setTypeService(first.get().getDictValue()); - basicdataClient.setClientType(clientFirst.get().getDictKey()); - //查询是不是重复 - List basicdataClientEntities = baseMapper.selectList(Wrappers.query().lambda().eq(BasicdataClientEntity::getClientCode, i.getClientCode())); - if(basicdataClientEntities.isEmpty()){ - BladeUser user = AuthUtil.getUser(); - basicdataClient.setPid(0L); - basicdataClient.setCreateUser(user.getUserId()); - basicdataClient.setCargoControl(false); - basicdataClient.setStatus(0); - basicdataClient.setIsDeleted(0); - basicdataClient.setCreateTime(new Date()); - baseMapper.insert(basicdataClient); - if(ObjectUtils.isNull(basicdataClient.getId())){ - throw new ServiceException("客户ID不存在"); - } - //添加服务类型 - if(ObjectUtils.isNotNull(i.getTypeService())){ - BasicdataStoreBusinessEntity storeBusinessEntity = new BasicdataStoreBusinessEntity(); - storeBusinessEntity.setClientId(basicdataClient.getId().toString()); - storeBusinessEntity.setTypeService(i.getTypeService()); - storeBusinessEntity.setMold(i.getMold()); - storeBusinessEntities.add(storeBusinessEntity); - } - //添加服务仓 + basicdataClient.setClientType(clientFirst.get().getDictKey()); + //查询是不是重复 + List basicdataClientEntities = baseMapper.selectList(Wrappers.query().lambda().eq(BasicdataClientEntity::getClientCode, i.getClientCode())); + if (basicdataClientEntities.isEmpty()) { + BladeUser user = AuthUtil.getUser(); + basicdataClient.setPid(0L); + basicdataClient.setCreateUser(user.getUserId()); + basicdataClient.setCargoControl(false); + basicdataClient.setStatus(0); + basicdataClient.setIsDeleted(0); + basicdataClient.setCreateTime(new Date()); + + // 默认付款方式 + String keyValue = matchDictValue(DictBizCache.getList(OPEN_ORDER_PAY_WAY), i.getDefaultPaymentMethods().trim()); + + basicdataClient.setDefaultPaymentMethods(keyValue); - if(ObjectUtils.isNotNull(i.getServeWarehouseName())){ - BasicdataStorageServicesEntity servicesEntity = new BasicdataStorageServicesEntity(); - servicesEntity.setClientId(basicdataClient.getId()); - servicesEntity.setDistinguish(2); - if(ObjectUtils.isNotNull(i.getSendWarehouseName())){ + baseMapper.insert(basicdataClient); + if (ObjectUtils.isNull(basicdataClient.getId())) { + throw new ServiceException("客户ID不存在"); + } + + //添加服务类型 + if (ObjectUtils.isNotNull(i.getTypeService())) { + BasicdataStoreBusinessEntity storeBusinessEntity = new BasicdataStoreBusinessEntity(); + storeBusinessEntity.setClientId(basicdataClient.getId().toString()); + storeBusinessEntity.setTypeService(i.getTypeService()); + storeBusinessEntity.setMold(i.getMold()); + storeBusinessEntities.add(storeBusinessEntity); + } + //添加服务仓 + if (ObjectUtils.isNotNull(i.getServeWarehouseName())) { + BasicdataStorageServicesEntity servicesEntity = new BasicdataStorageServicesEntity(); + servicesEntity.setClientId(basicdataClient.getId()); + servicesEntity.setDistinguish(2); + if (ObjectUtils.isNotNull(i.getSendWarehouseName())) { // Long id = list1.stream().filter(q -> q.getName().equals(i.getSendWarehouseName())).findFirst().get().getId(); // servicesEntity.setSendWarehouseId(String.valueOf(id)); - servicesEntity.setSendWarehouseName(i.getSendWarehouseName()); - } - Long id = list1.stream().filter(q -> q.getName().equals(i.getServeWarehouseName())).findFirst().get().getId(); - servicesEntity.setServeWarehouseId(id); - servicesEntity.setServeWarehouseName(i.getServeWarehouseName()); - storageServicesEntities.add(servicesEntity); + servicesEntity.setSendWarehouseName(i.getSendWarehouseName()); } - //添加品牌 - if(ObjectUtils.isNotNull(i.getBrandName())){ - BasicdataStoreBrandEntity storeBrandEntity= new BasicdataStoreBrandEntity(); + Long id = list1.stream().filter(q -> q.getName().equals(i.getServeWarehouseName())).findFirst().get().getId(); + servicesEntity.setServeWarehouseId(id); + servicesEntity.setServeWarehouseName(i.getServeWarehouseName()); + storageServicesEntities.add(servicesEntity); + } + //添加品牌 + if (ObjectUtils.isNotNull(i.getBrandName())) { + + String [] ars = i.getBrandName().split(","); + + for (String ar : ars) { + BasicdataStoreBrandEntity storeBrandEntity = new BasicdataStoreBrandEntity(); storeBrandEntity.setClientId(basicdataClient.getId()); storeBrandEntity.setShopId(basicdataClient.getId().toString()); - BasicdataBrandEntity one = basicdataBrandService.getOne(Wrappers.query().lambda().eq(BasicdataBrandEntity::getBrandName, i.getBrandName())); - if(ObjectUtils.isNull(one)){ + BasicdataBrandEntity one = matchBasicdataBrandEntityListValue(basicdataBrandEntityList, ar); + + + if (ObjectUtils.isNull(one)) { throw new ServiceException("品牌不存在"); } - storeBrandEntity.setBrandId(String.valueOf(one.getId())); - storeBrandEntity.setBrandName(i.getBrandName()); + assert one != null; + storeBrandEntity.setBrandId(one.getId()); + storeBrandEntity.setBrandName(one.getBrandName()); storeBrandEntities.add(storeBrandEntity); } - //添加联系人 - if(ObjectUtils.isNotNull(i.getLinkman())){ - BasicdataStoreContactEntity storeContactEntity = new BasicdataStoreContactEntity(); - storeContactEntity.setShopId(basicdataClient.getId()); - storeContactEntity.setPhone(i.getPhone()); - storeContactEntity.setLinkman(i.getLinkman()); - storeContactEntities.add(storeContactEntity); - } - //添加三方商场 - if(ObjectUtils.isNotNull(i.getTripartiteMall())){ - BasicdataTripartiteMallEntity tripartiteMallEntity = new BasicdataTripartiteMallEntity(); - tripartiteMallEntity.setClientId(basicdataClient.getId()); - tripartiteMallEntity.setTripartiteMall(i.getTripartiteMall()); - tripartiteMallEntity.setTripartiteCoding(i.getTripartiteCoding()); - tripartiteMallEntities.add(tripartiteMallEntity); - } } - } + //添加联系人 + if (ObjectUtils.isNotNull(i.getLinkman())) { + BasicdataStoreContactEntity storeContactEntity = new BasicdataStoreContactEntity(); + storeContactEntity.setShopId(basicdataClient.getId()); + storeContactEntity.setPhone(i.getPhone()); + storeContactEntity.setLinkman(i.getLinkman()); + storeContactEntities.add(storeContactEntity); - //品牌 - if(!storeBrandEntities.isEmpty()){ - List list = new ArrayList<>(); - storeBrandEntities.stream().forEach(i ->{ - if(i.getBrandName().contains(",")){ - String[] split = i.getBrandName().split(","); - for (int j = 0; j < split.length; j++) { - BasicdataStoreBrandEntity business = new BasicdataStoreBrandEntity(); - BeanUtil.copyProperties(i,business); - List list2 = basicdataBrandService.list(Wrappers.query().lambda() - .eq(BasicdataBrandEntity::getBrandName, i.getBrandName()) - ); - business.setBrandName(split[j]); - business.setBrandId(list2.get(0).getId().toString()); - list.add(business); + } + //添加三方商场 + if (ObjectUtils.isNotNull(i.getTripartiteMall())) { + BasicdataTripartiteMallEntity tripartiteMallEntity = new BasicdataTripartiteMallEntity(); + tripartiteMallEntity.setClientId(basicdataClient.getId()); + tripartiteMallEntity.setTripartiteMall(i.getTripartiteMall()); + tripartiteMallEntity.setTripartiteCoding(i.getTripartiteCoding()); + + BasicdataBrandEntity one = matchBasicdataBrandEntityListValue(basicdataBrandEntityList, i.getTripartiteMallBrand()); + + if (ObjectUtil.isNotEmpty(one)) { + //三方名称 + assert one != null; + tripartiteMallEntity.setBrandId(one.getId()); + tripartiteMallEntity.setBrandName(one.getBrandName()); } - }else{ - List list2 = basicdataBrandService.list(Wrappers.query().lambda() - .eq(BasicdataBrandEntity::getBrandName, i.getBrandName()) - ); - i.setBrandName(i.getBrandName()); - i.setBrandId(list2.get(0).getId().toString()); - list.add(i); + tripartiteMallEntities.add(tripartiteMallEntity); } - }); - basicdataStoreBrandService.saveBatch(list); + + } + } + + //品牌 + if (!storeBrandEntities.isEmpty()) { + basicdataStoreBrandService.saveBatch(storeBrandEntities); } //服务类型 - if(!storeBusinessEntities.isEmpty()){ + if (!storeBusinessEntities.isEmpty()) { List list = new ArrayList<>(); - storeBusinessEntities.stream().forEach(i ->{ -// List dictBizs = DictBizCache.getList(DictBizConstant.DISTRIBUTION_TYPE); - if(i.getTypeService().contains(",")){ + storeBusinessEntities.stream().forEach(i -> { + if (i.getTypeService().contains(",")) { String[] split = i.getTypeService().split(","); for (int j = 0; j < split.length; j++) { BasicdataStoreBusinessEntity business = new BasicdataStoreBusinessEntity(); - BeanUtil.copyProperties(i,business); + BeanUtil.copyProperties(i, business); int finalJ = j; - if(split[j].equals("配送")){ - switch ( business.getMold()){ + if (split[j].equals("配送")) { + switch (business.getMold()) { case "商配": business.setMold("1"); break; @@ -462,20 +476,20 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>:{}",split[finalJ]); + log.info("#################split[finalJ]>>>>>>>>>>>>>>:{}", split[finalJ]); String dictValue = freightBiz.stream().filter(q -> q.getDictValue().equals(split[finalJ])).findFirst().get().getDictKey(); business.setTypeService(dictValue); list.add(business); } - }else{ + } else { String dictValue = freightBiz.stream().filter(q -> q.getDictValue().equals(i.getTypeService())).findFirst().get().getDictKey(); i.setTypeService(dictValue); - if(i.getTypeService().equals("配送")){ + if (i.getTypeService().equals("配送")) { String mold = i.getMold(); - switch (mold){ + switch (mold) { case "商配": i.setMold("1"); break; @@ -490,7 +504,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl servicesEntityList = new ArrayList<>(); - storageServicesEntities.stream().forEach(i ->{ - if(ObjectUtils.isNotNull(i.getSendWarehouseName())){ - if( i.getSendWarehouseName().contains(",")){ + storageServicesEntities.forEach(i -> { + if (ObjectUtils.isNotNull(i.getSendWarehouseName())) { + if (i.getSendWarehouseName().contains(",")) { String[] split = i.getSendWarehouseName().split(","); for (int j = 0; j < split.length; j++) { BasicdataStorageServicesEntity servicesEntity = new BasicdataStorageServicesEntity(); Long id = list1.stream().filter(q -> q.getName().equals(i.getSendWarehouseName())).findFirst().get().getId(); - BeanUtil.copyProperties(i,servicesEntity); + BeanUtil.copyProperties(i, servicesEntity); servicesEntity.setSendWarehouseId(id.toString()); servicesEntity.setSendWarehouseName(split[j]); servicesEntityList.add(servicesEntity); } - }else{ - Long id = list1.stream().filter(q -> q.getName().equals(i.getSendWarehouseName()) ).findFirst().get().getId(); + } else { + Long id = list1.stream().filter(q -> q.getName().equals(i.getSendWarehouseName())).findFirst().get().getId(); i.setSendWarehouseId(id.toString()); servicesEntityList.add(i); } - }else{ + } else { BasicdataStorageServicesEntity servicesEntity = new BasicdataStorageServicesEntity(); - BeanUtil.copyProperties(i,servicesEntity); + BeanUtil.copyProperties(i, servicesEntity); servicesEntityList.add(servicesEntity); } @@ -528,19 +542,49 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl basicdataBrandEntityList, String brandName) { + + for (BasicdataBrandEntity basicdataBrandEntity : basicdataBrandEntityList) { + if (basicdataBrandEntity.getBrandName().equals(brandName.trim())) { + return basicdataBrandEntity; + } + } + + return null; + + + } + + private String matchDictValue(List list, String defaultPaymentMethods) { + + for (DictBiz dictBiz : list) { + if (defaultPaymentMethods.equals(dictBiz.getDictValue())) { + return dictBiz.getDictKey(); + } + } + return null; + } + @Override - public List findListByClientName(String clientName,String linkMan,String linkPhone) { + public List findListByClientName(String clientName, String linkMan, String linkPhone) { - List ls = baseMapper.findListByClientName(clientName,linkMan,linkPhone); + List ls = baseMapper.findListByClientName(clientName, linkMan, linkPhone); List list = new ArrayList<>(); for (ClientInfoVO clientInfoVO : ls) { list.add(JSONObject.parseObject(JSONObject.toJSONString(clientInfoVO))); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java index ce3473c66..d339abe7a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java @@ -118,4 +118,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper findSignListOrderPackageCodes(@Param("loadId") Long loadId); List findSignListOrderPackageCodesByIds(@Param("list") List loadScanIds); + + List findAllIdListByLoadId(@Param("loadId") Long loadId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index df20e87ea..b3f82c6d3 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -537,4 +537,12 @@ + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml index d6292068d..3cb683a2b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml @@ -18,7 +18,8 @@