From 90283eca68fb5b82ff2d8dde31033c858744fbc6 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 18 Mar 2022 21:43:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AEbug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/StockOrderDetailController.java | 24 ++-- .../controller/inout/WareHouseController.java | 128 +++++++++--------- .../dao/basic/CompanyProductRelevanceDao.java | 2 + .../admin/req/inout/OrderFilterRequest.java | 3 + .../basic/UdiRelevanceExportJsonResponse.java | 4 + .../impl/UdiInfoImportDetailServiceImpl.java | 30 ++-- .../mybatis/mapper/inout/CodesTempDao.xml | 2 +- 7 files changed, 105 insertions(+), 88 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index 921f6195..d48ed374 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -255,19 +255,17 @@ public class StockOrderDetailController { companyProductRelevanceRequest.setDiType(1); companyProductRelevanceRequest.setCustomerId(getCustomerId()); List companyProductRelevanceResponses = new ArrayList<>(); - if (companyProductRelevanceRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) { - FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); - filterUdiInfoRequest.setId(stockSelectDataEntity.getRelId()); - filterUdiInfoRequest.setDiType(1); - List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); - if (udiRelevanceResponses.size() > 0) { - CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse(); - BeanUtils.copyProperties(udiRelevanceResponses.get(0), companyProductRelevanceResponse); - companyProductRelevanceResponse.setRlId(udiRelevanceResponses.get(0).getId()); - companyProductRelevanceResponses.add(companyProductRelevanceResponse); - } - } else - companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setId(stockSelectDataEntity.getRelId()); + filterUdiInfoRequest.setDiType(1); + List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + if (udiRelevanceResponses.size() > 0) { + CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse(); + BeanUtils.copyProperties(udiRelevanceResponses.get(0), companyProductRelevanceResponse); + companyProductRelevanceResponse.setRlId(udiRelevanceResponses.get(0).getId()); + companyProductRelevanceResponses.add(companyProductRelevanceResponse); + } +// companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) { CompanyProductRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0); StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 823ba334..e86a0eff 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -320,77 +320,73 @@ public class WareHouseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - try { - String code = addOrderRequest.getCode(); - if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR); - UdiEntity udiEntity = FilterUdiUtils.getUdi(code); - if (udiEntity == null) - return ResultVOUtils.error(500, "UDI码格式错误!"); - String orderId = addOrderRequest.getOrderId(); - if (StringUtils.isBlank(orderId)) { - orderId = System.currentTimeMillis() + new Random().nextInt(10) + ""; - OrderEntity orderSaveRequest = new OrderEntity(); - orderSaveRequest.setId(orderId); - if (addOrderRequest.getActDate() != null) { - orderSaveRequest.setActDate(addOrderRequest.getActDate()); - } - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction()); - orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction()); - - orderSaveRequest.setLocStorageCode(addOrderRequest.getLocStorageCode()); - orderSaveRequest.setAction(addOrderRequest.getAction()); - orderSaveRequest.setActor(addOrderRequest.getActor()); - orderSaveRequest.setCorpOrderId(addOrderRequest.getCorpOrderId()); - orderSaveRequest.setFromCorpId(addOrderRequest.getFromCorpId()); - orderSaveRequest.setFromCorp(addOrderRequest.getFromCorp()); - orderSaveRequest.setFromType(ConstantStatus.FROM_WEBNEW); - orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); - orderSaveRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); - orderSaveRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); - orderSaveRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN); - orderService.insertOrder(orderSaveRequest); + String code = addOrderRequest.getCode(); + if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR); + UdiEntity udiEntity = FilterUdiUtils.getUdi(code); + if (udiEntity == null) + return ResultVOUtils.error(500, "UDI码格式错误!"); + String orderId = addOrderRequest.getOrderId(); + if (StringUtils.isBlank(orderId)) { + orderId = System.currentTimeMillis() + new Random().nextInt(10) + ""; + OrderEntity orderSaveRequest = new OrderEntity(); + orderSaveRequest.setId(orderId); + if (addOrderRequest.getActDate() != null) { + orderSaveRequest.setActDate(addOrderRequest.getActDate()); } - WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); - warehouseQueryRequest.setOrderId(orderId); - warehouseQueryRequest.setCode(code); - List warehouseEntitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest); - WarehouseEntity warehouseEntity = new WarehouseEntity(); - if (warehouseEntitys.size() > 0) { - warehouseEntity = warehouseEntitys.get(0); - warehouseEntity.setCount(warehouseEntity.getCount() + 1); - if (StringUtils.isBlank(warehouseEntity.getSerialNo())) { - codesTempService.updateById(warehouseEntity); - } else { - return ResultVOUtils.error(ResultEnum.DATA_REPEAT); - } + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction()); + orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction()); + + orderSaveRequest.setLocStorageCode(addOrderRequest.getLocStorageCode()); + orderSaveRequest.setAction(addOrderRequest.getAction()); + orderSaveRequest.setActor(addOrderRequest.getActor()); + orderSaveRequest.setCorpOrderId(addOrderRequest.getCorpOrderId()); + orderSaveRequest.setFromCorpId(addOrderRequest.getFromCorpId()); + orderSaveRequest.setFromCorp(addOrderRequest.getFromCorp()); + orderSaveRequest.setFromType(ConstantStatus.FROM_WEBNEW); + orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); + orderSaveRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); + orderSaveRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); + orderSaveRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN); + orderService.insertOrder(orderSaveRequest); + } + WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); + warehouseQueryRequest.setOrderId(orderId); + warehouseQueryRequest.setCode(code); + List warehouseEntitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest); + WarehouseEntity warehouseEntity = new WarehouseEntity(); + if (warehouseEntitys.size() > 0) { + warehouseEntity = warehouseEntitys.get(0); + warehouseEntity.setCount(warehouseEntity.getCount() + 1); + if (StringUtils.isBlank(warehouseEntity.getSerialNo())) { + codesTempService.updateById(warehouseEntity); } else { - warehouseEntity.setCode(code); - warehouseEntity.setOrderId(orderId); - warehouseEntity.setCorpOrderId(addOrderRequest.getCorpOrderId()); - warehouseEntity.setActDate(addOrderRequest.getActDate()); - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction()); - warehouseEntity.setMainAction(bussinessTypeEntity.getMainAction()); - warehouseEntity.setAction(addOrderRequest.getAction()); - warehouseEntity.setActor(addOrderRequest.getActor()); - warehouseEntity.setNameCode(udiEntity.getUdi()); - warehouseEntity.setFromCorpId(addOrderRequest.getFromCorpId()); - warehouseEntity.setFromCorp(addOrderRequest.getFromCorp()); - warehouseEntity.setBatchNo(udiEntity.getBatchNo()); - warehouseEntity.setProduceDate(udiEntity.getProduceDate()); - warehouseEntity.setExpireDate(udiEntity.getExpireDate()); - warehouseEntity.setLocStorageCode(addOrderRequest.getLocStorageCode()); - warehouseEntity.setSerialNo(udiEntity.getSerialNo()); - warehouseEntity.setCount(1); - List warehouseEntityList = new ArrayList<>(); - warehouseEntityList.add(warehouseEntity); - codesTempService.insertCodesTempSingle(warehouseEntity); + return ResultVOUtils.error(ResultEnum.DATA_REPEAT); } - - return ResultVOUtils.success(orderId); - } catch (Exception e) { - return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } else { + warehouseEntity.setCode(code); + warehouseEntity.setOrderId(orderId); + warehouseEntity.setCorpOrderId(addOrderRequest.getCorpOrderId()); + warehouseEntity.setActDate(addOrderRequest.getActDate()); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction()); + warehouseEntity.setMainAction(bussinessTypeEntity.getMainAction()); + warehouseEntity.setAction(addOrderRequest.getAction()); + warehouseEntity.setActor(addOrderRequest.getActor()); + warehouseEntity.setNameCode(udiEntity.getUdi()); + warehouseEntity.setFromCorpId(addOrderRequest.getFromCorpId()); + warehouseEntity.setFromCorp(addOrderRequest.getFromCorp()); + warehouseEntity.setBatchNo(udiEntity.getBatchNo()); + warehouseEntity.setProduceDate(udiEntity.getProduceDate()); + warehouseEntity.setExpireDate(udiEntity.getExpireDate()); + warehouseEntity.setLocStorageCode(addOrderRequest.getLocStorageCode()); + warehouseEntity.setSerialNo(udiEntity.getSerialNo()); + warehouseEntity.setCount(1); + List warehouseEntityList = new ArrayList<>(); + warehouseEntityList.add(warehouseEntity); + codesTempService.insertCodesTempSingle(warehouseEntity); } + return ResultVOUtils.success(orderId); + } //网页端数据上传调用接口 diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java index 6b95e17a..c1cb529b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java @@ -31,6 +31,8 @@ public interface CompanyProductRelevanceDao { boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity); + boolean importCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity); + boolean deleteById(String id); boolean deleteByRlId(String id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java index 9982f977..10ea61e7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java @@ -33,4 +33,7 @@ public class OrderFilterRequest extends ListPageRequest { private Integer userId; private String locStorageCode; + + private Integer unionCtrStatus; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceExportJsonResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceExportJsonResponse.java index 68d9bee9..fc83f90f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceExportJsonResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceExportJsonResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.res.basic; +import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; @@ -24,6 +25,9 @@ public class UdiRelevanceExportJsonResponse { public UdiRelevanceExportJsonResponse() { this.udiInfoEntities = new ArrayList<>(); this.udiRelevanceEntities = new ArrayList<>(); + this.companyProductRelevanceEntities = new ArrayList<>(); this.thrProductsEntities = new ArrayList<>(); } + + private List companyProductRelevanceEntities; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java index 772c3f0f..fc30c0cf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java @@ -2,19 +2,14 @@ package com.glxp.api.admin.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.basic.BasicUnitMaintainDao; -import com.glxp.api.admin.dao.basic.UdiInfoDao; -import com.glxp.api.admin.dao.basic.UdiInfoImportDetailDao; -import com.glxp.api.admin.dao.basic.UdiRelevanceDao; +import com.glxp.api.admin.dao.basic.*; import com.glxp.api.admin.dao.thrsys.ThrProductsDao; -import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.api.admin.service.basic.UdiInfoImportDetailService; +import com.glxp.api.admin.service.info.CompanyProductRelevanceService; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; @@ -85,6 +80,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic public void importJsonData(UdiRelevanceExportJsonResponse udiRelevanceExportJsonResponse) { if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) { + //基础表导入 SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) { try { @@ -102,6 +98,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic } + //关联表导入 if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiRelevanceEntities())) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); try { @@ -116,6 +113,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic // udiRelevanceDao.importUdiRelevance(udiRelevanceExportJsonResponse.getUdiRelevanceEntities()); } + //第三方产品信息导入 if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getThrProductsEntities())) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); @@ -131,5 +129,21 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic // thrProductsDao.importThrProductss(udiRelevanceExportJsonResponse.getThrProductsEntities()); } + + //供应商关联表导入 + if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getCompanyProductRelevanceEntities())) { + + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + try { + List companyProductRelevanceEntities = udiRelevanceExportJsonResponse.getCompanyProductRelevanceEntities(); + CompanyProductRelevanceDao mapper = batchSession.getMapper(CompanyProductRelevanceDao.class); + for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) { + mapper.importCompanyProductRelevance(companyProductRelevanceEntity); + } + batchSession.commit(); + } catch (Exception e) { + } + } + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml index d0acdb78..4ea3c839 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml @@ -50,7 +50,7 @@ #{produceDate}, #{expireDate}, #{serialNo}, - #{count}, #{nameCode}, #{relId}, #{status}, #{supId}, #{item.invStorageCode}, #{item.invWarehouseCode}, + #{count}, #{nameCode}, #{relId}, #{status}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode})