diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java index a6a0477..19d4b94 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java @@ -32,6 +32,7 @@ import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.thread.BasicBackUpdateProductService; import com.glxp.sale.admin.util.BeanUtils; import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.admin.util.DateUtil; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import org.apache.ibatis.session.ExecutorType; @@ -164,6 +165,7 @@ public class SpsSyncUploadController { UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class); for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) { basicUnitMaintainEntity.setUpdateTime(null); + basicUnitMaintainEntity.setModifyTime(DateUtil.getDateTime()); mapper.insertUdiRelevance(basicUnitMaintainEntity); } batchSession.commit(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java index f49eb78..a74f90b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java @@ -150,7 +150,9 @@ public class UdiContrastController { } udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); // udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); - udiRelevanceEntity.setUpdateTime(DateUtil.formatDateTime(new Date())); + String time = DateUtil.formatDateTime(new Date()); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); return ResultVOUtils.success("切换成功！"); } @@ -163,7 +165,9 @@ public class UdiContrastController { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId()); udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setManufactory(combineRequest.getManufactory()); udiRelevanceEntity.setSupName(combineRequest.getSupName()); udiRelevanceEntity.setPrice(combineRequest.getPrice()); @@ -269,7 +273,9 @@ public class UdiContrastController { udiRelevanceEntity.setThirdName(combineRequest.getErpName()); udiRelevanceEntity.setMainId(combineRequest.getThirdId()); udiRelevanceEntity.setMainName(combineRequest.getErpName()); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); if (combineRequest.getManufactory() != null) { udiRelevanceEntity.setManufactory(combineRequest.getManufactory()); @@ -285,7 +291,9 @@ public class UdiContrastController { public void createOnlyUuid(CombineRequest combineRequest, String key) { List udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc()); udiRelevanceEntity.setSupName(combineRequest.getSupName()); @@ -305,7 +313,9 @@ public class UdiContrastController { udiRelevanceEntity.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity.setMainId(thrProductsEntity.getCode()); udiRelevanceEntity.setMainName(thrProductsEntity.getName()); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setUuid(CustomUtil.getUUId()); udiRelevanceEntity.setManufactory(thrProductsEntity.getManufactory()); udiRelevanceEntity.setSupName(combineRequest.getSupName()); @@ -335,7 +345,9 @@ public class UdiContrastController { List udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key); udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid()); udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); insertUdiInfos(udiInfoEntities); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index 3f3f421..4bd579c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -25,12 +25,10 @@ import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.BasicProductThirdSysResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.service.auth.CustomerService; -import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService; import com.glxp.sale.admin.service.basic.BasicThirdSysService; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; -import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.CodesService; import com.glxp.sale.admin.service.inventory.InvPreProductService; import com.glxp.sale.admin.service.inventory.InvProductService; @@ -270,7 +268,9 @@ public class UdiRelevanceController { UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity); udiRelevanceEntity.setId(udiRelevanceResponse.getId() + ""); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); long customerId = customerService.getCustomerId(); if (customerId != 110) { @@ -458,7 +458,9 @@ public class UdiRelevanceController { udiRelevanceEntity.setUuid(postSmpUdiInfoRequest.getUuid()); } - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); udiInfoEntity.setYbbm(postSmpUdiInfoRequest.getYbbm()); udiInfoEntity.setSptm(postSmpUdiInfoRequest.getSptm()); @@ -657,7 +659,9 @@ public class UdiRelevanceController { udiInfoEntity.setDiType(1); udiInfoService.insertUdiInfo(udiInfoEntity); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); return ResultVOUtils.success("解除绑定成功！"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java index 70ad07a..2dcc6f4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java @@ -196,7 +196,9 @@ public class InoutUtils { udiInfoEntity = udiInfoService.findByNameCode(prefix); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setThirdId(udiInfoEntity.getThirdId()); udiRelevanceEntity.setThirdName(udiInfoEntity.getThirdName()); udiRelevanceEntity.setId(CustomUtil.getId() + ""); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java index 1a475ba..5651ee7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java @@ -33,6 +33,7 @@ public class UdiRelevanceEntity { private String supName; private String originUuid; private String price; + private String modifyTime; //修改时间 public Integer getLockStatus() { if (lockStatus == null) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index 528f60f..2ca8f14 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java @@ -134,7 +134,9 @@ public class BasicBackUpdateProductService { udiRelevanceEntity1.setManufactory(invmandocResponse.getManufactory()); udiRelevanceEntity1.setThirdId(invmandocResponse.getCode()); udiRelevanceEntity1.setThirdName(invmandocResponse.getName()); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity1.setUpdateTime(time); + udiRelevanceEntity1.setModifyTime(time); udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); } @@ -238,7 +240,9 @@ public class BasicBackUpdateProductService { udiRelevanceEntity1.setManufactory(thrProductsEntity.getManufactory()); udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity1.setUpdateTime(time); + udiRelevanceEntity1.setModifyTime(time); udiRelevanceEntity1.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java index e85fc4d..b2c9680 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java @@ -19,7 +19,6 @@ import com.glxp.sale.admin.util.GennerOrderUtils; import com.glxp.sale.admin.util.HttpClient; import com.glxp.sale.common.res.BaseResponse; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -147,7 +146,9 @@ public class BasicUdiInfoImportService { temp = new UdiRelevanceEntity(); temp.setUuid(udiInfoEntity.getUuid()); udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_SUCESS); - temp.setUpdateTime(DateUtil.formatDateTime(new Date())); + String time = DateUtil.formatDateTime(new Date()); + temp.setUpdateTime(time); + temp.setModifyTime(time); udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(temp); } else { @@ -202,7 +203,9 @@ public class BasicUdiInfoImportService { } public void updateValue(UdiRelevanceEntity udiRelevanceEntity, UdiInfoImportDetailEntity udiInfoImportDetailEntity, UdiInfoImportLogEntity udiInfoImportLogEntity, String mainId) { - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); if (udiInfoImportDetailEntity.getYbbm() != null && !udiInfoImportDetailEntity.getYbbm().trim().equals("")) { udiRelevanceEntity.setYbbm(udiInfoImportDetailEntity.getYbbm()); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java index c115e27..29c68b5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java @@ -11,7 +11,6 @@ import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.httpclient.ErpBasicClient; import com.glxp.sale.admin.req.basic.CombineRequest; -import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; @@ -97,7 +96,9 @@ public class BasicUpdateProductService { } udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity1.setUpdateTime(time); + udiRelevanceEntity1.setModifyTime(time); udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName()); udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice()); udiRelevanceEntity1.setManufactory(udiInfoEntity.getManufactory()); @@ -170,7 +171,9 @@ public class BasicUpdateProductService { } udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity1.setUpdateTime(time); + udiRelevanceEntity1.setModifyTime(time); udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice()); udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName()); udiRelevanceEntity1.setManufactory(udiInfoEntity.getManufactory()); @@ -228,7 +231,9 @@ public class BasicUpdateProductService { udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); udiRelevanceEntity.setManufactory(udiInfoEntity.getManufactory()); List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiInfoEntity.getUuid()); diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 9d35150..e41106e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -86,7 +86,7 @@ AND nameCode = #{uniqueNameCode} - ORDER BY updateTime DESC + ORDER BY modifyTime DESC @@ -295,7 +295,7 @@ - ORDER BY updateTime DESC + ORDER BY modifyTime DESC