DI产品信息切换版本问题,首营资质相关bug问题解决

zhairh
anthonywj 3 years ago
parent b933e0e7e7
commit 90b5b2363d

@ -93,6 +93,9 @@ public class SpsSyncDownloadController {
if (CollUtil.isNotEmpty(baseResponse.getData().getSupCertEntities()))
logs = logs + "其他资质证书:" + baseResponse.getData().getSupCertEntities().size() + "条\n";
if (CollUtil.isNotEmpty(baseResponse.getData().getSupCertSetEntities()))
logs = logs + "证书设置:" + baseResponse.getData().getSupCertSetEntities().size() + "条\n";
basicExportStatusEntity.setRemark(logs);
basicExportService.updateExportStatus(basicExportStatusEntity);

@ -14,10 +14,7 @@ import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.entity.param.SyncDataBustypeEntity;
import com.glxp.sale.admin.entity.purchase.SupCertEntity;
import com.glxp.sale.admin.entity.purchase.SupCompanyEntity;
import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity;
import com.glxp.sale.admin.entity.purchase.SupProductEntity;
import com.glxp.sale.admin.entity.purchase.*;
import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
import com.glxp.sale.admin.entity.thrsys.*;
import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
@ -27,15 +24,14 @@ import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest;
import com.glxp.sale.admin.req.inout.OrderFilterRequest;
import com.glxp.sale.admin.req.inventory.FilterInvUserRequest;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest;
import com.glxp.sale.admin.req.purchase.FilterPoductRequest;
import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest;
import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest;
import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.sale.admin.req.thrsys.*;
import com.glxp.sale.admin.res.basic.SpSyncUdiResponse;
import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse;
import com.glxp.sale.admin.res.basic.*;
import com.glxp.sale.admin.res.inout.WarehouseResponse;
import com.glxp.sale.admin.res.param.SyncDataSetResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.auth.DeptService;
@ -46,10 +42,7 @@ import com.glxp.sale.admin.service.inventory.InvBusUserService;
import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import com.glxp.sale.admin.service.param.SyncDataSetService;
import com.glxp.sale.admin.service.purchase.SupCertService;
import com.glxp.sale.admin.service.purchase.SupCompanyService;
import com.glxp.sale.admin.service.purchase.SupManufacturerService;
import com.glxp.sale.admin.service.purchase.SupProductService;
import com.glxp.sale.admin.service.purchase.*;
import com.glxp.sale.admin.service.receipt.ProductInfoService;
import com.glxp.sale.admin.service.thrsys.*;
import com.glxp.sale.admin.util.BeanUtils;
@ -118,6 +111,8 @@ public class SpsSyncDownloadService {
@Resource
SupProductService supProductService;
@Resource
SupCertSetService supCertSetService;
@Resource
SupCertService supCertService;
@Resource
private BasicExportTimeService basicExportTimeService;
@ -348,6 +343,20 @@ public class SpsSyncDownloadService {
}
syncDataResponse.setSupCertEntities(supCertEntityList);
//企业证书设置
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
BeanUtils.copyProperties(spsSyncDataRequest, filterCertSetsRequest);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
if (CollUtil.isNotEmpty(supCertSetEntities)) {
List<SupCertSetEntity> temps = supCertSetService.filterCertSets(new FilterCertSetsRequest());
List<SupCertSetResponse> supCertSetResponses = temps.stream().map(item ->
{
SupCertSetResponse supCertSetResponse = new SupCertSetResponse();
BeanUtils.copyProperties(item, supCertSetResponse);
return supCertSetResponse;
}).collect(Collectors.toList());
syncDataResponse.setSupCertSetEntities(supCertSetResponses);
}
return ResultVOUtils.success(syncDataResponse);
}
@ -616,6 +625,7 @@ public class SpsSyncDownloadService {
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupCompanyEntities())
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupManufacturerEntities())
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupProductEntities())
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupCertSetEntities())
) {
BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_BASIC_DATA);
basicExportTimeService.updateExportStatus(basicExportStatusTimeEntity);

