From 86f75eb779f004fb32a5c7d9ca6cebad09821407 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 23 May 2022 09:26:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98bug=EF=BC=8C=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=96=B0=E5=A2=9E=E4=BB=B7=E6=A0=BC=EF=BC=8C=E9=A2=84?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E6=96=B0=E5=A2=9E=E6=B8=85=E7=A9=BA=EF=BC=8C?= =?UTF-8?q?udi=E5=85=B3=E8=81=94=E4=B8=BB=E9=94=AE=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E6=88=90=E5=94=AF=E4=B8=80=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiContrastController.java | 6 + .../basic/UdiRelevanceController.java | 3 + .../controller/inout/utils/InoutUtils.java | 2 + .../inventory/InvPreInProductsController.java | 12 ++ .../dao/inventory/InvPreInProductDao.java | 2 + .../inventory/InvPreInProductDetailDao.java | 2 + .../entity/inventory/InvProductEntity.java | 1 + .../inventory/InvPreInProductService.java | 3 + .../impl/InvPreInProductServiceImpl.java | 6 + .../thread/BasicBackUpdateProductService.java | 4 + .../thread/BasicUdiInfoImportService.java | 8 +- .../thread/BasicUpdateProductService.java | 77 +------- .../admin/thread/InvProductsTrService.java | 13 ++ .../admin/thread/UpdateproductService.java | 181 ------------------ .../sale/admin/util/GennerOrderUtils.java | 9 + .../mapper/inventory/InvPreInProductDao.xml | 12 +- .../inventory/InvPreInProductDetailDao.xml | 7 + .../mapper/inventory/InvPreProductDao.xml | 7 +- .../mapper/inventory/InvProductDao.xml | 8 +- 19 files changed, 102 insertions(+), 261 deletions(-) delete mode 100644 api-admin/src/main/java/com/glxp/sale/admin/thread/UpdateproductService.java 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 f4f023c..f503315 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 @@ -29,6 +29,7 @@ import com.glxp.sale.admin.service.thrsys.ThrProductsService; import com.glxp.sale.admin.thread.UdiDlHttpClient; import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.DateUtil; +import com.glxp.sale.admin.util.GennerOrderUtils; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; @@ -64,6 +65,8 @@ public class UdiContrastController { CompanyService companyService; @Resource private CompanyProductRelevanceService companyProductRelevanceService; + @Resource + GennerOrderUtils gennerOrderUtils; //添加产品 @@ -268,6 +271,7 @@ public class UdiContrastController { } else udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc()); udiRelevanceEntity.setSupName(combineRequest.getSupName()); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); insertUdiInfos(udiInfoEntities); } @@ -279,6 +283,7 @@ public class UdiContrastController { udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc()); udiRelevanceEntity.setSupName(combineRequest.getSupName()); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); insertUdiInfos(udiInfoEntities); } @@ -297,6 +302,7 @@ public class UdiContrastController { udiRelevanceEntity.setUuid(CustomUtil.getUUId()); udiRelevanceEntity.setManufactory(thrProductsEntity.getManufactory()); udiRelevanceEntity.setSupName(combineRequest.getSupName()); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity); 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 4b26a3d..f260332 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 @@ -81,6 +81,8 @@ public class UdiRelevanceController { private CompanyProductRelevanceService companyProductRelevanceService; @Resource CustomerService customerService; + @Resource + GennerOrderUtils gennerOrderUtils; @AuthRuleAnnotation("") @GetMapping("/udi/udirel/download") @@ -457,6 +459,7 @@ public class UdiRelevanceController { BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoEntity); udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); udiInfoService.insertUdiInfo(udiInfoEntity); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } } 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 e36cd93..9c0c6ef 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 @@ -22,6 +22,7 @@ import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.inout.CodesService; import com.glxp.sale.admin.service.inout.OrderDetailService; import com.glxp.sale.admin.thread.UdiDlHttpClient; +import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.DateUtil; import com.glxp.sale.admin.util.FilterUdiUtils; import org.springframework.beans.BeanUtils; @@ -197,6 +198,7 @@ public class InoutUtils { udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); udiRelevanceEntity.setThirdId(udiInfoEntity.getThirdId()); udiRelevanceEntity.setThirdName(udiInfoEntity.getThirdName()); + udiRelevanceEntity.setId(CustomUtil.getId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiInfoEntity.getUuid()); udiInfoEntity.setRelId(udiRelevanceEntities.get(0).getId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java index 980d794..8ad6b50 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java @@ -150,6 +150,18 @@ public class InvPreInProductsController { } } + @AuthRuleAnnotation("") + @PostMapping("spms/prein/inv/products/clearAll") + public BaseResponse clearAllInvProduct(@RequestBody DeleteRequest deleteRequest) { + + boolean b = invProductService.deleteAll(); + if (b) { + return ResultVOUtils.success("删除成功"); + } else { + return ResultVOUtils.error(500, "删除失败！"); + } + } + @AuthRuleAnnotation("") @GetMapping("spms/prein/inv/products/stat") public BaseResponse statInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDao.java index 509c22a..b512a79 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDao.java @@ -28,4 +28,6 @@ public interface InvPreInProductDao { InvProductEntity selectExit(@Param("relIdFk") String id); boolean deleteById(@Param("id") String id); + + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDetailDao.java index 0caad08..4f0f0ef 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDetailDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDetailDao.java @@ -28,4 +28,6 @@ public interface InvPreInProductDetailDao { int statCount(FilterInvProductDetailRequest filterInvProductDetailRequest); List findAllCode(FilterInvProductDetailRequest filterInvProductDetailRequest); + + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java index 857a28e..b1a7958 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java @@ -22,6 +22,7 @@ public class InvProductEntity { private String unitFk; private String invStorageCode; private String invWarehouseCode; + private String price; public Integer getInCount() { if (inCount == null) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductService.java index 8a9fd0b..5696151 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductService.java @@ -23,4 +23,7 @@ public interface InvPreInProductService { boolean updateInvProduct(InvProductEntity invProductEntity); boolean deleteById(String id); + + boolean deleteAll(); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java index 542274d..cdcb9bc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java @@ -73,4 +73,10 @@ public class InvPreInProductServiceImpl implements InvPreInProductService { return invPreInProductDao.deleteById(id); } + @Override + public boolean deleteAll() { + return invPreInProductDao.deleteAll(); + } + + } 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 015462c..3cbd0bc 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 @@ -18,6 +18,7 @@ import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.thrsys.ThrProductsService; import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.DateUtil; +import com.glxp.sale.admin.util.GennerOrderUtils; import com.glxp.sale.admin.util.RedisUtil; import com.glxp.sale.common.res.BaseResponse; import org.springframework.beans.BeanUtils; @@ -47,6 +48,8 @@ public class BasicBackUpdateProductService { BasicExportTimeService basicExportTimeService; @Resource RedisUtil redisUtil; + @Resource + GennerOrderUtils gennerOrderUtils; //定时或一键下载更新全部线上产品信息 @Async @@ -136,6 +139,7 @@ public class BasicBackUpdateProductService { udiRelevanceEntity1.setThirdId(invmandocResponse.getCode()); udiRelevanceEntity1.setThirdName(invmandocResponse.getName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(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 379427d..e85fc4d 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 @@ -15,6 +15,7 @@ import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.thrsys.ThrDataService; import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.DateUtil; +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; @@ -48,7 +49,7 @@ public class BasicUdiInfoImportService { @Resource UdiDlHttpClient udiDlHttpClient; @Resource - HttpClient httpClient; + GennerOrderUtils gennerOrderUtils; //导入产品信息文件，生成产品信息，更新或插入对照表 @Async @@ -124,6 +125,7 @@ public class BasicUdiInfoImportService { udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); updateValue(udiRelevanceEntity, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } else { udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL); @@ -139,12 +141,14 @@ public class BasicUdiInfoImportService { udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); updateValue(udiRelevanceEntity, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } else if (temp == null) { temp = new UdiRelevanceEntity(); temp.setUuid(udiInfoEntity.getUuid()); udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_SUCESS); temp.setUpdateTime(DateUtil.formatDateTime(new Date())); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(temp); } else { udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL); @@ -169,11 +173,13 @@ public class BasicUdiInfoImportService { udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); updateValue(udiRelevanceEntity, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } else { udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); updateValue(udiRelevanceEntity, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } 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 8f01ac7..a5405b7 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 @@ -22,10 +22,7 @@ import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.thrsys.ThrProductsService; -import com.glxp.sale.admin.util.CustomUtil; -import com.glxp.sale.admin.util.DateUtil; -import com.glxp.sale.admin.util.FilterUdiUtils; -import com.glxp.sale.admin.util.HttpClient; +import com.glxp.sale.admin.util.*; import com.glxp.sale.common.res.BaseResponse; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; @@ -60,71 +57,9 @@ public class BasicUpdateProductService { private CompanyProductsRelService companyProductsRelService; @Resource HttpClient httpClient; + @Resource + GennerOrderUtils gennerOrderUtils; - public String addProduct(CombineRequest combineRequest, String url) { - String errMsg = null; - List inventoryCodes = new ArrayList<>(); - if (combineRequest.getThirdIds() == null) - inventoryCodes.add(combineRequest.getThirdId()); - else { - inventoryCodes = combineRequest.getThirdIds(); - } - if (inventoryCodes.size() > 0) { - for (String inventoryCode : inventoryCodes) { - UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); - udiRelevanceEntity1.setThirdId(inventoryCode); - FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); - filterErpGoodsRequest.setCode(inventoryCode); - filterErpGoodsRequest.setPage(1); - filterErpGoodsRequest.setLimit(1); - filterErpGoodsRequest.setThirdSys(combineRequest.getThirdSys()); - BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, url); - List erpProductsResponses = erpProducts.getData().getList(); - if (erpProductsResponses != null & erpProductsResponses.size() > 0) { - { - ErpProductsResponse erpProductsResponse = erpProductsResponses.get(0); - UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - BeanUtils.copyProperties(erpProductsResponse, udiInfoEntity); - udiInfoEntity.setNameCode(erpProductsResponse.getCode()); - udiInfoEntity.setCpmctymc(erpProductsResponse.getName()); - udiInfoEntity.setManufactory(erpProductsResponse.getManufactory()); - udiInfoEntity.setYlqxzcrbarmc(erpProductsResponse.getManufactory()); - udiInfoEntity.setGgxh(erpProductsResponse.getSpec()); - udiInfoEntity.setZczbhhzbapzbh(erpProductsResponse.getRegisterNo()); - udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); - udiInfoEntity.setDiType(1); - udiInfoService.insertUdiInfo(udiInfoEntity); - - BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); - String mainSys = basicThirdSysEntity.getThirdId(); - if (mainSys.equals("thirdId")) { - udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId()); - udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName()); - } else if (mainSys.equals("thirdId1")) { - udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1()); - udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName1()); - } else if (mainSys.equals("thirdId2")) { - udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2()); - udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName2()); - } else if (mainSys.equals("thirdId3")) { - udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3()); - udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName3()); - } else if (mainSys.equals("thirdId4")) { - udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); - udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4()); - } - - udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); - udiRelevanceEntity1.setThirdName(erpProductsResponse.getName()); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); - } - } - } - } - return errMsg; - } public String addLocalProduct(CombineRequest combineRequest) { String errMsg = ""; @@ -306,10 +241,12 @@ public class BasicUpdateProductService { isAdd = true; } } - if (isAdd) + if (isAdd) { + udiRelevanceEntity.setId(gennerOrderUtils.getRelId()+""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); - + } } else { + udiRelevanceEntity.setId(gennerOrderUtils.getRelId()+""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index 4ba296a..b6d7840 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -112,6 +112,9 @@ public class InvProductsTrService { } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count); } + if (erpOrderEntity.getPrice() != null) { + invPreProductEntity.setPrice(erpOrderEntity.getPrice() + ""); + } invPreInProductService.updateInvProduct(invPreProductEntity); } } else if (bussinessTypeEntity.isAdvanceType()) {//预入库，则转存预入库 @@ -129,6 +132,9 @@ public class InvProductsTrService { } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count); } + if (erpOrderEntity.getPrice() != null) { + invPreProductEntity.setPrice(erpOrderEntity.getPrice() + ""); + } invPreProductService.updateInvProduct(invPreProductEntity); } } else { //普通出入库 @@ -146,6 +152,9 @@ public class InvProductsTrService { } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { invProductEntity.setInCount(invProductEntity.getInCount() + count); } + if (erpOrderEntity.getPrice() != null) { + invProductEntity.setPrice(erpOrderEntity.getPrice() + ""); + } invProductService.updateInvProduct(invProductEntity); } @@ -157,6 +166,9 @@ public class InvProductsTrService { if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { preInvEntity.setOutCount(preInvEntity.getOutCount() + count); } + if (erpOrderEntity.getPrice() != null) { + preInvEntity.setPrice(erpOrderEntity.getPrice() + ""); + } invPreInProductService.updateInvProduct(preInvEntity); } @@ -802,6 +814,7 @@ public class InvProductsTrService { invProductEntity.setGgxh(erpOrderEntity.getPackSpec()); invProductEntity.setSupId(warehouseEntity.getSupId()); invProductEntity.setNameCode(erpOrderEntity.getNameCode()); + invProductEntity.setPrice(erpOrderEntity.getPrice()+""); invProductEntity.setProductsName(erpOrderEntity.getCoName()); invProductEntity.setYlqxzcrbarmc(erpOrderEntity.getProductCompany()); invProductEntity.setZczbhhzbapzbh(erpOrderEntity.getAuthCode()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/UpdateproductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/UpdateproductService.java deleted file mode 100644 index 3d65c71..0000000 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/UpdateproductService.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.glxp.sale.admin.thread; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.glxp.sale.admin.dao.basic.InvmandocResponse; -import com.glxp.sale.admin.entity.basic.UdiInfoEntity; -import com.glxp.sale.admin.entity.basic.BasicInstrumentMaintainRelevanceEntity; -import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.sale.admin.res.PageSimpleResponse; -import com.glxp.sale.admin.res.basic.UOnhandQueryResponse; -import com.glxp.sale.admin.service.basic.UdiInfoService; -import com.glxp.sale.admin.service.basic.UdiRelevanceService; -import com.glxp.sale.admin.util.CustomUtil; -import com.glxp.sale.admin.util.DateUtil; -import com.glxp.sale.admin.util.HttpClient; -import com.glxp.sale.common.res.BaseResponse; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -public class UpdateproductService { - @Value("${UCLOD_SERVER_URL}") - private String ucloudUrl; - @Resource - UdiRelevanceService udiRelevanceService; - @Resource - UdiInfoService udiInfoService; - @Resource - HttpClient httpClient; - - @Async - public void updateProduct() { - - int page = 1; - int limit = 100; - while (page != -1) { - page = getInvmandoc(null, page, limit); - } - } - - public void addProduct(String code, String name) { - List inventoryCodes = new ArrayList<>(); - inventoryCodes.add(code); - if (inventoryCodes.size() > 0) { - UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); - udiRelevanceEntity1.setThirdId(code); - udiRelevanceEntity1.setThirdName(name); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); - Map paramMap = new HashMap<>(16); - paramMap.put("page_size", 1 + ""); - paramMap.put("page_now", 1 + ""); - paramMap.put("invcode", code); - String response = httpClient.mipsGet(ucloudUrl + "/uclooud/basic/invbasdoc", paramMap); - try { - BaseResponse> udiDlDeviceResponse = - JSONObject.parseObject(response, new TypeReference>>() { - }); - List invmandocResponses = udiDlDeviceResponse.getData().getList(); - if (invmandocResponses != null & invmandocResponses.size() > 0) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponses.get(0).getInvcode(), "thirdId"); - if (udiRelevanceEntity == null) { - UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - udiInfoEntity.setNameCode(invmandocResponses.get(0).getInvcode()); - udiInfoEntity.setCpmctymc(invmandocResponses.get(0).getInvname()); - udiInfoEntity.setGgxh(invmandocResponses.get(0).getInvspec()); - udiInfoEntity.setZczbhhzbapzbh(invmandocResponses.get(0).getInvtype()); - udiInfoEntity.setYlqxzcrbarmc(invmandocResponses.get(0).getProdarea()); - udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoService.insertUdiInfo(udiInfoEntity); - udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); - udiRelevanceEntity1.setThirdId(udiInfoEntity.getNameCode()); - udiRelevanceEntity1.setThirdName(udiInfoEntity.getCpmctymc()); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); - } - } - - - public int getInvmandoc(String invcode, int page, int limit) { - Map paramMap = new HashMap<>(16); - paramMap.put("page_size", limit + ""); - paramMap.put("page_now", page + ""); - if (invcode != null) { - paramMap.put("invcode", invcode); - } - String response = httpClient.mipsGet(ucloudUrl + "/uclooud/basic/invbasdoc", paramMap); - try { - BaseResponse> udiDlDeviceResponse = - JSONObject.parseObject(response, new TypeReference>>() { - }); - List invmandocResponses = udiDlDeviceResponse.getData().getList(); - if (invmandocResponses != null && invmandocResponses.size() > 0) { - List inventoryCodes = new ArrayList<>(); - if (invcode != null) { - inventoryCodes.add(invcode); - } else { - for (InvmandocResponse invmandocResponse : invmandocResponses) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getInvcode(), "thirdId"); - if (udiRelevanceEntity == null) { - inventoryCodes.add(invmandocResponse.getInvcode()); - } - } - } - - if (inventoryCodes.size() > 0) { - Map onHandParams = new HashMap<>(16); - onHandParams.put("inventory", inventoryCodes); - String onHandStr = HttpClient.uCloudPost(ucloudUrl + "/uclooud/basic/onhandPost", onHandParams); - try { - BaseResponse> onHandsResponse = - JSONObject.parseObject(onHandStr, new TypeReference>>() { - }); - List queryResponseList = onHandsResponse.getData().getList(); - if (queryResponseList != null) { - Map> map = queryResponseList.stream().collect(Collectors.groupingBy(UOnhandQueryResponse::getCinventory_code)); - for (List onHandResponses : map.values()) { - if (onHandResponses != null && onHandResponses.size() > 0) { - UOnhandQueryResponse onhandQueryResponse = onHandResponses.get(0); - if (onhandQueryResponse.getNnum() > 0) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponses.get(0).getInvcode(), "thirdId"); - if (udiRelevanceEntity == null) { - UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - udiInfoEntity.setNameCode(onhandQueryResponse.getCinventory_code()); - udiInfoEntity.setCpmctymc(onhandQueryResponse.getCinventory_name()); - udiInfoEntity.setGgxh(onhandQueryResponse.getInvspec()); - udiInfoEntity.setUuid(CustomUtil.getUUId());//无UUID暂时不用添加 - udiInfoEntity.setYlqxzcrbarmc(invmandocResponses.get(0).getProdarea()); - udiInfoEntity.setZczbhhzbapzbh(invmandocResponses.get(0).getInvtype()); - udiInfoService.insertUdiInfo(udiInfoEntity); - UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); - udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); - udiRelevanceEntity1.setThirdId(onhandQueryResponse.getCinventory_code()); - udiRelevanceEntity1.setThirdName(onhandQueryResponse.getCinventory_name()); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); - } - - } - -// } - - } - } - } else { - UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); - udiRelevanceEntity1.setThirdId(invcode); - udiRelevanceEntity1.setThirdName(invmandocResponses.get(0).getInvname()); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - page++; - if (page * limit < udiDlDeviceResponse.getData().getTotal()) { - return page; - } - } else { - return -1; - } - - } catch (Exception e) { - e.printStackTrace(); - } - return -1; - } -} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/GennerOrderUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/GennerOrderUtils.java index 6bd0143..c78ec79 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/GennerOrderUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/GennerOrderUtils.java @@ -145,4 +145,13 @@ public class GennerOrderUtils { } + public long getRelId() { + Long incrementalSerial = redisUtil.incr("udiRelId", 1); + if (incrementalSerial == 1) { + redisUtil.expire("udiRelId", getSecondsNextEarlyMorning()); + } + String curTime = System.currentTimeMillis() + ""; + return Long.parseLong(curTime.substring(1, curTime.length() - 3)) + incrementalSerial; + } + } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml index a4e06b9..8aa13be 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml @@ -119,7 +119,7 @@ inv_prein_product.inCount,inv_prein_product.outCount ,inv_prein_product.reCount,inv_prein_product.customerId, basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name - invStorageName,inv_prein_product.invStorageCode + invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price FROM inv_prein_product inner join basic_udirel on inv_prein_product.relIdFk = basic_udirel.id inner join basic_products on basic_udirel.uuid = basic_products.uuid @@ -193,13 +193,13 @@ insert INTO inv_prein_product (productsName, nameCode, relIdFk, ggxh, batchNo, productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, - inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode) + inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode,price) values (#{productsName}, #{nameCode}, #{relIdFk}, #{ggxh}, #{batchNo}, #{productionDate}, #{expireDate}, #{ylqxzcrbarmc}, #{zczbhhzbapzbh}, #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk} - , #{invStorageCode}, #{invWarehouseCode}) + , #{invStorageCode}, #{invWarehouseCode},#{price}) @@ -209,6 +209,11 @@ WHERE id = #{id} + + DELETE + FROM inv_prein_product + + UPDATE inv_prein_product @@ -228,6 +233,7 @@ supId=#{supId}, unitFk=#{unitFk}, invStorageCode=#{invStorageCode}, + price=#{price}, invWarehouseCode=#{invWarehouseCode}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml index 3005c66..a4ac30d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml @@ -197,6 +197,13 @@ WHERE id = #{id} + + + DELETE + FROM inv_prein_product_detail + + + DELETE FROM inv_prein_product_detail diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml index a19d747..d7d4fd2 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml @@ -117,7 +117,7 @@ inv_pre_product.inCount,inv_pre_product.outCount ,inv_pre_product.reCount,inv_pre_product.customerId, basic_corp.name companyName,inv_pre_product.supId,inv_pre_product.unitFk ,inv_warehouse.name - invStorageName,inv_pre_product.invStorageCode + invStorageName,inv_pre_product.invStorageCode,inv_pre_product.price FROM inv_pre_product inner join basic_udirel on inv_pre_product.relIdFk = basic_udirel.id inner join basic_products on basic_udirel.uuid = basic_products.uuid @@ -191,13 +191,13 @@ insert INTO inv_pre_product (productsName, nameCode, relIdFk, ggxh, batchNo, productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, - inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode) + inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode,price) values (#{productsName}, #{nameCode}, #{relIdFk}, #{ggxh}, #{batchNo}, #{productionDate}, #{expireDate}, #{ylqxzcrbarmc}, #{zczbhhzbapzbh}, #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk} - , #{invStorageCode}, #{invWarehouseCode}) + , #{invStorageCode}, #{invWarehouseCode},#{price}) @@ -227,6 +227,7 @@ unitFk=#{unitFk}, invStorageCode=#{invStorageCode}, invWarehouseCode=#{invWarehouseCode}, + price=#{price}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml index 76e7bf6..608565e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml @@ -117,7 +117,7 @@ basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, inv_product.inCount,inv_product.outCount ,inv_product.reCount,inv_product.customerId,basic_corp.name companyName,inv_product.unitFk,inv_product.supId - ,inv_warehouse.name invStorageName,inv_product.invStorageCode + ,inv_warehouse.name invStorageName,inv_product.invStorageCode,inv_product.price FROM inv_product inner join basic_udirel on inv_product.relIdFk = basic_udirel.id inner join basic_products on basic_udirel.uuid = basic_products.uuid @@ -197,6 +197,7 @@ bc.name companyName, ip.unitFk, ip.supId, + ip.price, iw.name invStorageName, inCount, outCount @@ -238,13 +239,13 @@ insert INTO inv_product (productsName, nameCode, relIdFk, ggxh, batchNo, productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, - inCount, outCount, reCount, customerId, unitFk, supId, invStorageCode, invWarehouseCode) + inCount, outCount, reCount, customerId, unitFk, supId, invStorageCode, invWarehouseCode, price) values (#{productsName}, #{nameCode}, #{relIdFk}, #{ggxh}, #{batchNo}, #{productionDate}, #{expireDate}, #{ylqxzcrbarmc}, #{zczbhhzbapzbh}, #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{unitFk}, #{supId} - , #{invStorageCode}, #{invWarehouseCode}) + , #{invStorageCode}, #{invWarehouseCode}, #{price}) @@ -274,6 +275,7 @@ supId=#{supId}, invStorageCode=#{invStorageCode}, invWarehouseCode=#{invWarehouseCode}, + price=#{price}, WHERE id = #{id}