diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index 5ef55cb..bdde496 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -72,6 +72,9 @@ public class SpsSyncDownloadController { logs = logs + "系统用户信息：" + baseResponse.getData().getAuthAdminList().size() + "条\n"; if (CollUtil.isNotEmpty(baseResponse.getData().getDeptEntityList())) logs = logs + "部门信息：" + baseResponse.getData().getDeptEntityList().size() + "条\n"; + + if (CollUtil.isNotEmpty(baseResponse.getData().getNewUploadDiEntities())) + logs = logs + "新增配送产品信息：" + baseResponse.getData().getNewUploadDiEntities().size() + "条\n"; basicExportStatusEntity.setRemark(logs); basicExportService.updateExportStatus(basicExportStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java index e2479ae..8e69d03 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java @@ -96,6 +96,8 @@ public class SpsSyncDownloadService { @Resource DeptService deptService; + @Resource + NewUploadDiService newUploadDiService; public BaseResponse findProductInfo(SpsSyncDataRequest spsSyncDataRequest) { @@ -226,7 +228,6 @@ public class SpsSyncDownloadService { } } - if (syncDataSetEntity.isBasicThirdCorp()) { //第三方往来单位 FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); @@ -260,6 +261,14 @@ public class SpsSyncDownloadService { syncDataResponse.setThrOrderDetailEntities(allOrderDetailEntities); syncDataResponse.setThrOrderEntities(thrOrderEntities); } + + + //新增配送产品信息 + FilterNewUploadDiRequest filterNewUploadDiRequest = new FilterNewUploadDiRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterNewUploadDiRequest); + List newUploadDiEntities = newUploadDiService.filterNewUploads(filterNewUploadDiRequest); + syncDataResponse.setNewUploadDiEntities(newUploadDiEntities); + return ResultVOUtils.success(syncDataResponse); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java index 7694e37..8ad47bd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java @@ -190,6 +190,7 @@ public class SpsSyncExportStatusController { || CollUtil.isNotEmpty(spsSyncDataResponse.getThrInvWarehouseEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getAuthAdminList()) || CollUtil.isNotEmpty(spsSyncDataResponse.getDeptEntityList()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getNewUploadDiEntities()) ) { BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_BASIC_DATA); if (basicExportStatusTimeEntity != null) { 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 6e3cdbd..9cc4ad5 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 @@ -503,17 +503,14 @@ public class SpsSyncUploadController { if (temp == null) { mapper.importOrder(orderEntity); if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) { - try { - CodesTempDao codeMappert = batchSession.getMapper(CodesTempDao.class); - List warehouseEntityList = syncDataResponse.getWarehouseEntityList(); - for (WarehouseEntity warehouseEntity : warehouseEntityList) { - if (warehouseEntity.getOrderId().equals(orderEntity.getId())) { - codeMappert.replaceCodesTempSingle(warehouseEntity); - } + CodesTempDao codeMappert = batchSession.getMapper(CodesTempDao.class); + List warehouseEntityList = syncDataResponse.getWarehouseEntityList(); + for (WarehouseEntity warehouseEntity : warehouseEntityList) { + if (warehouseEntity.getOrderId().equals(orderEntity.getId())) { + codeMappert.replaceCodesTempSingle(warehouseEntity); } - batchSession.commit(); - } catch (Exception e) { } + batchSession.commit(); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java index 29941f2..7215e7c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java @@ -21,6 +21,7 @@ import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.ErpProductsResponse; +import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; 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 76484f8..d588213 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 @@ -82,6 +82,8 @@ public class UdiRelevanceController { CustomerService customerService; @Resource GennerOrderUtils gennerOrderUtils; + @Resource + SupplementVailUtil supplementVailUtil; @AuthRuleAnnotation("") @GetMapping("/udi/udirel/download") @@ -266,6 +268,17 @@ public class UdiRelevanceController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + long customerId = customerService.getCustomerId(); + + if (customerId != 110) { + SupplementRequest supplementRequest = new SupplementRequest(); + BeanUtils.copyProperties(udiRelevanceResponse, supplementRequest); + String vailResult = supplementVailUtil.vail(supplementRequest, SupplementVailUtil.LOCAL_EIDT); + if (vailResult != null) + return ResultVOUtils.error(500, vailResult); + } + + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity); udiRelevanceEntity.setId(udiRelevanceResponse.getId() + ""); @@ -276,7 +289,7 @@ public class UdiRelevanceController { udiRelevanceEntity.setIsUseDy(true); } else udiRelevanceEntity.setIsUseDy(false); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); - long customerId = customerService.getCustomerId(); + if (customerId != 110) { if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) { CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceEntity.getId(), customerId + ""); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/BasicProductSetController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/BasicProductSetController.java new file mode 100644 index 0000000..77dd543 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/BasicProductSetController.java @@ -0,0 +1,49 @@ +package com.glxp.sale.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.info.BasicProductSetEntity; +import com.glxp.sale.admin.entity.info.CompanyCertEntity; +import com.glxp.sale.admin.entity.info.SetupEntity; +import com.glxp.sale.admin.req.info.CompanyRequest; +import com.glxp.sale.admin.req.info.FilterBasicProductSetrequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.info.BasicProductSetService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class BasicProductSetController { + + @Resource + BasicProductSetService basicProductSetService; + + + @AuthRuleAnnotation("") + @GetMapping("/spms/basicProduct/setup/filter") + public BaseResponse filterSetUps(FilterBasicProductSetrequest filterBasicProductSetrequest) { + List basicProductSetEntities = basicProductSetService.filterSetup(filterBasicProductSetrequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicProductSetEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicProductSetEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/spms/basicProduct/setup/modify") + public BaseResponse modifySetup(@RequestBody BasicProductSetEntity basicProductSetEntity) { + basicProductSetService.updateSetup(basicProductSetEntity); + return ResultVOUtils.success("修改成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java index ffa9ca9..2879f1b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java @@ -92,9 +92,9 @@ public class CompanyController { // } if (StringUtils.isNotBlank(companyEntity.getNewFilePath())) { if (StringUtils.isNotBlank(companyEntity.getFilePath())) { - String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath(); - File file=new File(URL); - if(file.exists()&&file.isFile()) { + String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath(); + File file = new File(URL); + if (file.exists() && file.isFile()) { file.delete(); } } @@ -102,9 +102,9 @@ public class CompanyController { } if (StringUtils.isNotBlank(companyEntity.getNewFilePath2())) { if (StringUtils.isNotBlank(companyEntity.getFilePath2())) { - String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath2(); - File file=new File(URL); - if(file.exists()&&file.isFile()) { + String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath2(); + File file = new File(URL); + if (file.exists() && file.isFile()) { file.delete(); } } @@ -112,9 +112,9 @@ public class CompanyController { } if (StringUtils.isNotBlank(companyEntity.getNewFilePath3())) { if (StringUtils.isNotBlank(companyEntity.getFilePath3())) { - String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath3(); - File file=new File(URL); - if(file.exists()&&file.isFile()) { + String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath3(); + File file = new File(URL); + if (file.exists() && file.isFile()) { file.delete(); } } @@ -122,9 +122,9 @@ public class CompanyController { } if (StringUtils.isNotBlank(companyEntity.getNewFilePath4())) { if (StringUtils.isNotBlank(companyEntity.getFilePath4())) { - String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath4(); - File file=new File(URL); - if(file.exists()&&file.isFile()) { + String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath4(); + File file = new File(URL); + if (file.exists() && file.isFile()) { file.delete(); } } @@ -158,12 +158,7 @@ public class CompanyController { customerContactEntity.setEmail(companyEntity.getEmail()); customerContactEntity.setContacts(companyEntity.getContacts()); customerContactEntity.setCustomerId(companyEntity.getCustomerId()); - - try { - customerContactService.updateCustomerContact(customerContactEntity); - } catch (Exception e) { - - } + customerContactService.updateCustomerContact(customerContactEntity); return ResultVOUtils.success("修改成功"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java index 892b915..a9b0214 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java @@ -6,10 +6,13 @@ import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.controller.basic.BasicUnitMaintainController; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.sale.admin.entity.info.BasicProductSetEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.basic.CompanyProductRelevanceRequest; +import com.glxp.sale.admin.req.basic.SupplementRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; import com.glxp.sale.admin.req.info.CompanyRequest; import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; @@ -18,9 +21,12 @@ import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; +import com.glxp.sale.admin.service.info.BasicProductSetService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.thread.CompanyProductsRelService; +import com.glxp.sale.admin.util.SupplementVailUtil; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -37,6 +43,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; @RestController public class CompanyProductRelevanceController { @@ -165,6 +172,16 @@ public class CompanyProductRelevanceController { return ResultVOUtils.success("成功"); } + + @Resource + BasicProductSetService basicProductSetService; + @Resource + SystemParamConfigService systemParamConfigService; + + @Resource + SupplementVailUtil supplementVailUtil; + + @AuthRuleAnnotation("") @PostMapping("/sale/info/insertFilter") public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { @@ -174,6 +191,9 @@ public class CompanyProductRelevanceController { } else { udiInfoExportRequest.setUnitFk(companyEntity.getUnitIdFk()); } + String vailResult = supplementVailUtil.vail(udiInfoExportRequest.getSupplementRequest(), SupplementVailUtil.SUP_SELECT); + if (vailResult != null) + return ResultVOUtils.error(500, vailResult); companyProductsRelService.insertCompanyProducts(udiInfoExportRequest); return ResultVOUtils.success("后台正在导入，请稍后刷新查看！"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 5cfb2fc..85eac09 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -366,7 +366,9 @@ public class OrderController { } else { if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) { - transferOrder(orderEntity, entrustReceEntity); + if (StrUtil.isEmpty(entrustReceEntity.getAction())) { + transferOrder(orderEntity, entrustReceEntity); + } } if (!entrustReceEntity.isFinishRece()) { StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); @@ -442,13 +444,10 @@ public class OrderController { } ); //更新数据 - try { - orderDao.insertOrder(supplementOrder); - orderEntity.setUllageSupNo(supplementOrder.getId()); - orderDao.updateOrder(orderEntity); - codesTempDao.insertCodesTemp(supplementCodes); - } catch (Exception e) { - } + orderDao.insertOrder(supplementOrder); + orderEntity.setUllageSupNo(supplementOrder.getId()); + orderDao.updateOrder(orderEntity); + codesTempDao.insertCodesTemp(supplementCodes); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java index 2657430..e5b18b4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java @@ -1,20 +1,25 @@ package com.glxp.sale.admin.controller.thrsys; +import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BasicThirdSysService; import com.glxp.sale.admin.service.basic.UdiContrastService; +import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.thrsys.ThrProductsAddService; import com.glxp.sale.admin.service.thrsys.ThrProductsService; import com.glxp.sale.admin.util.BeanUtils; +import com.glxp.sale.admin.util.DateUtil; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -75,7 +80,6 @@ public class ThrProductsAddController { } - @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/updateThrAddProducts") public BaseResponse updateThrAddProducts(@RequestBody ThrProductsAddEntity thrProductsAddEntity, BindingResult bindingResult) { @@ -88,7 +92,6 @@ public class ThrProductsAddController { if (thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) { return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！"); } - thrProductsAddService.updateThrProducts(thrProductsAddEntity); if (thrProductsAddEntity.getCheckStatus() == 2) { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); @@ -96,6 +99,36 @@ public class ThrProductsAddController { BeanUtils.copyProperties(thrProductsAddEntity, thrProductsEntity); thrProductsEntity.setUpdateTime(new Date()); thrProductsService.insertThrProducts(thrProductsEntity); + + if (StrUtil.isNotEmpty(tempEntity.getRelId())) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(tempEntity.getRelId()); + if (udiRelevanceEntity != null) { + if (tempEntity.getThirdSysFk().equals("thirdId")) { + udiRelevanceEntity.setMainId(tempEntity.getCode()); + udiRelevanceEntity.setMainName(tempEntity.getName()); + udiRelevanceEntity.setThirdId(tempEntity.getCode()); + udiRelevanceEntity.setThirdName(tempEntity.getName()); + } else if (tempEntity.getThirdSysFk().equals("thirdId1")) { + udiRelevanceEntity.setThirdId1(tempEntity.getCode()); + udiRelevanceEntity.setThirdName1(tempEntity.getName()); + } else if (tempEntity.getThirdSysFk().equals("thirdId2")) { + udiRelevanceEntity.setThirdId2(tempEntity.getCode()); + udiRelevanceEntity.setThirdName2(tempEntity.getName()); + } else if (tempEntity.getThirdSysFk().equals("thirdId3")) { + udiRelevanceEntity.setThirdId3(tempEntity.getCode()); + udiRelevanceEntity.setThirdName3(tempEntity.getName()); + } else if (tempEntity.getThirdSysFk().equals("thirdId4")) { + udiRelevanceEntity.setThirdId4(tempEntity.getCode()); + udiRelevanceEntity.setThirdName4(tempEntity.getName()); + } + } + String time = DateUtil.formatDateTime(new Date()); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + } + + //审核通过后直接加到耗材字典里---todo 暂时不加到耗材字典里 // BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); // if (basicThirdSysEntity.getThirdId().equals(thrProductsAddEntity.getThirdSysFk())) @@ -110,6 +143,9 @@ public class ThrProductsAddController { } + @Resource + UdiRelevanceService udiRelevanceService; + /** * 新增第三方产品信息 * @@ -136,8 +172,19 @@ public class ThrProductsAddController { if (StrUtil.isEmpty(thrProductsAddEntity.getThirdSysFk())) { thrProductsAddEntity.setThirdSysFk("thirdId"); } + if (StrUtil.isNotEmpty(thrProductsAddEntity.getRelId())) { + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(thrProductsAddEntity.getRelId()); + if (udiRelevanceResponse != null) { + BeanUtils.copyProperties(udiRelevanceResponse, thrProductsAddEntity); + thrProductsAddEntity.setName(udiRelevanceResponse.getCpmctymc()); + thrProductsAddEntity.setManufactory(udiRelevanceResponse.getYlqxzcrbarmc()); + thrProductsAddEntity.setSpec(udiRelevanceResponse.getGgxh()); + thrProductsAddEntity.setRegisterNo(udiRelevanceResponse.getZczbhhzbapzbh()); + } + } thrProductsAddEntity.setCustomerId(customerId); thrProductsAddEntity.setCheckStatus(1); + thrProductsAddEntity.setUpdateTime(new Date()); thrProductsAddService.insertThrProducts(thrProductsAddEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java index 8a890d8..c01363c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java @@ -2,28 +2,36 @@ package com.glxp.sale.admin.controller.thrsys; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.basic.NewUploadDiEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.basic.CombineRequest; +import com.glxp.sale.admin.req.basic.SupplementRequest; import com.glxp.sale.admin.req.inout.DeleteRequest; import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.thrsys.ThrProductsAddDiResponse; +import com.glxp.sale.admin.service.basic.NewUploadDiService; import com.glxp.sale.admin.service.basic.UdiContrastService; 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.thrsys.ThrProductsAddDiService; +import com.glxp.sale.admin.util.BeanUtils; +import com.glxp.sale.admin.util.SupplementVailUtil; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Bean; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -51,6 +59,11 @@ public class ThrProductsAddDiController { UdiRelevanceService udiRelevanceService; @Resource UdiInfoService udiInfoService; + @Resource + NewUploadDiService newUploadDiService; + + @Resource + SupplementVailUtil supplementVailUtil; /** * 查询DI产品信息列表 @@ -69,6 +82,8 @@ public class ThrProductsAddDiController { return ResultVOUtils.success(pageSimpleResponse); } + + /** * 添加DI产品信息 * @@ -80,6 +95,13 @@ public class ThrProductsAddDiController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + + SupplementRequest supplementRequest = new SupplementRequest(); + BeanUtils.copyProperties(addThrDiProductsRequest, supplementRequest); + String vailResult = supplementVailUtil.vail(supplementRequest, SupplementVailUtil.SUP_ADD); + if (vailResult != null) + return ResultVOUtils.error(500, vailResult); + thrProductsAddDiService.addThrAddDiProducts(addThrDiProductsRequest); return ResultVOUtils.success(); } @@ -98,6 +120,8 @@ public class ThrProductsAddDiController { } thrProductsAddDiEntity.setAuditTime(new Date()); thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity); + + thrProductsAddDiEntity = thrProductsAddDiService.selecById(thrProductsAddDiEntity.getId()); ThrProductsAddDiResponse thrProductsAddDiResponse = thrProductsAddDiService.selecById(thrProductsAddDiEntity.getId()); if (thrProductsAddDiEntity.getStatus() == 2) { //审核通过 @@ -130,6 +154,21 @@ public class ThrProductsAddDiController { companyProductRelevanceEntity.setAuditStatus("1"); companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); + + + if (StrUtil.isNotEmpty(thrProductsAddDiEntity.getSelectThridSysStr())) { + List thirdSysList = JSONUtil.toList(thrProductsAddDiEntity.getSelectThridSysStr(), String.class); + if (thirdSysList.size() > 0) { + for (String thirdSys : thirdSysList) { + NewUploadDiEntity newUploadDiEntity = new NewUploadDiEntity(); + newUploadDiEntity.setRelId(udiRelIdFk + ""); + newUploadDiEntity.setUpdateTime(new Date()); + newUploadDiEntity.setUploadStatus(0); + newUploadDiEntity.setThirdSysFk(thirdSys); + newUploadDiService.insertNewUploadDi(newUploadDiEntity); + } + } + } } @@ -140,7 +179,6 @@ public class ThrProductsAddDiController { /** * 删除DI产品信息 * - * @param id * @return */ @AuthRuleAnnotation("") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/NewUploadDiDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/NewUploadDiDao.java new file mode 100644 index 0000000..70cc402 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/NewUploadDiDao.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.dao.basic; + +import com.glxp.sale.admin.entity.basic.CorpImportLogEntity; +import com.glxp.sale.admin.entity.basic.NewUploadDiEntity; +import com.glxp.sale.admin.req.basic.FilterNewUploadDiRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface NewUploadDiDao { + + List filterNewUploads(FilterNewUploadDiRequest filterNewUploadDiRequest); + + boolean deleteById(Integer id); + + boolean insertNewUploadDi(NewUploadDiEntity newUploadDiEntity); + + boolean updateNewUploadDi(NewUploadDiEntity newUploadDiEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/BasicProductSetDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/BasicProductSetDao.java new file mode 100644 index 0000000..f8fdcf1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/BasicProductSetDao.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.BasicProductSetEntity; +import com.glxp.sale.admin.req.info.FilterBasicProductSetrequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface BasicProductSetDao { + + List filterSetup(FilterBasicProductSetrequest filterBasicProductSetrequest); + + boolean updateSetup(BasicProductSetEntity basicProductSetEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/NewUploadDiEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/NewUploadDiEntity.java new file mode 100644 index 0000000..edf2f49 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/NewUploadDiEntity.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class NewUploadDiEntity { + private Integer id; + private String relId; + private String thirdSysFk; + private Integer uploadStatus; + private String uploadMsg; + private String uploadCode; + private String remark; + private Date updateTime; + private Date submitTime; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/BasicProductSetEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/BasicProductSetEntity.java new file mode 100644 index 0000000..c27e6f2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/BasicProductSetEntity.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +@Data +public class BasicProductSetEntity { + + private Integer id; + private String parmName; + private String parmKey; + private boolean enable; + private boolean supSelect; + private boolean supAdd; + private boolean localAdd; + private boolean localEdit; + private String remark; + private Integer sort; + + + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddDiEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddDiEntity.java index d8dd67d..349b582 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddDiEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddDiEntity.java @@ -48,7 +48,6 @@ public class ThrProductsAddDiEntity { private String remark; - private String thirdSysFk; private String code; private String sptm; @@ -57,5 +56,16 @@ public class ThrProductsAddDiEntity { private String manufactory; private String spmc; private String cpms; + private String selectThridSysStr; + + private String price; + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddEntity.java index def8981..ef75eaa 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddEntity.java @@ -43,4 +43,5 @@ public class ThrProductsAddEntity { private Integer checkStatus; private String customerId; private String thirdSys; + private String relId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsEntity.java index 2fc97f6..5f21093 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsEntity.java @@ -38,5 +38,6 @@ public class ThrProductsEntity { private String remark1; //备注1 private String remark2; //备注2 private String remark3; //备注3 + private String relId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterNewUploadDiRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterNewUploadDiRequest.java new file mode 100644 index 0000000..6bf06ee --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterNewUploadDiRequest.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.req.basic; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterNewUploadDiRequest extends ListPageRequest { + + private Integer id; + private String relId; + private String thirdSysFk; + private String uploadStatus; + private String uploadCode; + private String lastUpdateTime; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/SupplementRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/SupplementRequest.java new file mode 100644 index 0000000..8e6b323 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/SupplementRequest.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.req.basic; + +import lombok.Data; + +//选入产品补充信息 +@Data +public class SupplementRequest { + + //补充信息： + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; + private String sptm; + private String ybbm; + private String measname; + private String manufactory; + private String spmc; + private String cpms; + private String price; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoExportRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoExportRequest.java index c23da9b..601be80 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoExportRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoExportRequest.java @@ -24,4 +24,8 @@ public class UdiInfoExportRequest extends ListPageRequest { private String thirdId3; private String thirdId4; + + private SupplementRequest supplementRequest; + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterBasicProductSetrequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterBasicProductSetrequest.java new file mode 100644 index 0000000..19d865e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterBasicProductSetrequest.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterBasicProductSetrequest extends ListPageRequest { + + + String parmName; + Boolean enable; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/AddThrDiProductsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/AddThrDiProductsRequest.java index 07eb13a..58391bc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/AddThrDiProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/AddThrDiProductsRequest.java @@ -33,6 +33,17 @@ public class AddThrDiProductsRequest { private String manufactory; private String spmc; private String cpms; + private List selectThirdSys; + + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java index 799dba9..cdf77ce 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.res.basic; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.DeptEntity; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.sale.admin.entity.basic.NewUploadDiEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; @@ -48,4 +49,7 @@ public class SpsSyncDataResponse { List invSubWarehouseEntities; List invBusUserEntities; + //新增配送产品信息 + List newUploadDiEntities; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrProductsAddDiResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrProductsAddDiResponse.java index 0f1544b..73c7f2d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrProductsAddDiResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrProductsAddDiResponse.java @@ -29,4 +29,14 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity { private String remark; + private String price; + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/NewUploadDiService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/NewUploadDiService.java new file mode 100644 index 0000000..1a3f8ad --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/NewUploadDiService.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.service.basic; + +import com.glxp.sale.admin.entity.basic.NewUploadDiEntity; +import com.glxp.sale.admin.req.basic.FilterNewUploadDiRequest; + +import java.util.List; + +public interface NewUploadDiService { + + + List filterNewUploads(FilterNewUploadDiRequest filterNewUploadDiRequest); + + boolean deleteById(Integer id); + + boolean insertNewUploadDi(NewUploadDiEntity newUploadDiEntity); + + boolean updateNewUploadDi(NewUploadDiEntity newUploadDiEntity); + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/NewUploadDiServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/NewUploadDiServiceImpl.java new file mode 100644 index 0000000..bcfa1c0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/NewUploadDiServiceImpl.java @@ -0,0 +1,49 @@ +package com.glxp.sale.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.basic.NewUploadDiDao; +import com.glxp.sale.admin.entity.basic.CorpImportLogEntity; +import com.glxp.sale.admin.entity.basic.NewUploadDiEntity; +import com.glxp.sale.admin.entity.basic.UdiInfoImportLogEntity; +import com.glxp.sale.admin.req.basic.FilterNewUploadDiRequest; +import com.glxp.sale.admin.service.basic.NewUploadDiService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class NewUploadDiServiceImpl implements NewUploadDiService { + @Resource + NewUploadDiDao newUploadDiDao; + + @Override + public List filterNewUploads(FilterNewUploadDiRequest filterNewUploadDiRequest) { + + if (filterNewUploadDiRequest == null) { + return Collections.emptyList(); + } + if (filterNewUploadDiRequest.getPage() != null) { + int offset = (filterNewUploadDiRequest.getPage() - 1) * filterNewUploadDiRequest.getLimit(); + PageHelper.offsetPage(offset, filterNewUploadDiRequest.getLimit()); + } + List data = newUploadDiDao.filterNewUploads(filterNewUploadDiRequest); + return data; + } + + @Override + public boolean deleteById(Integer id) { + return newUploadDiDao.deleteById(id); + } + + @Override + public boolean insertNewUploadDi(NewUploadDiEntity newUploadDiEntity) { + return newUploadDiDao.insertNewUploadDi(newUploadDiEntity); + } + + @Override + public boolean updateNewUploadDi(NewUploadDiEntity newUploadDiEntity) { + return newUploadDiDao.updateNewUploadDi(newUploadDiEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java index 108b647..1ebe635 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java @@ -97,15 +97,12 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic //基础表导入 SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) { - try { - List corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities(); - UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); - for (UdiInfoEntity basicUnitMaintainEntity : corpList) { - mapper.insertUdiInfo(basicUnitMaintainEntity); - } - batchSession.commit(); - } catch (Exception e) { + List corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities(); + UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); + for (UdiInfoEntity basicUnitMaintainEntity : corpList) { + mapper.insertUdiInfo(basicUnitMaintainEntity); } + batchSession.commit(); } batchSession.close(); } @@ -113,15 +110,12 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic //关联表导入 if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiRelevanceEntities())) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); - try { - List corpList = udiRelevanceExportJsonResponse.getUdiRelevanceEntities(); - UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class); - for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) { - mapper.insertUdiRelevance(basicUnitMaintainEntity); - } - batchSession.commit(); - } catch (Exception e) { + List corpList = udiRelevanceExportJsonResponse.getUdiRelevanceEntities(); + UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class); + for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) { + mapper.insertUdiRelevance(basicUnitMaintainEntity); } + batchSession.commit(); batchSession.close(); } @@ -129,15 +123,12 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getThrProductsEntities())) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); - try { - List corpList = udiRelevanceExportJsonResponse.getThrProductsEntities(); - ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class); - for (ThrProductsEntity basicUnitMaintainEntity : corpList) { - mapper.insertThrProducts(basicUnitMaintainEntity); - } - batchSession.commit(); - } catch (Exception e) { + List corpList = udiRelevanceExportJsonResponse.getThrProductsEntities(); + ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class); + for (ThrProductsEntity basicUnitMaintainEntity : corpList) { + mapper.insertThrProducts(basicUnitMaintainEntity); } + batchSession.commit(); batchSession.close(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/BasicProductSetService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/BasicProductSetService.java new file mode 100644 index 0000000..419578c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/BasicProductSetService.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.service.info; + +import com.glxp.sale.admin.entity.info.BasicProductSetEntity; +import com.glxp.sale.admin.req.info.FilterBasicProductSetrequest; + +import java.util.List; +import java.util.Map; + +public interface BasicProductSetService { + + List filterSetup(FilterBasicProductSetrequest filterBasicProductSetrequest); + + Map filterAllEnable(); + + + boolean updateSetup(BasicProductSetEntity basicProductSetEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/BasicProductSetServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/BasicProductSetServiceImpl.java new file mode 100644 index 0000000..2f6dc13 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/BasicProductSetServiceImpl.java @@ -0,0 +1,58 @@ +package com.glxp.sale.admin.service.info.impl; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.BasicProductSetDao; +import com.glxp.sale.admin.entity.info.BasicProductSetEntity; +import com.glxp.sale.admin.req.info.FilterBasicProductSetrequest; +import com.glxp.sale.admin.service.info.BasicProductSetService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class BasicProductSetServiceImpl implements BasicProductSetService { + @Resource + BasicProductSetDao basicProductSetDao; + + @Override + public List filterSetup(FilterBasicProductSetrequest filterBasicProductSetrequest) { + if (filterBasicProductSetrequest == null) { + return Collections.emptyList(); + } + if (filterBasicProductSetrequest.getPage() != null) { + int offset = (filterBasicProductSetrequest.getPage() - 1) * filterBasicProductSetrequest.getLimit(); + PageHelper.offsetPage(offset, filterBasicProductSetrequest.getLimit()); + } + return basicProductSetDao.filterSetup(filterBasicProductSetrequest); + } + + @Override + public Map filterAllEnable() { + + FilterBasicProductSetrequest filterBasicProductSetrequest = new FilterBasicProductSetrequest(); + filterBasicProductSetrequest.setEnable(true); + List basicProductSetEntities = basicProductSetDao.filterSetup(filterBasicProductSetrequest); + + Map basicProductSetEntityMap = new HashMap<>(); + + if (CollUtil.isNotEmpty(basicProductSetEntities)) { + for (BasicProductSetEntity basicProductSetEntity : basicProductSetEntities) { + basicProductSetEntityMap.put(basicProductSetEntity.getParmKey(), basicProductSetEntity); + } + } + + return basicProductSetEntityMap; + + + } + + @Override + public boolean updateSetup(BasicProductSetEntity basicProductSetEntity) { + return basicProductSetDao.updateSetup(basicProductSetEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemParamConfigService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemParamConfigService.java index fcb55e7..70dd234 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemParamConfigService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemParamConfigService.java @@ -5,6 +5,7 @@ import com.glxp.sale.admin.req.param.SystemParamConfigRequest; import com.glxp.sale.admin.req.param.SystemParamConfigSaveRequest; import java.util.List; +import java.util.Map; public interface SystemParamConfigService { @@ -21,11 +22,13 @@ public interface SystemParamConfigService { SystemParamConfigEntity selectByParamKey(String key); - String selectValueByParamKey(String key); + String selectValueByParamKey(String key); boolean updateById(SystemParamConfigSaveRequest systemParamConfigSaveRequest); boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest); boolean insert(SystemParamConfigEntity systemParamConfigEntity); + + Map findBasicAll(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java index 88153b8..52dcd35 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.service.param.impl; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.param.SystemParamConfigDao; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; @@ -9,7 +10,9 @@ import com.glxp.sale.admin.service.param.SystemParamConfigService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class SystemParamConfigServiceImpl implements SystemParamConfigService { @@ -79,4 +82,24 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { return systemParamConfigDao.insert(systemParamConfigEntity); } + + @Override + public Map findBasicAll() { + + SystemParamConfigRequest systemParamConfigRequest = new SystemParamConfigRequest(); + systemParamConfigRequest.setParamType(2); + systemParamConfigRequest.setParamStatus(1); + + List systemParamConfigEntities = queryPage(systemParamConfigRequest); + Map systemParamConfigEntityMap = new HashMap<>(); + + if (CollUtil.isNotEmpty(systemParamConfigEntities)) { + for (SystemParamConfigEntity systemParamConfigEntity : systemParamConfigEntities) { + systemParamConfigEntityMap.put(systemParamConfigEntity.getParamKey(), systemParamConfigEntity); + } + } + + return systemParamConfigEntityMap; + + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java index 38efcbb..8cd4994 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java @@ -75,14 +75,11 @@ public class ThrCorpServiceImpl implements ThrCorpService { public void importJsonData(List thrCorpEntities) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); if (CollUtil.isNotEmpty(thrCorpEntities)) { - try { - ThrCorpDao mapper = batchSession.getMapper(ThrCorpDao.class); - thrCorpEntities.forEach(thrCorpEntity -> { - mapper.insertThrCorps(thrCorpEntity); - }); - batchSession.commit(); - } catch (Exception e) { - } + ThrCorpDao mapper = batchSession.getMapper(ThrCorpDao.class); + thrCorpEntities.forEach(thrCorpEntity -> { + mapper.insertThrCorps(thrCorpEntity); + }); + batchSession.commit(); } batchSession.close(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index 4646ba4..1fb0223 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.thrsys.ThrProductsAddDiDao; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; @@ -71,6 +72,7 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { thrProductsAddDiEntity.setUuid(uuid); thrProductsAddDiEntity.setCreateTime(date); thrProductsAddDiEntity.setStatus(1); //未审核 + thrProductsAddDiEntity.setSelectThridSysStr(JSONUtil.toJsonStr(thrDiProductsRequest.getSelectThirdSys())); list.add(thrProductsAddDiEntity); } return thrProductsAddDiDao.insertThrDiProducts(list); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java index 5859510..dd0e291 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java @@ -1,11 +1,16 @@ package com.glxp.sale.admin.thread; import cn.hutool.core.util.StrUtil; +import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; +import com.glxp.sale.admin.req.basic.SupplementRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; +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.util.BeanUtils; +import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -20,6 +25,8 @@ public class CompanyProductsRelService { private CompanyProductRelevanceService companyProductRelevanceService; @Resource UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; @Async public void insertCompanyProducts(UdiInfoExportRequest udiInfoExportRequest) { @@ -33,6 +40,12 @@ public class CompanyProductsRelService { if (udiRelevanceEntity != null && StrUtil.isNotBlank(udiRelevanceEntity.getPrice())) { companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); } + UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid()); + SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest(); + BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoEntity); + BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + udiInfoService.updateUdiInfo(udiInfoEntity); companyProductRelevanceEntity.setCreate_time(new Date()); companyProductRelevanceEntity.setUpdate_time(new Date()); companyProductRelevanceEntity.setAuditStatus("3"); @@ -40,6 +53,8 @@ public class CompanyProductsRelService { companyProductRelevanceEntity.setUdiRlIdFk(Integer.parseInt(uuid)); companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId()); boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); + + } } else {//一键导出 //todo暂时去掉 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrOrderImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrOrderImportService.java index 333ff11..235bf5c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrOrderImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrOrderImportService.java @@ -111,15 +111,12 @@ public class ThrOrderImportService { } if (CollUtil.isNotEmpty(importData.getThrOrderDetailEntities())) { - try { - List thrOrderDetailEntities = importData.getThrOrderDetailEntities(); - ThrOrderDetailDao mapper = batchSession.getMapper(ThrOrderDetailDao.class); - thrOrderDetailEntities.forEach(thrOrderDetailEntity -> { - mapper.insertThrOrderDetail(thrOrderDetailEntity); - }); - batchSession.commit(); - } catch (Exception e) { - } + List thrOrderDetailEntities = importData.getThrOrderDetailEntities(); + ThrOrderDetailDao mapper = batchSession.getMapper(ThrOrderDetailDao.class); + thrOrderDetailEntities.forEach(thrOrderDetailEntity -> { + mapper.insertThrOrderDetail(thrOrderDetailEntity); + }); + batchSession.commit(); } batchSession.close(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java index 13d3f67..9ad6101 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java @@ -78,14 +78,11 @@ public class ThrProductsImportService { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); if (CollUtil.isNotEmpty(thrProductsEntities)) { - try { - ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class); - thrProductsEntities.forEach(thrCorpEntity -> { - mapper.insertThrProducts(thrCorpEntity); - }); - batchSession.commit(); - } catch (Exception e) { - } + ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class); + thrProductsEntities.forEach(thrCorpEntity -> { + mapper.insertThrProducts(thrCorpEntity); + }); + batchSession.commit(); } batchSession.close(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/SupplementVailUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/SupplementVailUtil.java new file mode 100644 index 0000000..74fb93b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/SupplementVailUtil.java @@ -0,0 +1,177 @@ +package com.glxp.sale.admin.util; + +import cn.hutool.core.util.StrUtil; +import com.glxp.sale.admin.entity.info.BasicProductSetEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.req.basic.SupplementRequest; +import com.glxp.sale.admin.service.info.BasicProductSetService; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Map; + +@Service +public class SupplementVailUtil { + + @Resource + BasicProductSetService basicProductSetService; + @Resource + SystemParamConfigService systemParamConfigService; + + + public static final int SUP_SELECT = 1; + public static final int SUP_ADD = 2; + public static final int LOCAL_ADD = 3; + public static final int LOCAL_EIDT = 4; + + + public String vail(SupplementRequest supplementRequest, int type) { + //验证产品信息是否必填 + Map basicProductSetEntityMap = basicProductSetService.filterAllEnable(); + Map systemParamConfigEntityMap = systemParamConfigService.findBasicAll(); + if (basicProductSetEntityMap.size() > 0) { + BasicProductSetEntity basicProductSetEntity = null; + + basicProductSetEntity = basicProductSetEntityMap.get("sptm"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getSptm())) { + return "商品条码不能为空"; + } + } + basicProductSetEntity = basicProductSetEntityMap.get("ybbm"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getYbbm())) { + return "医保编码不能为空"; + } + } + basicProductSetEntity = basicProductSetEntityMap.get("measname"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getMeasname())) { + return "计量单位不能为空"; + } + } + basicProductSetEntity = basicProductSetEntityMap.get("manufactory"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getManufactory())) { + return "生产企业不能为空"; + } + } + + basicProductSetEntity = basicProductSetEntityMap.get("spmc"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getSpmc())) { + return "商品名称不能为空"; + } + } + + basicProductSetEntity = basicProductSetEntityMap.get("cpms"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getCpms())) { + return "产品描述不能为空"; + } + } + basicProductSetEntity = basicProductSetEntityMap.get("price"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getPrice())) { + return "产品价格不能为空"; + } + } + + + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak1"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak1())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak1"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak2"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak2())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak2"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak3"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak3())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak3"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak4"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak4())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak4"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak5"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak5())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak5"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak6"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak6())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak6"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak7"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak7())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak7"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak8"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak8"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + } + return null; + } + + + public boolean isMustFill(int type, BasicProductSetEntity basicProductSetEntity) { + if (basicProductSetEntity == null) + return false; + if (type == SUP_SELECT && basicProductSetEntity.isSupSelect()) { + return true; + } else if (type == SUP_ADD && basicProductSetEntity.isSupAdd()) { + return true; + } else if (type == LOCAL_ADD && basicProductSetEntity.isLocalAdd()) { + return true; + } else if (type == LOCAL_EIDT && basicProductSetEntity.isLocalEdit()) { + return true; + } + return false; + + } + +} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/NewUploadDiDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/NewUploadDiDao.xml new file mode 100644 index 0000000..ebf826e --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/NewUploadDiDao.xml @@ -0,0 +1,65 @@ + + + + + + + + + + insert INTO basic_new_udi_upload + (relId, thirdSysFk, uploadStatus, uploadMsg, uploadCode, remark, updateTime, submitTime) + values (#{relId}, + #{thirdSysFk}, + #{uploadStatus}, + #{uploadMsg}, #{uploadCode}, #{remark}, #{updateTime}, #{submitTime}) + + + + + DELETE + FROM basic_new_udi_upload + WHERE id = #{id} + + + + UPDATE basic_new_udi_upload + + relId=#{relId}, + thirdSysFk=#{thirdSysFk}, + updateTime=#{updateTime}, + uploadStatus=#{uploadStatus}, + uploadMsg=#{uploadMsg}, + uploadCode=#{uploadCode}, + remark=#{remark}, + updateTime=#{updateTime}, + submitTime=#{submitTime}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/BasicProductSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/BasicProductSetDao.xml new file mode 100644 index 0000000..eed5edd --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/BasicProductSetDao.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + replace + INTO basic_product_set(parmName, + parmKey,enable,supSelect,supAdd,localAdd,remark,sort,localEdit) values + ( + #{parmName}, + #{parmKey}, + #{enable} , + #{supSelect}, + #{supAdd}, + #{localAdd}, + #{remark}, + #{sort}, + #{localEdit} + ) + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml index c851e3f..22eac00 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml @@ -102,7 +102,7 @@ ( code,`name`,measname,spec,registerNo,manufactory, cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms, - thirdSysFk,updateTime,supName,checkStatus,customerId + thirdSysFk,updateTime,supName,checkStatus,customerId,relId ) values ( @@ -126,7 +126,7 @@ #{updateTime}, #{supName}, #{checkStatus}, - #{customerId} + #{customerId},#{relId} ) @@ -135,7 +135,7 @@ ( code,name,measname,spec,registerNo,manufactory, cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms, - thirdSysFk,updateTime,supName,checkStatus,customerId + thirdSysFk,updateTime,supName,checkStatus,customerId,relId ) values @@ -150,7 +150,7 @@ #{item.manufactory}, #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm},#{item.sptm}, #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc},#{item.cpms}, - #{item.thirdSysFk},#{item.updateTime},#{item.supName}, #{tem.checkStatus}, #{tem.customerId} + #{item.thirdSysFk},#{item.updateTime},#{item.supName}, #{tem.checkStatus}, #{tem.customerId},#{item.relId} ) diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml index 3b49a31..0b11c5e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml @@ -5,7 +5,9 @@ insert into thr_products_add_di (uuid, customerId, createTime, auditTime, remark, auditUser, `status` - , thirdSysFk, code, sptm, ybbm, measname,manufactory,spmc,cpms + , thirdSysFk, code, sptm, ybbm, measname,manufactory,spmc,cpms,selectThridSysStr,price, + basicPrductRemak1,basicPrductRemak2,basicPrductRemak3,basicPrductRemak4, + basicPrductRemak5,basicPrductRemak6,basicPrductRemak7,basicPrductRemak8 ) values @@ -23,7 +25,10 @@ #{item.measname}, #{item.manufactory}, #{item.spmc}, - #{item.cpms}) + #{item.cpms},#{item.selectThridSysStr},#{item.price} + ,#{item.basicPrductRemak1},#{item.basicPrductRemak2},#{item.basicPrductRemak3},#{item.basicPrductRemak4} + ,#{item.basicPrductRemak5},#{item.basicPrductRemak6},#{item.basicPrductRemak7},#{item.basicPrductRemak8} + ) @@ -45,6 +50,16 @@ `spmc`=#{spmc}, `cpms`=#{cpms}, `status`=#{status}, + `price`=#{price}, + `basicPrductRemak1`=#{basicPrductRemak1}, + `basicPrductRemak2`=#{basicPrductRemak2}, + `basicPrductRemak3`=#{basicPrductRemak3}, + `basicPrductRemak4`=#{basicPrductRemak4}, + `basicPrductRemak5`=#{basicPrductRemak5}, + `basicPrductRemak6`=#{basicPrductRemak6}, + `basicPrductRemak7`=#{basicPrductRemak7}, + `basicPrductRemak8`=#{basicPrductRemak8}, + `selectThridSysStr`=#{selectThridSysStr}, WHERE id = #{id} @@ -58,16 +73,12 @@