@ -197,6 +197,7 @@ public class SpsSyncExportStatusController {
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupCompanyEntities())
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupManufacturerEntities())
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupProductEntities())
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupCertSetEntities())
) {
BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_BASIC_DATA);
if (basicExportStatusTimeEntity != null) {

@ -21,11 +21,14 @@ import com.glxp.sale.admin.entity.inout.WarehouseUserEntity;
import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.entity.purchase.*;
import com.glxp.sale.admin.entity.thrsys.*;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest;
import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse;
import com.glxp.sale.admin.res.basic.SupCertSetResponse;
import com.glxp.sale.admin.service.basic.BasicDownloadService;
import com.glxp.sale.admin.service.basic.BussinessChangeTypeService;
import com.glxp.sale.admin.service.basic.EntrustReceService;
@ -34,6 +37,7 @@ import com.glxp.sale.admin.service.inventory.InvBusUserService;
import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.purchase.*;
import com.glxp.sale.admin.service.thrsys.ThrSubInvWarehouseService;
import com.glxp.sale.admin.thread.BasicBackUpdateProductService;
import com.glxp.sale.admin.util.BeanUtils;
@ -84,6 +88,17 @@ public class SpsSyncUploadController {
@Resource
InvBusUserService invBusUserService;
@Resource
SupCompanyService supCompanyService;
@Resource
SupManufacturerService supManufacturerService;
@Resource
SupProductService supProductService;
@Resource
SupCertService supCertService;
@Resource
SupCertSetService supCertSetService;
@PostMapping("sps/sync/basic/upload")
public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) {
@ -215,8 +230,8 @@ public class SpsSyncUploadController {
List<UdiInfoEntity> udiInfoEntities = syncDataResponse.getUdiInfoEntities();
UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest);
UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
mapper.insertUdiInfo(udiInfoRequest);
}
batchSession.commit();
@ -276,22 +291,6 @@ public class SpsSyncUploadController {
e.printStackTrace();
}
}
//
// //仓库用户表
// if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) {
// for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) {
// warehouseUserDao.insertOrUpdate(warehouseUserEntity);
// }
// remark.append("仓库用户:").append(syncDataResponse.getWarehouseUserEntities().size()).append("条\n");
// }
//
// //仓库单据类型表
// if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) {
// for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) {
// warehouseBussinessTypeDao.insertOrUpdate(warehouseUserEntity);
// }
// remark.append("仓库单据:").append(syncDataResponse.getWarehouseBussinessTypeEntities().size()).append("条\n");
// }
//第三方产品信息导入
@ -371,9 +370,58 @@ public class SpsSyncUploadController {
}
}
// batchSession.clearCache();
batchSession.close();
//配送企业首营资质
if (CollUtil.isNotEmpty(syncDataResponse.getSupCompanyEntities())) {
for (SupCompanyEntity supCompanyEntity : syncDataResponse.getSupCompanyEntities()) {
supCertService.deleteByCustomerId(supCompanyEntity.getCustomerId());
supCompanyEntity.setUpdateTime(null);
supCompanyService.insertCompany(supCompanyEntity);
}
remark.append("配送企业证书:").append(syncDataResponse.getSupCompanyEntities().size()).append("条\n");
}
//生产企业首营资质
if (CollUtil.isNotEmpty(syncDataResponse.getSupManufacturerEntities())) {
for (SupManufacturerEntity supManufacturerEntity : syncDataResponse.getSupManufacturerEntities()) {
supCertService.delManufacturerId(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
supManufacturerEntity.setUpdateTime(null);
supManufacturerService.insertCompany(supManufacturerEntity);
}
remark.append("生产企业证书:").append(syncDataResponse.getSupManufacturerEntities().size()).append("条\n");
}
//配送企业首营资质
if (CollUtil.isNotEmpty(syncDataResponse.getSupProductEntities())) {
for (SupProductEntity supProductEntity : syncDataResponse.getSupProductEntities()) {
supCertService.delProductId(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
supProductEntity.setUpdateTime(null);
supProductService.insertRegistration(supProductEntity);
}
remark.append("产品资质证书:").append(syncDataResponse.getSupProductEntities().size()).append("条\n");
}
//所有证书提交
if (CollUtil.isNotEmpty(syncDataResponse.getSupCertEntities())) {
for (SupCertEntity supCertEntity : syncDataResponse.getSupCertEntities()) {
supCertService.insertCompanyCert(supCertEntity);
}
remark.append("相关证书总数:").append(syncDataResponse.getSupCertEntities().size()).append("条\n");
}
//资质证书设置
if (CollUtil.isNotEmpty(syncDataResponse.getSupCertSetEntities())) {
List<SupCertSetEntity> backs = supCertSetService.filterCertSets(new FilterCertSetsRequest());
supCertSetService.deleteAll();
for (SupCertSetResponse supCertSetResponse : syncDataResponse.getSupCertSetEntities()) {
SupCertSetEntity supCertSetEntity = new SupCertSetEntity();
BeanUtils.copyProperties(supCertSetResponse, supCertSetEntity);
supCertSetService.insertCertSet(supCertSetEntity);
}
remark.append("证书设置:").append(syncDataResponse.getSupCertSetEntities().size()).append("条\n");
}
batchSession.close();
basicDownloadStatusEntity.setStatus(1);
basicDownloadStatusEntity.setUpdateTime(new Date());
basicDownloadStatusEntity.setEndTime(new Date());

@ -12,10 +12,7 @@ import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.CombineRequest;
import com.glxp.sale.admin.req.basic.RemoveRelRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.req.basic.*;
import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
@ -152,25 +149,26 @@ public class UdiContrastController {
}
List<UdiInfoEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(combineRequest.getKeys().get(0));
udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid());
// udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid());
for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
UdiInfoRequest udiInfoReqeust = new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoReqeust);
udiInfoService.updateUdiInfo(udiInfoReqeust);
}
udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
// udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
String time = DateUtil.formatDateTime(new Date());
udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time);
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
return ResultVOUtils.success("切换成功!");
}
//更换关联ERP产品
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/modifyRel")
@ -192,8 +190,8 @@ public class UdiContrastController {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
} else {
try {
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
} catch (Exception e) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
@ -246,8 +244,8 @@ public class UdiContrastController {
udiRelevanceEntity.setPrice("");
udiRelevanceEntity.setManufactory("");
udiRelevanceEntity.setMeasname("");
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
} catch (Exception e) {
e.printStackTrace();
@ -362,7 +360,7 @@ public class UdiContrastController {
udiInfoEntity.setScbssfbhsxrq("是");
udiInfoEntity.setScbssfbhxlh("否");
udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
udiInfoService.insertUdiInfo(udiInfoRequest);
}
@ -374,8 +372,8 @@ public class UdiContrastController {
String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time);
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
insertUdiInfos(udiInfoEntities);
}

@ -32,4 +32,6 @@ public interface SupCertDao {
@Param("oldManufacturerIdFk") String oldManufacturerIdFk, @Param("newManufacturerIdFk") String newManufacturerIdFk,
@Param("oldProductIdFk") String oldProductIdFk, @Param("newProductIdFk") String newProductIdFk);
boolean deleteCert(FilterSupCertRequest filterSupCertRequest);
}

@ -8,6 +8,7 @@ import java.util.List;
@Mapper
public interface SupCertSetDao {
List<SupCertSetEntity> filterCertSets(FilterCertSetsRequest filterCertSetsRequest);
boolean insertCertSet(SupCertSetEntity supCertSetEntity);
@ -16,4 +17,6 @@ public interface SupCertSetDao {
boolean updateCertSet(SupCertSetEntity supCertSetEntity);
boolean deleteById(String id);
boolean deleteAll();
}

@ -1,86 +0,0 @@
package com.glxp.sale.admin.req.basic;
import lombok.Data;
@Data
public class UdiInfoReqeust {
private Integer id;
private String nameCode;
private String packRatio;
private String packLevel;
private Integer bhxjsl;
private Integer bhzxxsbzsl;
private Integer zxxsbzbhsydysl;
private String bhxjcpbm;
private String sjcpbm; //
private String bzcj;
private String addType;
private String deviceRecordKey;
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 String uuid;
private Integer versionNumber;
private Integer diType;
private String thirdId;
private String thirdName;
private String ybbm;
private String sptm;
private String manufactory;
private String measname;
private Integer productType;
private String scbssfbhph;
private String scbssfbhxlh;
private String scbssfbhscrq;
private String scbssfbhsxrq;
private String cpms;
private String spmc;
private String originUuid;
//本地生成信息
private String batchNo;
private String produceDate;
private String expireDate;
private String serialNo;
private String udi;
private String code;
private Integer count;
private String warehouseCode;
private String udplatCode;
private String relId;//关联ID主键
private Integer status;
private String supId;
private Boolean isCheck;
private Boolean allowNoBatch;
private Boolean allowNoExpire;
private Boolean allowNoProduct;
private String price;
private String cplx;
private String hchzsb;
//产品代理商
private String cpdls;
private String basicPrductRemak1;
private String basicPrductRemak2;
private String basicPrductRemak3;
private String basicPrductRemak4;
private String basicPrductRemak5;
private String basicPrductRemak6;
private String basicPrductRemak7;
private String basicPrductRemak8;
}

@ -9,5 +9,6 @@ public class FilterCertSetsRequest extends ListPageRequest {
private String name;
private Integer type;
private Integer need;
private String lastUpdateTime;
}

@ -12,10 +12,7 @@ import com.glxp.sale.admin.entity.inout.WarehouseUserEntity;
import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.entity.purchase.SupCertEntity;
import com.glxp.sale.admin.entity.purchase.SupCompanyEntity;
import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity;
import com.glxp.sale.admin.entity.purchase.SupProductEntity;
import com.glxp.sale.admin.entity.purchase.*;
import com.glxp.sale.admin.entity.thrsys.*;
import lombok.Data;
@ -62,6 +59,7 @@ public class SpsSyncDataResponse {
List<SupManufacturerEntity> supManufacturerEntities;
List<SupProductEntity> supProductEntities;
List<SupCertEntity> supCertEntities;
List<SupCertSetResponse> supCertSetEntities;
}

@ -0,0 +1,27 @@
package com.glxp.sale.admin.res.basic;
import cn.hutool.core.util.StrUtil;
import lombok.Data;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@Data
public class SupCertSetResponse {
private Integer id;
private String name;
private boolean need;
private Integer foreign;
private String cplx;
private String hchzsb;
private String flbm;
private Integer imports;
private String remark;
private Date updateTime;
private Integer type;
private boolean isPass;
}

@ -31,4 +31,10 @@ public interface SupCertService {
boolean insertCompanyCert(SupCertEntity supCertEntity);
boolean deleteById(String id);
boolean deleteByCustomerId(String customerId);
boolean delManufacturerId(String customerId, String manufacturerId);
boolean delProductId(String customerId, String manufacturerId, String productId);
}

@ -16,4 +16,6 @@ public interface SupCertSetService {
boolean deleteById(String id);
boolean deleteAll();
}

@ -116,4 +116,38 @@ public class SupCertServiceImpl implements SupCertService {
public boolean deleteById(String id) {
return supCertDao.deleteById(id);
}
@Override
public boolean deleteByCustomerId(String customerId) {
if (StrUtil.isNotEmpty(customerId)) {
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(customerId);
return supCertDao.deleteCert(filterSupCertRequest);
}
return false;
}
@Override
public boolean delManufacturerId(String customerId, String manufacturerId) {
if (StrUtil.isNotEmpty(customerId) && StrUtil.isNotEmpty(manufacturerId)) {
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(customerId);
filterSupCertRequest.setManufacturerIdFk(manufacturerId);
return supCertDao.deleteCert(filterSupCertRequest);
}
return false;
}
@Override
public boolean delProductId(String customerId, String manufacturerId, String productId) {
if (StrUtil.isNotEmpty(customerId) && StrUtil.isNotEmpty(manufacturerId) && StrUtil.isNotEmpty(productId)) {
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(customerId);
filterSupCertRequest.setManufacturerIdFk(manufacturerId);
filterSupCertRequest.setProductIdFk(productId);
return supCertDao.deleteCert(filterSupCertRequest);
}
return false;
}
}

@ -45,4 +45,9 @@ public class SupCertSetServiceImpl implements SupCertSetService {
public boolean deleteById(String id) {
return supCertSetDao.deleteById(id);
}
@Override
public boolean deleteAll() {
return supCertSetDao.deleteAll();
}
}

@ -331,6 +331,7 @@ public class BasicBackUpdateProductService {
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupCompanyEntities())
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupManufacturerEntities())
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupProductEntities())
|| CollUtil.isNotEmpty(spsSyncDataResponse.getSupCertSetEntities())
) {
BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity();
basicExportStatusEntity.setId(CustomUtil.getId());

@ -1,7 +1,7 @@
# \u751F\u4EA7\u73AF\u5883
server.port=9906
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
spring.datasource.hikari.connection-timeout=60000

@ -132,4 +132,22 @@
WHERE id = #{id}
</delete>
<delete id="deleteCert" parameterType="com.glxp.sale.admin.req.purchase.FilterSupCertRequest">
DELETE
FROM sup_cert
<where>
<if test="customerId != '' and customerId!=null">
and customerId = #{customerId}
</if>
<if test="manufacturerIdFk != '' and manufacturerIdFk!=null">
and manufacturerIdFk = #{manufacturerIdFk}
</if>
<if test="productIdFk != '' and productIdFk!=null">
and productIdFk = #{productIdFk}
</if>
</where>
</delete>
</mapper>

@ -16,6 +16,9 @@
<if test="need!=null">
and `need` = #{need}
</if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
</if>
</where>
ORDER BY id DESC
</select>
@ -47,7 +50,7 @@
<insert id="insertCertSet" parameterType="com.glxp.sale.admin.entity.purchase.SupCertSetEntity">
INSERT INTO sup_cert_set(`name`, `need`, `foreign`, remark, cplx, updateTime, hchzsb, flbm, imports,`type`)
INSERT INTO sup_cert_set(`name`, `need`, `foreign`, remark, cplx, updateTime, hchzsb, flbm, imports, `type`)
values (#{name},
#{need},
#{foreign},
@ -56,8 +59,11 @@
#{updateTime},
#{hchzsb},
#{flbm},
#{imports},#{type})
#{imports}, #{type})
</insert>
<delete id="deleteAll">
DELETE
FROM sup_cert_set
</delete>
</mapper>

@ -153,7 +153,7 @@
</update>
<insert id="insertCompany" parameterType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
INSERT INTO company(companyName, bussinessStatus, creditNum, classes, area,
replace INTO company(companyName, bussinessStatus, creditNum, classes, area,
detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode,
auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment,
editStatus)

@ -102,7 +102,7 @@
</update>
<insert id="insertCompany" parameterType="com.glxp.sale.admin.entity.purchase.SupManufacturerEntity">
INSERT INTO sup_manufacturer(companyName, creditCode, companyType,
replace INTO sup_manufacturer(companyName, creditCode, companyType,
placeArea, placeAreaCode, placeAddress,
legalPersonName, legalPersonPapersType, legalPersonPapersCode,
productionArea, productionAreaCode, productionAddress,

@ -171,7 +171,7 @@
<insert id="insertRegistration" parameterType="com.glxp.sale.admin.entity.purchase.SupProductEntity"
useGeneratedKeys="true">
INSERT INTO sup_product(enterpriseId, recordCode, recordProductName,
replace INTO sup_product(enterpriseId, recordCode, recordProductName,
productManageType, recordPeopleName, recordPeopleArea,
recordPeopleAreaCode, recordPeopleAddress, productType,
productDirectoryCode, agentName, agentArea,

Loading…
Cancel
Save