From d5a6e01714c7b52fd5a946130381f257111c69f0 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 2 Nov 2022 14:38:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E8=90=A5=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/admin/constant/Constant.java | 2 + .../api/admin/constant/ConstantStatus.java | 15 + .../basic/BussinessOriginTypeController.java | 1 + .../basic/BussinessTypeController.java | 2 - .../controller/basic/UdiInfoController.java | 11 +- .../basic/UdiRelevanceController.java | 15 +- .../business/StockOrderController.java | 85 ++-- .../business/StockOrderDetailController.java | 36 ++ .../controller/inout/OrderController.java | 3 + .../inout/OrderDetailController.java | 48 ++- .../controller/inout/WareHouseController.java | 2 +- .../inventory/InnerOrderController.java | 206 ++++++++++ .../purchase/PurApplyController.java | 81 +++- .../purchase/PurPlanController.java | 174 +++++++-- .../purchase/SupCertController.java | 151 +++++++ .../purchase/SupCertSetController.java | 76 ++++ .../purchase/SupCompanyController.java | 251 ++++++++++++ .../purchase/SupContactController.java | 63 +++ .../purchase/SupManufacturerController.java | 241 ++++++++++++ .../purchase/SupProductController.java | 367 ++++++++++++++++++ .../purchase/SupSalesmanController.java | 151 +++++++ .../dao/basic/CompanyProductRelevanceDao.java | 2 +- .../admin/dao/inventory/InnerOrderDao.java | 21 + .../dao/inventory/InnerOrderDetailDao.java | 25 ++ .../dao/inventory/InvPreInProductDao.java | 3 + .../dao/purchase/CompanySalesmanDao.java | 25 ++ .../dao/purchase/CompanyUpdateLogDao.java | 25 ++ .../admin/dao/purchase/CustomerContacDao.java | 25 ++ .../api/admin/dao/purchase/PurApplyDao.java | 3 +- .../api/admin/dao/purchase/PurPlanDao.java | 10 +- .../admin/dao/purchase/PurPlanDetailDao.java | 15 +- .../api/admin/dao/purchase/SupCertDao.java | 35 ++ .../api/admin/dao/purchase/SupCertSetDao.java | 19 + .../api/admin/dao/purchase/SupCompanyDao.java | 28 ++ .../dao/purchase/SupManufacturerDao.java | 24 ++ .../api/admin/dao/purchase/SupProductDao.java | 27 ++ .../basic/CompanyProductRelevanceEntity.java | 10 +- .../api/admin/entity/inout/OrderEntity.java | 3 + .../inventory/InnerOrderDetailEntity.java | 17 + .../entity/inventory/InnerOrderEntity.java | 22 ++ .../entity/inventory/InvProductEntity.java | 2 + .../purchase/CompanySalesmanEntity.java | 28 ++ .../purchase/CompanyUpdateLogEntity.java | 24 ++ .../purchase/CustomerContactEntity.java | 15 + .../admin/entity/purchase/PurApplyEntity.java | 2 + .../entity/purchase/PurPlanDetailEntity.java | 4 +- .../admin/entity/purchase/PurPlanEntity.java | 8 +- .../admin/entity/purchase/SupCertEntity.java | 34 ++ .../entity/purchase/SupCertSetEntity.java | 24 ++ .../entity/purchase/SupCompanyEntity.java | 80 ++++ .../purchase/SupManufacturerEntity.java | 40 ++ .../entity/purchase/SupProductEntity.java | 61 +++ .../admin/entity/thrsys/ThrOrderEntity.java | 2 + .../api/admin/req/info/CompanyRequest.java | 2 +- .../inventory/FilterStPrintTempRequest.java | 4 +- .../inventory/InnerOrderDetailRequest.java | 12 + .../req/inventory/InnerOrderRequest.java | 11 + .../req/inventory/PostInnerOrderRequest.java | 20 + .../CustomerContactFilterRequest.java | 10 + .../req/purchase/FilterCertSetsRequest.java | 12 + .../FilterCompanySalesmanRequest.java | 12 + .../FilterCompanyUpdateLogRequest.java | 15 + .../req/purchase/FilterPoductRequest.java | 20 + .../req/purchase/FilterSupCertRequest.java | 16 + .../req/purchase/FilterSupCompanyRequest.java | 18 + .../FilterSupManufacturerRequest.java | 16 + .../req/purchase/PostPurPlanRequest.java | 20 + .../req/purchase/PostSelCertRequest.java | 16 + .../admin/req/purchase/PurApplyRequest.java | 7 +- .../admin/req/purchase/PurPlanRequest.java | 2 +- .../req/purchase/SelectCorpBindRequest.java | 9 + .../purchase/SelectProductBindRequest.java | 13 + .../admin/res/basic/UdiRelevanceResponse.java | 1 + .../api/admin/res/inout/OrderNoResult.java | 7 + .../res/inventory/InvProductResponse.java | 2 +- .../admin/res/purchase/PurApplyResponse.java | 71 ++++ .../admin/res/purchase/PurPlanResponse.java | 69 ++++ .../res/purchase/SupProductResponse.java | 12 + .../impl/BasicUnitMaintainServiceImpl.java | 3 + .../info/CompanyProductRelevanceService.java | 2 +- .../CompanyProductRelevanceServiceImpl.java | 2 +- .../service/inout/impl/OrderServiceImpl.java | 3 + .../inventory/InnerOrderDetailService.java | 23 ++ .../service/inventory/InnerOrderService.java | 24 ++ .../InvPreInProductDetailService.java | 2 + .../inventory/InvPreInProductService.java | 2 + .../impl/InnerOrderDetailServiceImpl.java | 53 +++ .../inventory/impl/InnerOrderServiceImpl.java | 60 +++ .../InvPreInProductDetailServiceImpl.java | 10 +- .../impl/InvPreInProductServiceImpl.java | 6 + .../purchase/CompanySalesmanService.java | 24 ++ .../purchase/CompanyUpdateLogService.java | 24 ++ .../purchase/CustomerContactService.java | 23 ++ .../service/purchase/IPurApplyService.java | 3 +- .../purchase/IPurPlanDetailService.java | 10 +- .../service/purchase/IPurPlanService.java | 9 +- .../service/purchase/SupCertService.java | 35 ++ .../service/purchase/SupCertSetService.java | 20 + .../service/purchase/SupCompanyService.java | 29 ++ .../purchase/SupManufacturerService.java | 26 ++ .../service/purchase/SupProductService.java | 29 ++ .../impl/CompanySalesmanServiceImpl.java | 67 ++++ .../impl/CompanyUpdateLogServiceImpl.java | 67 ++++ .../impl/CustomerContactServiceImpl.java | 57 +++ .../purchase/impl/PurApplyServiceImpl.java | 5 +- .../impl/PurPlanDetailServiceImpl.java | 31 +- .../purchase/impl/PurPlanServiceImpl.java | 11 +- .../purchase/impl/SupCertServiceImpl.java | 117 ++++++ .../purchase/impl/SupCertSetServiceImpl.java | 48 +++ .../purchase/impl/SupCompanyServiceImpl.java | 83 ++++ .../impl/SupManufacturerServiceImpl.java | 72 ++++ .../purchase/impl/SupProductServiceImpl.java | 92 +++++ .../thread/CompanyProductsRelService.java | 4 +- .../admin/thread/InvProductsTrService.java | 180 ++++----- .../api/admin/thread/IoTransInoutService.java | 43 +- .../api/admin/thread/ThrOrdersDlService.java | 5 - .../api/admin/upload/DownloadController.java | 2 +- .../api/admin/upload/ImageController.java | 49 +++ .../main/resources/application-dev.properties | 2 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 13 +- .../mapper/business/StockOrderDetail.xml | 5 +- .../mybatis/mapper/inout/OrderDao.xml | 97 ++--- .../mapper/inventory/InnerOrderDao.xml | 70 ++++ .../mapper/inventory/InnerOrderDetailDao.xml | 80 ++++ .../mapper/inventory/InvPreInProductDao.xml | 17 +- .../mapper/inventory/InvPreProductDao.xml | 2 +- .../mapper/purchase/CompanySalesmanDao.xml | 91 +++++ .../mapper/purchase/CompanyUpdateLogDao.xml | 99 +++++ .../mapper/purchase/CustomerContactDao.xml | 62 +++ .../mybatis/mapper/purchase/PurApplyDao.xml | 30 +- .../mapper/purchase/PurApplyDetailDao.xml | 2 +- .../mybatis/mapper/purchase/PurPlanDao.xml | 34 +- .../mapper/purchase/PurPlanDetailDao.xml | 33 +- .../mybatis/mapper/purchase/SupCertDao.xml | 133 +++++++ .../mybatis/mapper/purchase/SupCertSetDao.xml | 60 +++ .../mybatis/mapper/purchase/SupCompanyDao.xml | 180 +++++++++ .../mapper/purchase/SupManufacturerDao.xml | 124 ++++++ .../mybatis/mapper/purchase/SupProductDao.xml | 162 ++++++++ 138 files changed, 5342 insertions(+), 350 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InnerOrderController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupSalesmanController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDetailDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanySalesmanDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanyUpdateLogDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupManufacturerDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupProductDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderDetailEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanySalesmanEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanyUpdateLogEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CustomerContactEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCompanyEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupManufacturerEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupProductEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderDetailRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostInnerOrderRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/CustomerContactFilterRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanySalesmanRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanyUpdateLogRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterPoductRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCertRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCompanyRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupManufacturerRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurPlanRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostSelCertRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectCorpBindRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectProductBindRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/purchase/SupProductResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderDetailService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderDetailServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanySalesmanService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanyUpdateLogService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupManufacturerService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupProductService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanySalesmanServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanyUpdateLogServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupManufacturerServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupProductServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/upload/ImageController.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDetailDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/purchase/CompanySalesmanDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/purchase/CompanyUpdateLogDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java b/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java index 633d2e14..c6fb3ec0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java @@ -14,6 +14,8 @@ public class Constant { public static final String LIN_YONG = "ML"; public static final String SG_ORDER = "SG"; public static final String JH_ORDER = "JH"; + public static final String NBM_ORDER = "NBM"; + public static final String dlThrProducts = "THR_DOWNLOAD_PRODUCTS"; public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS"; diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java index 73ecb26e..4aae4f5b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java @@ -155,4 +155,19 @@ public class ConstantStatus { public static final int APPLY_UN_AUDIT = 2;//未审核 public static final int APPLY_AUDIT_ED = 3;//已审核 + + //首营审核状态 //20:新增页面,21:审核页面,22:查询页面,23:审核通过，24：未审核或审核不通过的 + public static final int AUDIT_DRAFT = 0; //草稿 + public static final int AUDIT_PASS = 1; //审核通过 + public static final int AUDIT_REJECT = 2; //审核不通过 + public static final int AUDIT_CHANGE = 3; //申请变更 + public static final int AUDIT_CHANGE_PASS = 4; //申请变更通过 + public static final int AUDIT_CHANGE_REJECT = 5;//申请变更不通过 + public static final int AUDIT_UN = 6; //已提交未审核 + + public static final int CERT_COMPANY=1; //配送企业 + public static final int CERT_MANUFACTURER=2; //生产企业 + public static final int CERT_PRODUCT=3; //产品品种 + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java index 0931e078..09708421 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java @@ -102,6 +102,7 @@ public class BussinessOriginTypeController { if (exists) { return ResultVOUtils.error(500, "单据类型已存在！"); } + bussinessTypeEntity.setUpdateTime(new Date()); bussinessOriginTypeService.updateBusOriginType(bussinessTypeEntity); } else { ResultVOUtils.error(999, "参数错误"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java index f1cdbacb..10cf2554 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java @@ -64,8 +64,6 @@ public class BussinessTypeController { @Resource private BussinessLocalTypeService bussinessLocalTypeService; @Resource - private AuthAdminService authAdminService; - @Resource private OrderService orderService; @Resource CustomerService customerService; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java index ee6ddcbb..d3b3b5e8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.controller.basic; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.entity.basic.*; @@ -53,7 +54,7 @@ public class UdiInfoController { @GetMapping("udiwms/udiinfo/filterUdi") public BaseResponse filterUdi(FilterUdiInfoRequest filterUdiInfoRequest) { String nameCode; - if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().equals("")) { + if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode())) { UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode()); if (udiEntity != null) { nameCode = udiEntity.getUdi(); @@ -65,7 +66,11 @@ public class UdiInfoController { ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); BeanUtils.copyProperties(filterUdiInfoRequest, productInfoFilterRequest); - productInfoFilterRequest.setNameCode(nameCode); + if (StrUtil.isNotEmpty(nameCode)) { + productInfoFilterRequest.setNameCode(nameCode); + } else { + productInfoFilterRequest.setDiType("1"); + } try { BaseResponse> udiDlDeviceResponse = syncUdiService.filterUdi(productInfoFilterRequest); if (udiDlDeviceResponse.getCode() == 20000) { @@ -243,7 +248,7 @@ public class UdiInfoController { public BaseResponse saveProduct(@RequestBody ThrProductsEntity thrProductsEntity) { if (null == thrProductsEntity) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - thrProductsEntity.setThirdSysFk(thrProductsEntity.getThirdSys()); +// thrProductsEntity.setThirdSysFk(thrProductsEntity.getThirdSys()); thrProductsEntity.setUpdateTime(new Date()); thrProductsService.insertThrProducts(thrProductsEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index 2cc5d40f..1bd9a5c3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -135,18 +135,21 @@ public class UdiRelevanceController { } List udiRelevanceResponses = null; - if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) { - UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode()); - filterUdiInfoRequest.setNameCode(udiEntity.getUdi()); - + if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode()) || StrUtil.isNotEmpty(filterUdiInfoRequest.getUnionCode())) { + if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode())) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode()); + filterUdiInfoRequest.setNameCode(udiEntity.getUdi()); + } else if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUnionCode())) { + filterUdiInfoRequest.setNameCode(filterUdiInfoRequest.getUnionCode()); + } List temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); if (temps != null && temps.size() > 0) { filterUdiInfoRequest.setUuid(temps.get(0).getUuid()); filterUdiInfoRequest.setNameCode(null); } - } - //filterUdiInfoRequest.setDiType(1); + } else + filterUdiInfoRequest.setDiType(1); udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); PageInfo pageInfo; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java index fe83ad94..1f44e366 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java @@ -21,6 +21,7 @@ import com.glxp.api.admin.entity.inout.AcceptOrderEntity; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.inout.WarehouseUserEntity; +import com.glxp.api.admin.entity.inventory.InnerOrderEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.entity.inventory.StockPrintEntity; import com.glxp.api.admin.entity.inventory.StockPrinttREntity; @@ -31,8 +32,7 @@ import com.glxp.api.admin.req.business.StockOrderIdsRequest; import com.glxp.api.admin.req.business.StockOrderPostRequest; import com.glxp.api.admin.req.inout.AddStockOrderChangeRequest; import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.FilterInvUserRequest; -import com.glxp.api.admin.req.inventory.PostStockPrintRequest; +import com.glxp.api.admin.req.inventory.*; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.business.StockOrderExportResponse; @@ -54,6 +54,8 @@ import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.service.inout.CodesTempService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inout.WarehouseUserService; +import com.glxp.api.admin.service.inventory.InnerOrderDetailService; +import com.glxp.api.admin.service.inventory.InnerOrderService; import com.glxp.api.admin.service.inventory.InvStockPrintService; import com.glxp.api.admin.service.inventory.InvWarehouseService; import com.glxp.api.admin.util.*; @@ -532,7 +534,6 @@ public class StockOrderController { stockOrderIdsRequest.setIds(ids); } else return ResultVOUtils.error(ResultEnum.DATA_ERROR); - } StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); for (String id : stockOrderIdsRequest.getIds()) { @@ -550,8 +551,6 @@ public class StockOrderController { List stockPrintEntities = new ArrayList<>(); for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { if (stockOrderIdsRequest.isFilterUDIType()) { -// UdiInfoEntity udiInfoEntity = -// udiInfoService.findByNameCode(stockOrderDetailEntity.getProductId()); UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId()); if (udiRelevanceResponse != null && udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {//TODO udi过滤检测 StockPrintEntity stockPrintEntity = new StockPrintEntity(); @@ -592,24 +591,68 @@ public class StockOrderController { return ResultVOUtils.success("操作成功，生成中。"); } + + @Resource + InnerOrderService innerOrderService; + @Resource + InnerOrderDetailService innerOrderDetailService; + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/inner/order/generate/text") + public BaseResponse generateInnerOrderQRCodeText(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) { + + if (stockOrderIdsRequest.getIds() == null || stockOrderIdsRequest.getIds().size() < 1) { + if (stockOrderIdsRequest.getId() != null) { + List ids = new ArrayList<>(); + ids.add(stockOrderIdsRequest.getId()); + stockOrderIdsRequest.setIds(ids); + } else + return ResultVOUtils.error(ResultEnum.DATA_ERROR); + } + + for (String id : stockOrderIdsRequest.getIds()) { + InnerOrderEntity innerOrderEntity = innerOrderService.findByRecordKey(id); + if (innerOrderEntity == null) + continue; + stockPrintService.deleteByOrderId(innerOrderEntity.getRecordKey()); + InnerOrderDetailRequest innerOrderDetailRequest = new InnerOrderDetailRequest(); + innerOrderDetailRequest.setLimit(1000); + innerOrderDetailRequest.setPage(1); + innerOrderDetailRequest.setOrderIdFk(innerOrderEntity.getId() + ""); + + List stockOrderDetailEntityList = + innerOrderDetailService.joinQueryList(innerOrderDetailRequest); + + List stockPrintEntities = new ArrayList<>(); + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId()); + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + stockPrintEntity.setNameCode(udiRelevanceResponse.getNameCode()); + stockPrintEntity.setSOrderId(innerOrderEntity.getRecordKey()); + stockPrintEntity.setUpdateTime(new Date()); + stockPrintEntity.setUdiRlIdFk(udiRelevanceResponse.getId() + ""); + stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate()); + stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate()); + stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo()); + stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId()); + stockPrintEntity.setCount(stockOrderDetailEntity.getReCount()); + stockPrintEntities.add(stockPrintEntity); + } + + PostStockPrintRequest postStockPrintRequest = new PostStockPrintRequest(); + postStockPrintRequest.setDatas(stockPrintEntities); + if (stockPrintEntities.size() > 0) { + generateQRCodeText(postStockPrintRequest); + } + } + return ResultVOUtils.success("操作成功，生成中。"); + } + + private String generateQRCodeText(PostStockPrintRequest postStockPrintRequest) { String genKey = null; if (postStockPrintRequest != null) { -// InCodeLogEntity inCodeLogEntity = new InCodeLogEntity(); -// inCodeLogEntity.setFromType(IncodeStatus.FROM_THRSYS); -// inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); -// if (postStockPrintRequest.getGenKey() == null) { -// genKey = CustomUtil.getId(); -// inCodeLogEntity.setGenKey(genKey); -// } else { -// genKey = postStockPrintRequest.getGenKey(); -// inCodeLogEntity.setGenKey(postStockPrintRequest.getGenKey()); -// } -// inCodeLogEntity.setStatus(IncodeStatus.PROCESS); -// inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys()); -// inCodeLogService.insertInCodeLog(inCodeLogEntity); - List stockPrintEntities = postStockPrintRequest.getDatas(); if (stockPrintEntities != null && stockPrintEntities.size() > 0) { for (StockPrintEntity stockPrintEntity : stockPrintEntities) { @@ -621,8 +664,6 @@ public class StockOrderController { "#" + stockPrinttREntity.getBatchNo() + "#" + stockPrinttREntity.getSerialNo() + "#" + stockPrinttREntity.getWarehouseCode() + "#" + stockPrinttREntity.getSpaceCode(); stockPrintEntity.setUdiCode(udiCode); stockPrintService.insertStockPrint(stockPrintEntity); - - //-------------------------- StockQRCodeTextEntity stockQRCodeTextEntity = new StockQRCodeTextEntity(); stockQRCodeTextEntity.setOrderId(stockPrintEntity.getSOrderId()); stockQRCodeTextEntity.setDetailId(stockPrintEntity.getSDetailId()); @@ -634,8 +675,6 @@ public class StockOrderController { stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity); } } -// inCodeLogEntity.setStatus(IncodeStatus.FINISH); -// inCodeLogService.updateInCodeLog(inCodeLogEntity); } return genKey; } 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 2da47fdf..9bb322a8 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 @@ -324,6 +324,7 @@ public class StockOrderDetailController { stockOrderDetailEntity.setProductDate(stockSelectDataEntity.getProductDate()); stockOrderDetailEntity.setExpireDate(stockSelectDataEntity.getExpireDate()); stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory()); + stockOrderDetailEntity.setMeasname(udiInfoEntity.getMeasname()); stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); if (StrUtil.isNotEmpty(udiInfoEntity.getPrice())) { @@ -507,6 +508,41 @@ public class StockOrderDetailController { return ResultVOUtils.success(pageSimpleResponse); } + + @AuthRuleAnnotation("") + @GetMapping("/udiwms/inner/order/filterProduct") + public BaseResponse filterBasicProduct(FilterUdiInfoRequest filterUdiInfoRequest) { + String nameCode; + UdiEntity udiEntity; + if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) { + udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode()); + if (udiEntity != null) { + nameCode = udiEntity.getUdi(); + } else { + nameCode = filterUdiInfoRequest.getNameCode(); + } + filterUdiInfoRequest.setNameCode(nameCode); + } + + List temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + + + if (CollUtil.isNotEmpty(temps)) { + for (UdiRelevanceResponse udiRelevanceResponse : temps) { + udiRelevanceResponse.setRlId(udiRelevanceResponse.getId()); + } + } + + PageInfo pageInfo = new PageInfo<>(temps); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(temps); + return ResultVOUtils.success(pageSimpleResponse); + + + } + + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/copy") public BaseResponse uploadCount(@RequestParam("id") String id) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 084e0520..4421c951 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -279,6 +279,9 @@ public class OrderController { if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) { if (bussinessTypeEntity.isEntrutSpms()) { BaseResponse baseResponse = spsDirectClient.downloadOrder(orderFilterRequest.getOrderId(), userId + "", orderFilterRequest.getAction()); + if(baseResponse==null){ + return ResultVOUtils.error(500,"中继服务连接失败！"); + } return baseResponse; } else return ResultVOUtils.error(500, "单据未找到！"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index 6036b190..a36b3c45 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -14,6 +14,7 @@ import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; @@ -36,6 +37,7 @@ import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.inout.ErpOrderResponse; import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.basic.*; @@ -114,6 +116,9 @@ public class OrderDetailController { @Resource SpsDirectClient spsDirectClient; + @Resource + UdiRelevanceService udiRelevanceService; + @AuthRuleAnnotation("") @GetMapping("/spms/erpOrder/filter") @@ -264,13 +269,14 @@ public class OrderDetailController { List stockOrderDetailEntityList = new ArrayList<>(); for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); -// UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk()); -// -// if (udiRelevanceEntity == null) { -// return ResultVOUtils.error(500, "单据里含有未维护的产品信息，选入失败！"); -// } + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk()); + + if (udiRelevanceEntity == null) { + return ResultVOUtils.error(500, "单据里含有未维护的产品信息，选入失败！"); + } BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity); - stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId()); +// stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId()); + stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId()); stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount()); stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount()); stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId()); @@ -294,11 +300,11 @@ public class OrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - - if (filterErpOrderRequest.getIsDownThrSys()) { - BaseResponse> responseBaseResponse = erpOrderClient.getErpOrderResponse(filterErpOrderRequest); - return responseBaseResponse; - } +// +// if (filterErpOrderRequest.getIsDownThrSys()) { +// BaseResponse> responseBaseResponse = erpOrderClient.getErpOrderResponse(filterErpOrderRequest); +// return responseBaseResponse; +// } BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessOriginTypeService.findSysByAction(filterErpOrderRequest.getBillAction(), "orderQueryUrl"); @@ -505,10 +511,11 @@ public class OrderDetailController { ErpOrderEntity item = new ErpOrderEntity(); BeanUtils.copyProperties(erpOrderEntity, item); item.setCode(codeDetaiEntity.getCode()); - item.setCount(codeDetaiEntity.getCount()); + item.setCount(codeDetaiEntity.getCount() * getActCount(codeDetaiEntity, udiRelevanceService)); item.setReCount(codeDetaiEntity.getCount()); item.setErpCount(codeDetaiEntity.getCount()); item.setCodeId(codeDetaiEntity.getId().intValue()); + item.setSerialNo(codeDetaiEntity.getSerialNo()); resultList.add(item); } } @@ -703,4 +710,21 @@ public class OrderDetailController { } return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！"); } + + + public int getActCount(WarehouseEntity warehouseEntity, UdiRelevanceService udiRelevanceService) { + UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode()); + if (udiInfoBean != null) { + if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) { + if (udiInfoBean.getBhzxxsbzsl() == 0) + return udiInfoBean.getZxxsbzbhsydysl(); + else + return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl(); + } else { + return udiInfoBean.getBhzxxsbzsl(); + } + } + + return 1; + } } 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 6bcb7fb1..428574ba 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 @@ -646,7 +646,7 @@ public class WareHouseController { UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiEntity.getUdi()); if (!udiInfoEntity.isAllowNoBatch()) { if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { - return ResultVOUtils.error(500, "批次号不能为空！"); + return ResultVOUtils.error(500, "序列号与批次号不能同时为空！"); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InnerOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InnerOrderController.java new file mode 100644 index 00000000..33d87f4c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InnerOrderController.java @@ -0,0 +1,206 @@ +package com.glxp.api.admin.controller.inventory; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.annotation.RepeatSubmit; +import com.glxp.api.admin.constant.Constant; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity; +import com.glxp.api.admin.entity.inventory.InnerOrderEntity; +import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; +import com.glxp.api.admin.req.inventory.InnerOrderRequest; +import com.glxp.api.admin.req.inventory.PostInnerOrderRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.auth.CustomerService; +import com.glxp.api.admin.service.inventory.InnerOrderDetailService; +import com.glxp.api.admin.service.inventory.InnerOrderService; +import com.glxp.api.admin.util.GennerOrderUtils; +import com.glxp.api.admin.util.OrderNoTypeBean; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.constraints.NotEmpty; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * pur + * + * @author anthony.ywj + * @date 2022-10-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/inv/inner/order") +public class InnerOrderController { + + @Resource + InnerOrderService innerOrderService; + @Resource + InnerOrderDetailService innerOrderDetailService; + @Resource + CustomerService customerService; + @Resource + GennerOrderUtils gennerOrderUtils; + + /** + * 新增内部码打印单 + */ + @RepeatSubmit() + @AuthRuleAnnotation("") + @PostMapping("/postOrder") + public BaseResponse postOrder(@RequestBody PostInnerOrderRequest postInnerOrderRequest) { + + Integer userId = customerService.getUserId(); + InnerOrderEntity innerOrderEntity = postInnerOrderRequest.getInnerOrderEntity(); + innerOrderEntity.setCreateBy(userId + ""); + innerOrderEntity.setCreateTime(new Date()); + innerOrderEntity.setUpdateTime(new Date()); + innerOrderEntity.setStatus(postInnerOrderRequest.getEditStatus()); //草稿状态 + if (innerOrderEntity.getId() == null) { + String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.NBM_ORDER, "yyyyMMdd")); + innerOrderEntity.setRecordKey(billNo); + innerOrderEntity.setPrintStatus(1); + innerOrderEntity.setGenStatus(1); + innerOrderService.insert(innerOrderEntity); + } else { + innerOrderService.update(innerOrderEntity); + if (CollUtil.isNotEmpty(postInnerOrderRequest.getSubErpOrders())) { + innerOrderDetailService.deleteByOrderId(innerOrderEntity.getId() + ""); + } + } + if (CollUtil.isNotEmpty(postInnerOrderRequest.getSubErpOrders())) { + for (StockOrderDetailEntity stockOrderDetailEntity : postInnerOrderRequest.getSubErpOrders()) { + InnerOrderDetailEntity innerOrderDetailEntity = new InnerOrderDetailEntity(); + BeanUtils.copyProperties(stockOrderDetailEntity, innerOrderDetailEntity); + innerOrderDetailEntity.setOrderIdFk(innerOrderEntity.getId() + ""); + innerOrderDetailService.insert(innerOrderDetailEntity); + } + } + return ResultVOUtils.success("提交成功！"); + } + + + /** + * 查询内部码打印单列表 + */ + @GetMapping("/list") + public BaseResponse list(InnerOrderRequest innerOrderRequest) { + +// if (innerOrderRequest.getStatus() == null) { +// innerOrderRequest.setStatus(11); //查询未审核和草稿状态 +// } + + List innerOrderEntities = innerOrderService.queryPageList(innerOrderRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(innerOrderEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(innerOrderEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } + + + /** + * 新增内部码打印单 + */ + @RepeatSubmit() + @PostMapping() + public BaseResponse add(@RequestBody InnerOrderEntity innerOrderEntity) { + + innerOrderService.insert(innerOrderEntity); + return ResultVOUtils.success("新增成功！"); + } + + /** + * 修改内部码打印单 + */ + @RepeatSubmit() + @PutMapping() + public BaseResponse edit(@RequestBody InnerOrderEntity innerOrderEntity) { + innerOrderService.update(innerOrderEntity); + return ResultVOUtils.success("删除成功"); + } + + /** + * 删除内部码打印单 + * + * @param ids 主键串 + */ + @DeleteMapping("/{ids}") + public BaseResponse remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + List idArray = Arrays.asList(ids); + if (CollUtil.isNotEmpty(idArray)) { + innerOrderService.deleteByIds(idArray); + for (String id : idArray) { + innerOrderDetailService.deleteByOrderId(id + ""); + } + } + + + return ResultVOUtils.success("删除成功"); + } + + + /** + * 查询内部码打印单列表 + */ + @GetMapping("/list/detail") + public BaseResponse detailList(InnerOrderDetailRequest innerOrderDetailRequest) { + + List purApplyDetailEntities = innerOrderDetailService.joinQueryList(innerOrderDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purApplyDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(purApplyDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } + + /** + * 新增内部码打印单 + */ + @RepeatSubmit() + @PostMapping("/detail") + public BaseResponse detailAdd(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) { + + innerOrderDetailService.insert(innerOrderDetailEntity); + return ResultVOUtils.success("删除成功"); + } + + /** + * 修改内部码打印单 + */ + @RepeatSubmit() + @PutMapping("/detail") + public BaseResponse detailEdit(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) { + innerOrderDetailService.update(innerOrderDetailEntity); + return ResultVOUtils.success("删除成功"); + } + + /** + * 删除内部码打印单 + * + * @param ids 主键串 + */ + @DeleteMapping("/detail/{ids}") + public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + + innerOrderDetailService.deleteByIds(Arrays.asList(ids)); + return ResultVOUtils.success("删除成功"); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java index 6edbda83..49195950 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java @@ -13,6 +13,7 @@ import com.glxp.api.admin.req.purchase.PostPurApplyRequest; import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; import com.glxp.api.admin.req.purchase.PurApplyRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.purchase.PurApplyResponse; import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.purchase.IPurApplyDetailService; import com.glxp.api.admin.service.purchase.IPurApplyService; @@ -41,7 +42,6 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/purchase/apply") public class PurApplyController { @Resource @@ -60,7 +60,7 @@ public class PurApplyController { */ @RepeatSubmit() @AuthRuleAnnotation("") - @PostMapping("/postOrder") + @PostMapping("/purchase/apply/postOrder") public BaseResponse postOrder(@RequestBody PostPurApplyRequest postPurApplyRequest) { Integer userId = customerService.getUserId(); @@ -95,35 +95,79 @@ public class PurApplyController { /** * 查询申购单列表 */ - @GetMapping("/list") + @GetMapping("/purchase/apply/list") public BaseResponse list(PurApplyRequest purApplyRequest) { - List purApplyEntities = purApplyService.queryPageList(purApplyRequest); - PageInfo pageInfo; + if (purApplyRequest.getStatus() == null) { + purApplyRequest.setStatus(11); //查询未审核和草稿状态 + } + + List purApplyEntities = purApplyService.queryPageList(purApplyRequest); + PageInfo pageInfo; pageInfo = new PageInfo<>(purApplyEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); return ResultVOUtils.success(pageSimpleResponse); } + + /** + * 查询申购单列表 + */ + @GetMapping("/purchase/apply/auditList") + public BaseResponse auditList(PurApplyRequest purApplyRequest) { + + if (purApplyRequest.getStatus() == null) { + purApplyRequest.setStatus(10); //查询未审核和已审核状态 + } + + List purApplyEntities = purApplyService.queryPageList(purApplyRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purApplyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(purApplyEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } + + + /** + * 审核申购单 + */ + @RepeatSubmit() + @PostMapping("/purchase/apply/auditOrder") + public BaseResponse auditOrder(@RequestBody PurApplyRequest purApplyRequest) { + + PurApplyEntity purApplyEntity = new PurApplyEntity(); + BeanUtils.copyProperties(purApplyRequest, purApplyEntity); + purApplyService.update(purApplyEntity); + + + //审核通过后转换成采购计划单 + + return ResultVOUtils.success("更新成功！"); + } + + /** * 新增申购单 */ @RepeatSubmit() - @PostMapping() + @PostMapping("/purchase/apply") public BaseResponse add(@RequestBody PurApplyEntity purApplyRequest) { purApplyService.insert(purApplyRequest); - return ResultVOUtils.success("删除成功"); + return ResultVOUtils.success("新增成功！"); } /** * 修改申购单 */ @RepeatSubmit() - @PutMapping() + @PutMapping("/purchase/apply") public BaseResponse edit(@RequestBody PurApplyEntity purApplyRequest) { purApplyService.update(purApplyRequest); return ResultVOUtils.success("删除成功"); @@ -134,11 +178,18 @@ public class PurApplyController { * * @param ids 主键串 */ - @DeleteMapping("/{ids}") + @DeleteMapping("/purchase/apply/{ids}") public BaseResponse remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + List idArray = Arrays.asList(ids); + if (CollUtil.isNotEmpty(idArray)) { + purApplyService.deleteByIds(idArray); + for (Long id : idArray) { + purApplyDetailService.deleteByOrderId(id + ""); + } + } + - purApplyService.deleteByIds(Arrays.asList(ids)); return ResultVOUtils.success("删除成功"); } @@ -146,7 +197,7 @@ public class PurApplyController { /** * 查询申购单列表 */ - @GetMapping("/list/detail") + @GetMapping("/purchase/apply/list/detail") public BaseResponse detailList(PurApplyDetailRequest purApplyDetailRequest) { List purApplyDetailEntities = purApplyDetailService.joinQueryList(purApplyDetailRequest); @@ -163,7 +214,7 @@ public class PurApplyController { * 新增申购单 */ @RepeatSubmit() - @PostMapping("/detail") + @PostMapping("/purchase/apply/detail") public BaseResponse detailAdd(@RequestBody PurApplyDetailEntity purApplyDetailRequest) { purApplyDetailService.insert(purApplyDetailRequest); @@ -174,7 +225,7 @@ public class PurApplyController { * 修改申购单 */ @RepeatSubmit() - @PutMapping("/detail") + @PutMapping("/purchase/apply/detail") public BaseResponse detailEdit(@RequestBody PurApplyDetailEntity purApplyDetailRequest) { purApplyDetailService.update(purApplyDetailRequest); return ResultVOUtils.success("删除成功"); @@ -185,7 +236,7 @@ public class PurApplyController { * * @param ids 主键串 */ - @DeleteMapping("/detail/{ids}") + @DeleteMapping("/purchase/apply/detail/{ids}") public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java index fb1188dd..e8f0cdca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java @@ -1,25 +1,34 @@ package com.glxp.api.admin.controller.purchase; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.annotation.RepeatSubmit; -import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.admin.constant.Constant; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; import com.glxp.api.admin.entity.purchase.PurPlanEntity; -import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; +import com.glxp.api.admin.req.purchase.PostPurPlanRequest; import com.glxp.api.admin.req.purchase.PurPlanDetailRequest; import com.glxp.api.admin.req.purchase.PurPlanRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.purchase.PurPlanResponse; +import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.purchase.IPurPlanDetailService; import com.glxp.api.admin.service.purchase.IPurPlanService; +import com.glxp.api.admin.util.GennerOrderUtils; +import com.glxp.api.admin.util.OrderNoTypeBean; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; import java.util.Arrays; +import java.util.Date; import java.util.List; @@ -35,21 +44,88 @@ import java.util.List; @RequestMapping("/purchase/plan") public class PurPlanController { + @Resource IPurPlanService purPlanService; @Resource IPurPlanDetailService purPlanDetailService; + @Resource + CustomerService customerService; + @Resource + GennerOrderUtils gennerOrderUtils; + + /** + * 新增采购计划 + */ + @RepeatSubmit() + @AuthRuleAnnotation("") + @PostMapping("/postOrder") + public BaseResponse postOrder(@RequestBody PostPurPlanRequest postPurPlanRequest) { + + Integer userId = customerService.getUserId(); + PurPlanEntity purApplyEntity = postPurPlanRequest.getPurPlanEntity(); + purApplyEntity.setCreateBy(userId + ""); + purApplyEntity.setCreateTime(new Date()); + purApplyEntity.setUpdateTime(new Date()); + purApplyEntity.setStatus(postPurPlanRequest.getEditStatus()); //草稿状态 + if (purApplyEntity.getId() == null) { + String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")); + purApplyEntity.setBillNo(billNo); + purPlanService.insert(purApplyEntity); + } else { + purPlanService.update(purApplyEntity); + if (CollUtil.isNotEmpty(postPurPlanRequest.getSubErpOrders())) { + purPlanDetailService.deleteByOrderId(purApplyEntity.getId() + ""); + } + } + if (CollUtil.isNotEmpty(postPurPlanRequest.getSubErpOrders())) { + for (StockOrderDetailEntity stockOrderDetailEntity : postPurPlanRequest.getSubErpOrders()) { + PurPlanDetailEntity purApplyDetailEntity = new PurPlanDetailEntity(); + BeanUtils.copyProperties(stockOrderDetailEntity, purApplyDetailEntity); + purApplyDetailEntity.setOrderIdFk(purApplyEntity.getId() + ""); + purPlanDetailService.insert(purApplyDetailEntity); + } + } + + return ResultVOUtils.success("提交成功！"); + } + + /** - * 查询申购单列表 + * 查询采购计划列表 */ @GetMapping("/list") - public BaseResponse list(PurPlanRequest purPlanRequest) { + public BaseResponse list(PurPlanRequest purApplyRequest) { + + if (purApplyRequest.getStatus() == null) { + purApplyRequest.setStatus(11); //查询未审核和草稿状态 + } + + List purApplyEntities = purPlanService.queryPageList(purApplyRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purApplyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(purApplyEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } - List purApplyEntities = purPlanService.queryPageList(purPlanRequest); - PageInfo pageInfo; + + /** + * 查询采购计划列表 + */ + @GetMapping("/auditList") + public BaseResponse auditList(PurPlanRequest purApplyRequest) { + + if (purApplyRequest.getStatus() == null) { + purApplyRequest.setStatus(10); //查询未审核和已审核状态 + } + List purApplyEntities = purPlanService.queryPageList(purApplyRequest); + PageInfo pageInfo; pageInfo = new PageInfo<>(purApplyEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); return ResultVOUtils.success(pageSimpleResponse); @@ -58,78 +134,103 @@ public class PurPlanController { /** - * 新增申购单 + * 审核采购计划 + */ + @RepeatSubmit() + @PostMapping("/auditOrder") + public BaseResponse auditOrder(@RequestBody PurPlanRequest purApplyRequest) { + + PurPlanEntity purApplyEntity = new PurPlanEntity(); + BeanUtils.copyProperties(purApplyRequest, purApplyEntity); + purPlanService.update(purApplyEntity); + return ResultVOUtils.success("更新成功！"); + } + + + /** + * 新增采购计划 */ @RepeatSubmit() @PostMapping() - public BaseResponse add(@RequestBody PurPlanRequest purApplyRequest) { + public BaseResponse add(@RequestBody PurPlanEntity purApplyRequest) { purPlanService.insert(purApplyRequest); - return ResultVOUtils.success("删除成功"); + return ResultVOUtils.success("新增成功！"); } /** - * 修改申购单 + * 修改采购计划 */ @RepeatSubmit() @PutMapping() - public BaseResponse edit(@RequestBody PurPlanRequest purApplyRequest) { + public BaseResponse edit(@RequestBody PurPlanEntity purApplyRequest) { purPlanService.update(purApplyRequest); return ResultVOUtils.success("删除成功"); } - /** - * 删除申购单 - * - * @param ids 主键串 - */ - @DeleteMapping("/{ids}") - public BaseResponse remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - - purPlanService.deleteByIds(Arrays.asList(ids)); - return ResultVOUtils.success("删除成功"); - } /** - * 查询申购单列表 + * 查询采购计划列表 */ @GetMapping("/list/detail") - public BaseResponse detailList(PurPlanDetailRequest purPlanDetailRequest) { + public BaseResponse detailList(PurPlanDetailRequest purApplyDetailRequest) { - List purApplyDetailEntities = purPlanDetailService.queryPageList(purPlanDetailRequest); - PageInfo pageInfo; + List purApplyDetailEntities = purPlanDetailService.joinQueryList(purApplyDetailRequest); + PageInfo pageInfo; pageInfo = new PageInfo<>(purApplyDetailEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyDetailEntities); return ResultVOUtils.success(pageSimpleResponse); } + /** - * 新增申购单 + * 删除采购计划 + * + * @param ids 主键串 + */ + @DeleteMapping("/{ids}") + public BaseResponse remove(@NotEmpty(message = "主键不能为空") + @PathVariable Integer[] ids) { + + + List idArray = Arrays.asList(ids); + if (CollUtil.isNotEmpty(idArray)) { + purPlanService.deleteByIds(idArray); + for (Integer id : idArray) { + purPlanDetailService.deleteByOrderId(id + ""); + } + } + return ResultVOUtils.success("删除成功"); + + } + + + /** + * 新增采购计划 */ @RepeatSubmit() @PostMapping("/detail") - public BaseResponse detailAdd(@RequestBody PurPlanDetailRequest purPlanDetailRequest) { + public BaseResponse detailAdd(@RequestBody PurPlanDetailEntity purPlanDetailRequest) { purPlanDetailService.insert(purPlanDetailRequest); - return ResultVOUtils.success("删除成功"); + return ResultVOUtils.success("新增成功"); } /** - * 修改申购单 + * 修改采购计划 */ @RepeatSubmit() @PutMapping("/detail") - public BaseResponse detailEdit(@RequestBody PurPlanDetailRequest purPlanDetailRequest) { + public BaseResponse detailEdit(@RequestBody PurPlanDetailEntity purPlanDetailRequest) { purPlanDetailService.update(purPlanDetailRequest); - return ResultVOUtils.success("删除成功"); + return ResultVOUtils.success("修改成功"); } /** - * 删除申购单 + * 删除采购计划 * * @param ids 主键串 */ @@ -141,4 +242,5 @@ public class PurPlanController { return ResultVOUtils.success("删除成功"); } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertController.java new file mode 100644 index 00000000..87d66282 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertController.java @@ -0,0 +1,151 @@ +package com.glxp.api.admin.controller.purchase; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.purchase.SupCertEntity; +import com.glxp.api.admin.entity.purchase.SupCertSetEntity; +import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.admin.req.info.CompanyRequest; +import com.glxp.api.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.api.admin.req.purchase.FilterSupCertRequest; +import com.glxp.api.admin.req.purchase.PostSelCertRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.admin.service.purchase.SupCertService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.validation.BindingResult; +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 org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class SupCertController { + @Resource + private AuthAdminService authAdminService; + @Resource + private SupCertService supCertService; + + @Value("${file_path}") + private String filePath; + + @AuthRuleAnnotation("") + @GetMapping("/sup/company/cert/filter") + public BaseResponse filterCompanyCert(FilterSupCertRequest filterSupCertRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List supCertEntityList + = supCertService.filterCompanyCert(filterSupCertRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(supCertEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(supCertEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/info/selectAllCert") + public BaseResponse selectAllCert(@RequestBody PostSelCertRequest postSelCertRequest) { + String customerId = getCustomerId(); + if (CollUtil.isEmpty(postSelCertRequest.getSupCertSetEntities())) { + return ResultVOUtils.error(500, "请选入资质证书！"); + } + if (postSelCertRequest.getCertType() == null) { + return ResultVOUtils.error(500, "参数错误！"); + } + for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { + SupCertEntity supCertEntity = new SupCertEntity(); + supCertEntity.setName(supCertSetEntity.getName()); + supCertEntity.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk()); + supCertEntity.setProductIdFk(postSelCertRequest.getProductIdFk()); + supCertEntity.setCustomerId(customerId); + supCertEntity.setType(postSelCertRequest.getCertType()); + supCertEntity.setCreateTime(new Date()); + supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT); + supCertEntity.setUpdateTime(new Date()); + boolean b = supCertService.insertCompanyCert(supCertEntity); + } + return ResultVOUtils.success("成功"); + } + + + @AuthRuleAnnotation("") + @GetMapping("/sale/info/getCompanyCert") + public BaseResponse getCompanyCert(FilterSupCertRequest filterSupCertRequest) { + filterSupCertRequest.setCustomerId(getCustomerId()); + List companyCertEntities = supCertService.getCompanyCert(filterSupCertRequest); + PageInfo pageInfo = new PageInfo<>(companyCertEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyCertEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/info/insertCompanyCert") + public BaseResponse insertCompanyCert(@RequestBody SupCertEntity supCertEntity) { + supCertEntity.setCreateTime(new Date()); + supCertEntity.setUpdateTime(new Date()); + boolean b = supCertService.insertCompanyCert(supCertEntity); + return ResultVOUtils.success("成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sale/sup/cert/audit") + public BaseResponse auditSupCert(@RequestBody SupCertEntity supCertEntity) { + supCertEntity.setCreateTime(new Date()); + supCertEntity.setUpdateTime(new Date()); + boolean b = supCertService.updateCompanyCert(supCertEntity); + return ResultVOUtils.success("成功"); + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/info/updateCompanyCert") + public BaseResponse updateCompanyCert(@RequestBody SupCertEntity supCertEntity) { + + boolean b = supCertService.updateCompanyCert(supCertEntity); + return ResultVOUtils.success("修改成功"); + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/info/deleteCompanyCert") + public BaseResponse deleteCompanyCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { + boolean b = supCertService.deleteById(deleteCompanyFileRequest.getId()); + String URL = filePath + "/register/file/image2/" + deleteCompanyFileRequest.getFilePath(); + File file = new File(URL); + if (file.exists() && file.isFile()) { + file.delete(); + } + return ResultVOUtils.success("成功"); + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java new file mode 100644 index 00000000..4d009de4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java @@ -0,0 +1,76 @@ +package com.glxp.api.admin.controller.purchase; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.purchase.SupCertSetEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.purchase.SupCertSetService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +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.Date; +import java.util.List; + +@RestController +public class SupCertSetController { + + @Resource + private SupCertSetService supCertSetService; + + + @AuthRuleAnnotation("") + @GetMapping("/sup/cert/set/filter") + public BaseResponse filterCertSet(FilterCertSetsRequest filterCertSetsRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List supCertEntityList + = supCertSetService.filterCertSets(filterCertSetsRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(supCertEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(supCertEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/cert/set/add") + public BaseResponse addCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { + if (supCertSetEntity == null) { + supCertSetEntity = new SupCertSetEntity(); + } + supCertSetEntity.setUpdateTime(new Date()); + boolean b = supCertSetService.insertCertSet(supCertSetEntity); + return ResultVOUtils.success("添加成功！"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/cert/set/update") + public BaseResponse updateCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { + + boolean b = supCertSetService.updateCertSet(supCertSetEntity); + return ResultVOUtils.success("修改成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/cert/set/delete") + public BaseResponse deleteCertSet(@RequestBody DeleteRequest deleteRequest) { + + boolean b = supCertSetService.deleteById(deleteRequest.getId()); + return ResultVOUtils.success("删除成功！"); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java new file mode 100644 index 00000000..4301cfb9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java @@ -0,0 +1,251 @@ +package com.glxp.api.admin.controller.purchase; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.pinyin.PinyinUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.entity.purchase.CustomerContactEntity; +import com.glxp.api.admin.entity.purchase.SupCertEntity; +import com.glxp.api.admin.entity.purchase.SupCertSetEntity; +import com.glxp.api.admin.entity.purchase.SupCompanyEntity; +import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; +import com.glxp.api.admin.req.purchase.FilterSupCertRequest; +import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; +import com.glxp.api.admin.req.purchase.SelectCorpBindRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.admin.service.basic.BasicUnitMaintainService; +import com.glxp.api.admin.service.purchase.SupCertService; +import com.glxp.api.admin.service.purchase.CustomerContactService; +import com.glxp.api.admin.service.purchase.SupCertSetService; +import com.glxp.api.admin.service.purchase.SupCompanyService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +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 org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; +import java.util.ListIterator; + +@RestController +public class SupCompanyController { + + @Value("${file_path}") + private String filePath; + + @Resource + private AuthAdminService authAdminService; + @Resource + private SupCompanyService companyService; + @Resource + private CustomerContactService customerContactService; + @Resource + private SupCertService supCertService; + @Resource + BasicUnitMaintainService basicUnitMaintainService; + @Resource + SupCertSetService supCertSetService; + + @AuthRuleAnnotation("") + @GetMapping("/api/pur/getSupComapnys") + public BaseResponse getSupComapnys(FilterSupCompanyRequest companyRequest) { + List companyEntities = companyService.filterCompany(companyRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @AuthRuleAnnotation("") + @PostMapping("/api/pur/addCompany") + public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) { + + String customerId = CustomUtil.getId(); //重新生成customerId + CustomerContactEntity customerContactEntity = new CustomerContactEntity(); + customerContactEntity.setTel(companyEntity.getTel()); + customerContactEntity.setMobile(companyEntity.getMobile()); + customerContactEntity.setEmail(companyEntity.getEmail()); + customerContactEntity.setContacts(companyEntity.getContacts()); + customerContactEntity.setCustomerId(customerId); + customerContactService.insertCustomerContact(customerContactEntity); + //更新相关证书对应的customerId + supCertService.updateCustomerId(companyEntity.getCustomerId(), customerId); + companyEntity.setCustomerId(customerId); + + companyEntity.setCreateTime(new Date()); + companyEntity.setUpdateTime(new Date()); + AuthAdmin authAdmin = getUser(); + companyEntity.setCreateBy(authAdmin.getId() + ""); + boolean b = companyService.insertCompany(companyEntity); + return ResultVOUtils.success("修改成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/api/pur/modifyCompany") + public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) { + if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + //提交审核 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + List supCertEntityList = supCertService.findAll(companyEntity.getCustomerId()); + //验证 + ListIterator iterable = supCertSetEntities.listIterator(); + while (iterable.hasNext()) { + SupCertSetEntity supCertSetEntity = iterable.next(); + if (supCertSetEntity.isNeed()) { + for (SupCertEntity supCertEntity : supCertEntityList) { + if (supCertEntity.getName().equals(supCertSetEntity.getName())) { + if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) { + iterable.remove(); + break; + } + } + } + } + + } + String errMsg = ""; + if (supCertSetEntities.size() > 0) { + for (SupCertSetEntity supCertSetEntity : supCertSetEntities) { + errMsg = errMsg + "," + supCertSetEntity.getName(); + } + return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); + } + } + + + companyEntity.setUpdateTime(new Date()); + boolean b = companyService.modifyCompany(companyEntity); + CustomerContactEntity customerContactEntity = new CustomerContactEntity(); + customerContactEntity.setTel(companyEntity.getTel()); + customerContactEntity.setMobile(companyEntity.getMobile()); + customerContactEntity.setEmail(companyEntity.getEmail()); + customerContactEntity.setContacts(companyEntity.getContacts()); + customerContactEntity.setCustomerId(companyEntity.getCustomerId()); + customerContactService.updateCustomerContact(customerContactEntity); + return ResultVOUtils.success("修改成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/api/pur/auditCompany") + public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) { + + + //查询是否包含审核未通过的证书 + if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS + || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setAuditStatus(24); + filterSupCertRequest.setCustomerId(companyEntity.getCustomerId()); + filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + if (CollUtil.isNotEmpty(supCertEntityList)) { + for (SupCertEntity supCertEntity : supCertEntityList) { + supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS); + supCertService.updateCompanyCert(supCertEntity); + } +// return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); + } + } + + + AuthAdmin authAdmin = getUser(); + companyEntity.setAuditor(authAdmin.getId() + ""); + companyEntity.setAuditTime(new Date()); + companyEntity.setUpdateTime(new Date()); + boolean b = companyService.modifyCompany(companyEntity); + CustomerContactEntity customerContactEntity = new CustomerContactEntity(); + customerContactEntity.setTel(companyEntity.getTel()); + customerContactEntity.setMobile(companyEntity.getMobile()); + customerContactEntity.setEmail(companyEntity.getEmail()); + customerContactEntity.setContacts(companyEntity.getContacts()); + customerContactEntity.setCustomerId(companyEntity.getCustomerId()); + customerContactService.updateCustomerContact(customerContactEntity); + + BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); + basicUnitMaintainEntity.setErpId(companyEntity.getCustomerId()); + basicUnitMaintainEntity.setName(companyEntity.getCompanyName()); + basicUnitMaintainEntity.setSpell(PinyinUtil.getFirstLetter(companyEntity.getCompanyName(), "")); + basicUnitMaintainEntity.setAddr(companyEntity.getArea() + companyEntity.getDetailAddr()); + basicUnitMaintainEntity.setCreditNo(companyEntity.getCreditNum()); + basicUnitMaintainEntity.setContact(companyEntity.getContacts()); + basicUnitMaintainEntity.setMobile(companyEntity.getMobile()); + basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP); + basicUnitMaintainEntity.setUpdateTime(new Date()); + basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + + return ResultVOUtils.success("修改成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/company/selectBind") + public BaseResponse selectBind(@RequestBody SelectCorpBindRequest selectCorpBindRequest) { + + BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(selectCorpBindRequest.getCustomerId()); + SupCompanyEntity supCompanyEntity = new SupCompanyEntity(); + supCompanyEntity.setCustomerId(basicUnitMaintainEntity.getErpId()); + supCompanyEntity.setCompanyName(basicUnitMaintainEntity.getName()); + supCompanyEntity.setCreditNum(basicUnitMaintainEntity.getCreditNo()); + supCompanyEntity.setContacts(basicUnitMaintainEntity.getContact()); + supCompanyEntity.setTel(basicUnitMaintainEntity.getMobile()); + + return ResultVOUtils.success(supCompanyEntity); + } + + + @AuthRuleAnnotation("") + @PostMapping("api/pur/supCompany/delete") + public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) { + boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId())); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } + + public AuthAdmin getUser() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java new file mode 100644 index 00000000..e1754c63 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java @@ -0,0 +1,63 @@ +package com.glxp.api.admin.controller.purchase; + + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.purchase.CustomerContactEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.purchase.CustomerContactService; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@Slf4j +public class SupContactController { + + @Resource + private CustomerContactService customerContactService; + + @AuthRuleAnnotation("") + @GetMapping("salewarehouse/customerContact/list") + public BaseResponse filterList(CustomerContactFilterRequest customerFilterRequest) { + List customerContactEntityList = customerContactService.filterCustomerContact(customerFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(customerContactEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(customerContactEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @GetMapping("salewarehouse/customerContact/add") + public BaseResponse addContact(CustomerContactEntity customerContactEntity) { + + boolean b = customerContactService.insertCustomerContact(customerContactEntity); + if (b) + return ResultVOUtils.success("添加成功"); + else { + return ResultVOUtils.error(500, "添加失败"); + } + + } + + @AuthRuleAnnotation("") + @GetMapping("salewarehouse/customerContact/delete") + public BaseResponse deleteContact(DeleteRequest deleteRequest) { + boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId())); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java new file mode 100644 index 00000000..879685d7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java @@ -0,0 +1,241 @@ +package com.glxp.api.admin.controller.purchase; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.purchase.SupCertEntity; +import com.glxp.api.admin.entity.purchase.SupCertSetEntity; +import com.glxp.api.admin.entity.purchase.SupCompanyEntity; +import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; +import com.glxp.api.admin.req.purchase.FilterSupCertRequest; +import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.admin.service.purchase.SupCertService; +import com.glxp.api.admin.service.purchase.SupCertSetService; +import com.glxp.api.admin.service.purchase.SupCompanyService; +import com.glxp.api.admin.service.purchase.SupManufacturerService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.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 org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; +import java.util.ListIterator; + +@RestController +public class SupManufacturerController { + + + @Resource + private AuthAdminService authAdminService; + @Resource + private SupManufacturerService supManufacturerService; + @Resource + private SupCertService supCertService; + @Resource + private SupCompanyService supCompanyService; + @Resource + SupCertSetService supCertSetService; + + + @AuthRuleAnnotation("") + @GetMapping("/sup/manufacturer/getCompanyInfo") + public BaseResponse getCompanyInfo(FilterSupManufacturerRequest filterSupManufacturerRequest) { + SupManufacturerEntity supManufacturerEntity = supManufacturerService.findCompany(filterSupManufacturerRequest.getId()); + if (supManufacturerEntity != null) { + return ResultVOUtils.success(supManufacturerEntity); + } + return ResultVOUtils.error(500, "企业信息为空"); + } + + @AuthRuleAnnotation("") + @GetMapping("/sup/manufacturer/getCompanyList") + public BaseResponse getCompanyList(FilterSupManufacturerRequest filterSupManufacturerRequest) { + List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @GetMapping("/sup/manufacturer/getCompanyBySup") + public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) { + filterSupManufacturerRequest.setCustomerId(getCustomerId()); + List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/manufacturer/addCompany") + public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { + supManufacturerEntity.setCreateDate(new Date()); + supManufacturerEntity.setUpdateDate(new Date()); + boolean b = supManufacturerService.insertCompany(supManufacturerEntity); + if (b) { + return ResultVOUtils.success("添加成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/manufacturer/modifyCompany") + public BaseResponse modifyCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { + + if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { + return ResultVOUtils.error(500, "参数错误！"); + } + //提交审核 + if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + //判断是否上级供应商是否审核通过 + SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supManufacturerEntity.getCustomerId()); + if (supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN + || supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) { + return ResultVOUtils.error(500, "所属配送企业资质未通过审核，暂时无法提交！"); + } + + //验证证书是否齐全 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + List supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); + ListIterator iterable = supCertSetEntities.listIterator(); + while (iterable.hasNext()) { + SupCertSetEntity supCertSetEntity = iterable.next(); + + if (supCertSetEntity.isNeed() + || + (!supCertSetEntity.isNeed() && + supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2 + && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) + + || + (!supCertSetEntity.isNeed() + && supCertSetEntity.getForeign() != null + && supCertSetEntity.getForeign() == 1 + && supManufacturerEntity.getCompanyType().equals("1"))) { + for (SupCertEntity supCertEntity : supCertEntityList) { + + if (supCertEntity.getName().equals(supCertSetEntity.getName())) { + if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) { + iterable.remove(); + break; + } + } + } + } else { + iterable.remove(); + } + + + } + String errMsg = ""; + if (supCertSetEntities.size() > 0) { + for (SupCertSetEntity supCertSetEntity : supCertSetEntities) { + errMsg = errMsg + "," + supCertSetEntity.getName(); + } + return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); + } + + + } + + + supManufacturerEntity.setUpdateDate(new Date()); + SupManufacturerEntity originEntity = supManufacturerService.findManufacturer(supManufacturerEntity.getManufacturerId()); + boolean b = supManufacturerService.modifyCompany(supManufacturerEntity); + //修改证书对应的供应商ID，生产企业ID + supCertService.updateManufacturerId(originEntity.getCustomerId(), supManufacturerEntity.getCustomerId(), originEntity.getManufacturerId(), supManufacturerEntity.getManufacturerId()); + + if (b) { + return ResultVOUtils.success("修改成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/sup/manufacturer/audit") + public BaseResponse auditMmanufacturer(@RequestBody SupManufacturerEntity supManufacturerEntity) { + + if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { + return ResultVOUtils.error(500, "参数错误！"); + } + // 查询是否包含审核未通过的证书 + if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || + supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setAuditStatus(24); + filterSupCertRequest.setCustomerId(supManufacturerEntity.getCustomerId()); + filterSupCertRequest.setManufacturerIdFk(supManufacturerEntity.getManufacturerId()); + filterSupCertRequest.setType(ConstantStatus.CERT_MANUFACTURER); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + if (CollUtil.isNotEmpty(supCertEntityList)) { + for (SupCertEntity supCertEntity : supCertEntityList) { + supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS); + supCertService.updateCompanyCert(supCertEntity); + } +// return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); + } + } + + supManufacturerEntity.setUpdateDate(new Date()); + SupManufacturerEntity originEntity = supManufacturerService.findCompany(supManufacturerEntity.getId()); + boolean b = supManufacturerService.modifyCompany(supManufacturerEntity); + //修改证书对应的供应商ID，生产企业ID + supCertService.updateManufacturerId(originEntity.getCustomerId(), supManufacturerEntity.getCustomerId(), originEntity.getManufacturerId(), supManufacturerEntity.getManufacturerId()); + + if (b) { + return ResultVOUtils.success("修改成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + + @AuthRuleAnnotation("") + @GetMapping("/sup/manufacturer/basic/delete") + public BaseResponse deleteContact(DeleteRequest deleteRequest) { + boolean b = supManufacturerService.deleteById(deleteRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java new file mode 100644 index 00000000..0c091c94 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java @@ -0,0 +1,367 @@ +package com.glxp.api.admin.controller.purchase; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +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.purchase.SupCertEntity; +import com.glxp.api.admin.entity.purchase.SupCertSetEntity; +import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.api.admin.entity.purchase.SupProductEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; +import com.glxp.api.admin.req.purchase.FilterPoductRequest; +import com.glxp.api.admin.req.purchase.FilterSupCertRequest; +import com.glxp.api.admin.req.purchase.SelectProductBindRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.res.purchase.SupProductResponse; +import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.admin.service.basic.BasicThirdSysService; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.CompanyProductRelevanceService; +import com.glxp.api.admin.service.purchase.SupCertService; +import com.glxp.api.admin.service.purchase.SupCertSetService; +import com.glxp.api.admin.service.purchase.SupManufacturerService; +import com.glxp.api.admin.service.purchase.SupProductService; +import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.admin.util.GennerOrderUtils; +import com.glxp.api.admin.util.UdiInfoUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +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 org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; +import java.util.ListIterator; + +@RestController +public class SupProductController { + @Resource + private AuthAdminService authAdminService; + @Resource + private SupProductService supProductService; + @Resource + BasicThirdSysService basicThirdSysService; + @Resource + GennerOrderUtils gennerOrderUtils; + @Resource + ThrProductsService thrProductsService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; + @Resource + private SupCertService supCertService; + @Resource + CompanyProductRelevanceService companyProductRelevanceService; + @Resource + SupManufacturerService supManufacturerService; + @Resource + SupCertSetService supCertSetService; + + @AuthRuleAnnotation("") + @GetMapping("/sup/product/getRegistrationInfo") + public BaseResponse getRegistrationInfo(FilterPoductRequest filterPoductRequest) { + SupProductEntity supProductEntity = supProductService.findRegistration(filterPoductRequest.getId()); + if (supProductEntity != null) { + return ResultVOUtils.success(supProductEntity); + } + return ResultVOUtils.error(500, "企业信息为空"); + } + + @AuthRuleAnnotation("") + @GetMapping("/sup/product/getRegistrationList") + public BaseResponse getRegistrationList(FilterPoductRequest filterPoductRequest) { + List companyEntities = supProductService.getRegistration(filterPoductRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/product/addRegistration") + public BaseResponse addRegistration(@RequestBody SupProductEntity supProductEntity) { + supProductEntity.setCreate_date(new Date()); + supProductEntity.setUpdate_date(new Date()); + boolean b = supProductService.insertRegistration(supProductEntity); + if (b) { + return ResultVOUtils.success("添加成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/product/selectBind") + public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) { + + + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(selectProductBindRequest.getRelIdFk()); + + SupProductEntity supProductEntity = new SupProductEntity(); + BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); + supProductEntity.setProductId(selectProductBindRequest.getProductId()); + supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); + supProductEntity.setRelIdFk(selectProductBindRequest.getRelIdFk()); + supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); + supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); + supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); + supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); + supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); + supProductEntity.setCreate_date(new Date()); + supProductEntity.setUpdate_date(new Date()); + supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); + supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); + supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); + supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); + + return ResultVOUtils.success(supProductEntity); +// boolean b = supProductService.insertRegistration(supProductEntity); +// if (b) { +// return ResultVOUtils.success(supProductEntity); +// } else { +// return ResultVOUtils.error(ResultEnum.NOT_NETWORK); +// } + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/product/modifyRegistration") + public BaseResponse modifyRegistration(@RequestBody SupProductEntity supProductEntity) { + + if (StrUtil.isEmpty(supProductEntity.getProductId()) || StrUtil.isEmpty(supProductEntity.getManufacturerIdFk()) || StrUtil.isEmpty(supProductEntity.getCustomerId())) { + return ResultVOUtils.error(500, "参数错误！"); + } + + //提交审核 + if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + //判断是否上级供应商是否审核通过 + + SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk()); + if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN + || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) { + return ResultVOUtils.error(500, "所属生产企业资质未通过审核，暂时无法提交！"); + } + + //验证证书是否齐全 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_PRODUCT); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + List supCertEntityList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId()); + ListIterator iterable = supCertSetEntities.listIterator(); + while (iterable.hasNext()) { + SupCertSetEntity supCertSetEntity = iterable.next(); + + if (supCertSetEntity.isNeed() + || + (!supCertSetEntity.isNeed() && + supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2 + && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进") + ) + || + (!supCertSetEntity.isNeed() && + supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 + && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进") + ) + || + (!supCertSetEntity.isNeed() && + !StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()) + ) + || + (!supCertSetEntity.isNeed() && + !StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb()) + ) + ) { + for (SupCertEntity supCertEntity : supCertEntityList) { + if (supCertEntity.getName().equals(supCertSetEntity.getName())) { + if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) { + iterable.remove(); + break; + } + } + } + } else { + iterable.remove(); + } + + + } + String errMsg = ""; + if (supCertSetEntities.size() > 0) { + for (SupCertSetEntity supCertSetEntity : supCertSetEntities) { + errMsg = errMsg + "," + supCertSetEntity.getName(); + } + return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); + } + + } + supProductEntity.setUpdate_date(new Date()); + SupProductResponse originEntity = supProductService.findByProductId(supProductEntity.getProductId()); + supCertService.updateProductId(originEntity.getCustomerId(), supProductEntity.getCustomerId(), originEntity.getManufacturerIdFk(), + supProductEntity.getManufacturerIdFk(), originEntity.getProductId(), supProductEntity.getProductId()); + boolean b = supProductService.modifyRegistration(supProductEntity); + if (b) { + return ResultVOUtils.success("修改成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/pur/suppliers/product/audit") + public BaseResponse auditProduct(@RequestBody SupProductEntity supProductEntity) { + + if (supProductEntity.getAuditStatus() == null) { + return ResultVOUtils.error(500, "参数错误！"); + } + + + // 查询是否包含审核未通过的证书 + if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || + supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setAuditStatus(24); + filterSupCertRequest.setCustomerId(supProductEntity.getCustomerId()); + filterSupCertRequest.setManufacturerIdFk(supProductEntity.getManufacturerIdFk()); + filterSupCertRequest.setProductIdFk(supProductEntity.getProductId()); + filterSupCertRequest.setType(ConstantStatus.CERT_PRODUCT); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + if (CollUtil.isNotEmpty(supCertEntityList)) { + for (SupCertEntity supCertEntity : supCertEntityList) { + supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS); + supCertService.updateCompanyCert(supCertEntity); + } + +// return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); + } + } + + + supProductEntity.setUpdate_date(new Date()); + boolean b = supProductService.modifyRegistration(supProductEntity); + +// if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS) { +// SupProductResponse supProductResponse = supProductService.findJoinRegistration(supProductEntity.getId()); +// +// //步骤1：先添加到主系统第三方产品信息； +// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); +// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); +// thrProductsEntity.setCode(gennerOrderUtils.getRelId() + ""); +// thrProductsEntity.setThirdSys(basicThirdSysEntity.getThirdId()); +// thrProductsEntity.setThirdSysFk(basicThirdSysEntity.getThirdId()); +// thrProductsEntity.setName(supProductEntity.getRecordProductName()); +// thrProductsEntity.setSpec(supProductEntity.getSpecification()); +// thrProductsEntity.setStandard(supProductEntity.getSpecification()); +// thrProductsEntity.setManufactory(supProductResponse.getManufacturerName()); +// thrProductsService.insertThrProducts(thrProductsEntity); +// +// +// //步骤2：添加到关联表 +// String uuid = CustomUtil.getUUId(); +// UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); +// udiRelevanceEntity.setThirdId(thrProductsEntity.getCode()); +// udiRelevanceEntity.setThirdName(thrProductsEntity.getName()); +// udiRelevanceEntity.setMainId(thrProductsEntity.getCode()); +// udiRelevanceEntity.setMainName(thrProductsEntity.getName()); +// udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname()); +// String time = DateUtil.getDateTime(); +// udiRelevanceEntity.setUpdateTime(time); +// udiRelevanceEntity.setModifyTime(time); +// udiRelevanceEntity.setUuid(uuid); +// udiRelevanceEntity.setManufactory(supProductResponse.getManufacturerName()); +// udiRelevanceEntity.setSupName(supProductResponse.getSupName()); +// udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); +// udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); +// +// +// //步骤3：添加基础信息表 +// UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); +// udiInfoEntity.setNameCode(thrProductsEntity.getCode()); +// udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); +// udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); +// udiInfoEntity.setYlqxzcrbarmc(supProductEntity.getRecordPeopleName()); +// udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); +// udiInfoEntity.setZczbhhzbapzbh(supProductEntity.getRecordCode()); +// udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); +// udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); +// udiInfoEntity.setDiType(1); +// udiInfoEntity.setScbssfbhph("是"); +// udiInfoEntity.setScbssfbhscrq("是"); +// udiInfoEntity.setScbssfbhsxrq("是"); +// udiInfoEntity.setScbssfbhxlh("否"); +// udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); +// udiInfoService.insertUdiInfo(udiInfoEntity); +// +// +// //步骤4：添加供应商关联表 +// CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); +// companyProductRelevanceEntity.setCreate_time(new Date()); +// companyProductRelevanceEntity.setUpdate_time(new Date()); +// companyProductRelevanceEntity.setAuditStatus("3"); +// companyProductRelevanceEntity.setUnitFk(supProductResponse.getCustomerId()); +// companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceEntity.getId()); +// companyProductRelevanceEntity.setCustomerId(supProductResponse.getCustomerId()); +// companyProductRelevanceEntity.setProductId(supProductEntity.getProductId()); +// companyProductRelevanceEntity.setRegistrationId(supProductEntity.getProductId()); +// companyProductRelevanceEntity.setEnterpriseId(supProductEntity.getManufacturerIdFk()); +// companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); +// +// +// } + + if (b) { + return ResultVOUtils.success("审核通过！"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + } + + + @AuthRuleAnnotation("") + @GetMapping("/sup/product/delete") + public BaseResponse delete(DeleteCompanyFileRequest deleteCompanyFileRequest) { + boolean b = supProductService.deleteById(deleteCompanyFileRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupSalesmanController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupSalesmanController.java new file mode 100644 index 00000000..41a79b37 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupSalesmanController.java @@ -0,0 +1,151 @@ +package com.glxp.api.admin.controller.purchase; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity; +import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.admin.req.info.CompanyRequest; +import com.glxp.api.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.admin.service.purchase.CompanySalesmanService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.validation.BindingResult; +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 org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class SupSalesmanController { + @Resource + private AuthAdminService authAdminService; + @Resource + private CompanySalesmanService companySalesmanService; + @Value("${file_path}") + private String filePath; + + @AuthRuleAnnotation("") + @GetMapping("/sale/info/company/salesman/filter") + public BaseResponse filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List companySalesmanEntityList + = companySalesmanService.filterCompanySalesman(filterCompanySalesmanRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(companySalesmanEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companySalesmanEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @GetMapping("/sale/info/companySalesman") + public BaseResponse getCompanySalesmanInfo(CompanyRequest companyRequest) { + CompanySalesmanEntity companySalesmanEntity = companySalesmanService.findCompanySalesman(companyRequest.getCustomerId()); + if (companySalesmanEntity != null) { + return ResultVOUtils.success(companySalesmanEntity); + } + return ResultVOUtils.error(500, "空"); + } + + @AuthRuleAnnotation("") + @GetMapping("/sale/info/getCompanySalesman") + public BaseResponse getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest) { + filterCompanySalesmanRequest.setCustomerId(getCustomerId()); + List companySalesmanEntities = companySalesmanService.getCompanySalesman(filterCompanySalesmanRequest); + PageInfo pageInfo = new PageInfo<>(companySalesmanEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companySalesmanEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/sale/info/insertCompanySalesman") + public BaseResponse insertCompanySalesman(@RequestBody CompanySalesmanEntity companySalesmanEntity) { + companySalesmanEntity.setCreate_time(new Date()); + companySalesmanEntity.setUpdate_time(new Date()); + companySalesmanEntity.setAuditStatus("3"); + boolean b = companySalesmanService.insertCompanySalesman(companySalesmanEntity); + return ResultVOUtils.success("成功"); + } + + @AuthRuleAnnotation("") + @PostMapping("/sale/info/updateCompanySalesman") + public BaseResponse updateCompanySalesman(@RequestBody CompanySalesmanEntity companySalesmanEntity) { + companySalesmanEntity.setUpdate_time(new Date()); + if (StringUtils.isNotBlank(companySalesmanEntity.getNewFilePath())) { + if (StringUtils.isNotBlank(companySalesmanEntity.getFilePath())) { + String URL=filePath+"/register/file/image5/" + companySalesmanEntity.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + companySalesmanEntity.setFilePath(companySalesmanEntity.getNewFilePath()); + } + if (StringUtils.isNotBlank(companySalesmanEntity.getNewFilePath2())) { + if (StringUtils.isNotBlank(companySalesmanEntity.getFilePath2())) { + String URL=filePath+"/register/file/image5/" + companySalesmanEntity.getFilePath2(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + companySalesmanEntity.setFilePath2(companySalesmanEntity.getNewFilePath2()); + } + companySalesmanEntity.setAuditStatus("4"); + boolean b = companySalesmanService.updateCompanySalesman(companySalesmanEntity); + return ResultVOUtils.success("修改成功"); + } + + @AuthRuleAnnotation("") + @PostMapping("/sale/info/deleteCompanySalesman") + public BaseResponse deleteCompanySalesman(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { + boolean b = companySalesmanService.deleteById(deleteCompanyFileRequest.getId()); + if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath())) { + String URL=filePath+"/register/file/image5/" + deleteCompanyFileRequest.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath2())) { + String URL=filePath+"/register/file/image5/" + deleteCompanyFileRequest.getFilePath2(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + return ResultVOUtils.success("成功"); + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} 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 e793aa18..f2d935d0 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 @@ -15,7 +15,7 @@ public interface CompanyProductRelevanceDao { List filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); - CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId); + CompanyProductRelevanceEntity findCompanyProductRelevance(String CustomerId); CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDao.java new file mode 100644 index 00000000..ccf2454c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDao.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.dao.inventory; + +import com.glxp.api.admin.entity.inventory.InnerOrderEntity; +import com.glxp.api.admin.req.inventory.InnerOrderRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface InnerOrderDao { + + List queryPageList(InnerOrderRequest innerOrderRequest); + + Integer insert(InnerOrderEntity innerOrderEntity); + + Boolean update(InnerOrderEntity innerOrderEntity); + + Boolean deleteByIds(@Param("ids") List ids); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDetailDao.java new file mode 100644 index 00000000..d670a344 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InnerOrderDetailDao.java @@ -0,0 +1,25 @@ +package com.glxp.api.admin.dao.inventory; + +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity; +import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; +import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface InnerOrderDetailDao { + + + List joinQueryList(InnerOrderDetailRequest innerOrderDetailRequest); + + Boolean insert(InnerOrderDetailEntity purApplyDetailEntity); + + Boolean update(InnerOrderDetailEntity purApplyRequest); + + Boolean deleteByIds(List ids); + + Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDao.java index 2f481d50..4d0d342b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDao.java @@ -30,4 +30,7 @@ public interface InvPreInProductDao { boolean deleteById(@Param("id") String id); boolean deleteAll(); + + boolean deleteByOrderIdFk(@Param("orderIdFk") String orderIdFk); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanySalesmanDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanySalesmanDao.java new file mode 100644 index 00000000..7607a3be --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanySalesmanDao.java @@ -0,0 +1,25 @@ +package com.glxp.api.admin.dao.purchase; + +import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity; +import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CompanySalesmanDao { + + List filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest); + + CompanySalesmanEntity findCompanySalesman(String CustomerId); + + CompanySalesmanEntity findCompanySalesmanByName(String name); + + List getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest); + + boolean updateCompanySalesman(CompanySalesmanEntity companySalesmanEntity); + + boolean insertCompanySalesman(CompanySalesmanEntity companySalesmanEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanyUpdateLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanyUpdateLogDao.java new file mode 100644 index 00000000..4bfe0d2a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CompanyUpdateLogDao.java @@ -0,0 +1,25 @@ +package com.glxp.api.admin.dao.purchase; + +import com.glxp.api.admin.entity.purchase.CompanyUpdateLogEntity; +import com.glxp.api.admin.req.purchase.FilterCompanyUpdateLogRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CompanyUpdateLogDao { + + List filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); + + CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId); + + CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit); + + List getCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); + + boolean updateCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity); + + boolean insertCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java new file mode 100644 index 00000000..e28016c5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java @@ -0,0 +1,25 @@ +package com.glxp.api.admin.dao.purchase; + +import com.glxp.api.admin.entity.purchase.CustomerContactEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CustomerContacDao { + + List filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest); + + boolean insertCustomerContact(CustomerContactEntity customerContactEntity); + + boolean updateCustomerContact(CustomerContactEntity customerContactEntity); + + boolean deleteById(Long customerId); + + CustomerContactEntity selectById(Long customerId); + + boolean deleteContact(DeleteRequest deleteRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDao.java index 896e5f21..be44c936 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDao.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.dao.purchase; import com.glxp.api.admin.entity.purchase.PurApplyEntity; import com.glxp.api.admin.req.purchase.PurApplyRequest; +import com.glxp.api.admin.res.purchase.PurApplyResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,7 @@ import java.util.List; @Mapper public interface PurApplyDao { - List queryPageList(PurApplyRequest purApplyRequest); + List queryPageList(PurApplyRequest purApplyRequest); Integer insert(PurApplyEntity purApplyRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDao.java index 640cf829..ec7e1d0d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDao.java @@ -2,19 +2,21 @@ package com.glxp.api.admin.dao.purchase; import com.glxp.api.admin.entity.purchase.PurPlanEntity; import com.glxp.api.admin.req.purchase.PurPlanRequest; +import com.glxp.api.admin.res.purchase.PurPlanResponse; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper public interface PurPlanDao { - List queryPageList(PurPlanRequest purPlanRequest); + List queryPageList(PurPlanRequest purPlanRequest); - Boolean insert(PurPlanRequest purPlanRequest); + Boolean insert(PurPlanEntity purPlanRequest); - Boolean update(PurPlanRequest purPlanRequest); + Boolean update(PurPlanEntity purPlanRequest); - Boolean deleteByIds(List ids); + Boolean deleteByIds(@Param("ids") List ids); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDetailDao.java index b18c484b..9adbddaa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDetailDao.java @@ -1,18 +1,27 @@ package com.glxp.api.admin.dao.purchase; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; import com.glxp.api.admin.req.purchase.PurPlanDetailRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface PurPlanDetailDao { + List queryPageList(PurPlanDetailRequest purApplyRequest); - List queryPageList(PurPlanDetailRequest purPlanDetailRequest); + List joinQueryList(PurPlanDetailRequest purPlanDetailRequest); - Boolean insert(PurPlanDetailRequest purPlanDetailRequest); + Boolean insert(PurPlanDetailEntity purPlanDetailRequest); - Boolean update(PurPlanDetailRequest purPlanDetailRequest); + Boolean update(PurPlanDetailEntity purPlanDetailRequest); Boolean deleteByIds(List ids); + Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java new file mode 100644 index 00000000..c4a9e4ae --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java @@ -0,0 +1,35 @@ +package com.glxp.api.admin.dao.purchase; + +import com.glxp.api.admin.entity.purchase.SupCertEntity; +import com.glxp.api.admin.req.purchase.FilterSupCertRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SupCertDao { + + List filterCompanyCert(FilterSupCertRequest filterSupCertRequest); + + + SupCertEntity findCompanyCertByName(String name); + + List getCompanyCert(FilterSupCertRequest filterSupCertRequest); + + boolean updateCompanyCert(SupCertEntity supCertEntity); + + boolean insertCompanyCert(SupCertEntity supCertEntity); + + boolean deleteById(String id); + + boolean updateCustomerId(@Param("oldId") String oldId, @Param("newId") String newId); + + boolean updateManufacturerId(@Param("oldCustomerId") String oldCustomerId, @Param("newCustomerId") String newCustomerId, + @Param("oldManufacturerIdFk") String oldManufacturerIdFk, @Param("newManufacturerIdFk") String newManufacturerIdFk); + + boolean updateProductId(@Param("oldCustomerId") String oldCustomerId, @Param("newCustomerId") String newCustomerId, + @Param("oldManufacturerIdFk") String oldManufacturerIdFk, @Param("newManufacturerIdFk") String newManufacturerIdFk, + @Param("oldProductIdFk") String oldProductIdFk, @Param("newProductIdFk") String newProductIdFk); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java new file mode 100644 index 00000000..849153b8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.dao.purchase; + +import com.glxp.api.admin.entity.purchase.SupCertSetEntity; +import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SupCertSetDao { + List filterCertSets(FilterCertSetsRequest filterCertSetsRequest); + + boolean insertCertSet(SupCertSetEntity supCertSetEntity); + + + boolean updateCertSet(SupCertSetEntity supCertSetEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java new file mode 100644 index 00000000..7e092849 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java @@ -0,0 +1,28 @@ +package com.glxp.api.admin.dao.purchase; + +import com.glxp.api.admin.entity.purchase.SupCompanyEntity; +import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SupCompanyDao { + + SupCompanyEntity findCompany(String CustomerId); + + SupCompanyEntity findCompanyByName(String companyName); + + List getSubCompany(FilterSupCompanyRequest companyRequest); + + List getSubCompany2(FilterSupCompanyRequest companyRequest); + + List filterCompany(FilterSupCompanyRequest companyRequest); + + boolean modifyCompany(SupCompanyEntity companyEntity); + + boolean insertCompany(SupCompanyEntity companyEntity); + + boolean deleteCompany(Long customerId); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupManufacturerDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupManufacturerDao.java new file mode 100644 index 00000000..68137cc3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupManufacturerDao.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.dao.purchase; + +import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SupManufacturerDao { + + SupManufacturerEntity findCompany(Long id); + + SupManufacturerEntity findCompanyByName(String companyName); + + List getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest); + + boolean modifyCompany(SupManufacturerEntity supManufacturerEntity); + + boolean insertCompany(SupManufacturerEntity supManufacturerEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupProductDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupProductDao.java new file mode 100644 index 00000000..4ebdcde0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupProductDao.java @@ -0,0 +1,27 @@ +package com.glxp.api.admin.dao.purchase; + +import com.glxp.api.admin.entity.purchase.SupProductEntity; +import com.glxp.api.admin.req.purchase.FilterPoductRequest; +import com.glxp.api.admin.res.purchase.SupProductResponse; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SupProductDao { + + SupProductEntity findRegistration(Long id); + + SupProductEntity findRegistrationByName(String recordProductName); + + List getRegistration(FilterPoductRequest filterPoductRequest); + + boolean modifyRegistration(SupProductEntity supProductEntity); + + boolean insertRegistration(SupProductEntity supProductEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java index 9bcd2165..54eb1b8d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CompanyProductRelevanceEntity.java @@ -9,16 +9,16 @@ import java.util.Date; public class CompanyProductRelevanceEntity { private Integer id; - private Long customerId; - private Long productId; - private Long enterpriseId; - private Long registrationId; + private String customerId; + private String productId; + private String enterpriseId; + private String registrationId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date create_time; private Date update_time; private String auditStatus; private String productUuid; - private Integer udiRlIdFk; + private String udiRlIdFk; private String unitFk; private String price; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java index c4f47d20..3d451a7a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java @@ -76,4 +76,7 @@ public class OrderEntity { * 采集UDI码时进行三期校验 */ private boolean codeFillCheck; + + private String preInBillNo; + private String preOutBillNo; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderDetailEntity.java new file mode 100644 index 00000000..b0a77dfe --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderDetailEntity.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.entity.inventory; + +import lombok.Data; + +@Data +public class InnerOrderDetailEntity { + + private Long id; + private String orderIdFk; + private String productId; + private String productName; + private Integer count; + private String productDate; + private String expireDate; + private String batchNo; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderEntity.java new file mode 100644 index 00000000..cb789f37 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InnerOrderEntity.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.entity.inventory; + +import lombok.Data; + +import java.util.Date; + +@Data +public class InnerOrderEntity { + + private Integer id; + private String recordKey; + private Date createTime; + private Integer genStatus; + private Integer printStatus; + private Date updateTime; + private String remark; + private String createBy; + private int status; + private String createByName; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java index f25b94a4..4523e3df 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java @@ -27,6 +27,8 @@ public class InvProductEntity { private String price; private Date updateTime; + private String orderIdFk; + public Integer getInCount() { if (inCount == null) return 0; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanySalesmanEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanySalesmanEntity.java new file mode 100644 index 00000000..6706fdcf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanySalesmanEntity.java @@ -0,0 +1,28 @@ +package com.glxp.api.admin.entity.purchase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class CompanySalesmanEntity { + + private Integer id; + private Long customerId; + private String name; + private String tel; + private String phone; + private String email; + private String certType; + private String certCode; + private String filePath; + private String filePath2; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_time; + private Date update_time; + private String auditStatus; + + private String newFilePath; + private String newFilePath2; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanyUpdateLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanyUpdateLogEntity.java new file mode 100644 index 00000000..480f836a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CompanyUpdateLogEntity.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.entity.purchase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class CompanyUpdateLogEntity { + + private Integer id; + private Long customerId; + private String updateCause; + private String status; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_time; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date update_time; + private String submit; + private String auditor; + private String noPassCause; + private String param; + private String logType; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CustomerContactEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CustomerContactEntity.java new file mode 100644 index 00000000..c2e866a5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/CustomerContactEntity.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.entity.purchase; + +import lombok.Data; + +@Data +public class CustomerContactEntity { + + private Long id; + private String customerId; + private String contacts; + private String mobile; + private String tel; + private String email; + private String comments; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java index f74311be..d61b2d98 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java @@ -70,4 +70,6 @@ public class PurApplyEntity { private Date updateTime; + private String auditRemark; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java index 0d9b4195..ae25cca5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanDetailEntity.java @@ -18,7 +18,7 @@ public class PurPlanDetailEntity { /** * 产品ID */ - private Long productId; + private String productId; /** * 产品名称 */ @@ -26,7 +26,7 @@ public class PurPlanDetailEntity { /** * 数量 */ - private Long count; + private Integer count; /** * 供应商ID */ diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java index bb8f8078..241bef96 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java @@ -22,7 +22,7 @@ public class PurPlanEntity { /** * */ - private Long id; + private Integer id; /** * 单据号 */ @@ -34,11 +34,11 @@ public class PurPlanEntity { /** * 状态（1.草稿，2.未审核，3.已审核） */ - private Long status; + private Integer status; /** * 申购类型 */ - private Long billType; + private Integer billType; /** * 申购说明 */ @@ -71,4 +71,6 @@ public class PurPlanEntity { */ private Date createTime; + private Date updateTime; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertEntity.java new file mode 100644 index 00000000..17dc5854 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertEntity.java @@ -0,0 +1,34 @@ +package com.glxp.api.admin.entity.purchase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +//供应商企业资质表 + +@Data +public class SupCertEntity { + + private Integer id; + private String customerId; + private String name; + private String code; + private String filePath; + private String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date vailDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date expireDate; + private Integer type; //证书类型：1:供应商；2.生产企业；3.产品品种 + private String manufacturerIdFk; + private String productIdFk; + private Integer auditStatus; //审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过 + private String auditComment; + + private int status; //0：启用，1:禁用 + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java new file mode 100644 index 00000000..4d400d60 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.entity.purchase; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SupCertSetEntity { + + private Integer id; + private String name; + private boolean need; + private Integer foreign; + private String cplx; + private String hchzsb; + private String flbm; + private Integer imports; + private String remark; + private Date updateTime; + private Integer type; + + private boolean isPass; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCompanyEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCompanyEntity.java new file mode 100644 index 00000000..64fcf324 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCompanyEntity.java @@ -0,0 +1,80 @@ +package com.glxp.api.admin.entity.purchase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class SupCompanyEntity { + + private String companyName; //企业名称 + private Integer bussinessStatus; //企业类型 + private String creditNum; //统一社会信用代码 + private String classes; //企业类别 //企业类别：1.生产企业，2.流通企业，3。医疗机构 + + private String area; + private String areaCode; + private String detailAddr; + private String appId; + private String appSecret; + private String customerId; + private String contacts; + private String mobile; + private String tel; + private String email; + + private String refEntId; + private String entId; + private int networkType; + private int certIdFk; + + private String parentCompany; + private String parentIdFk; + + private String contactsPapersType; + private String contactsPapersCode; + private String registerStatus; + private String jyxkzh; + private String jyxkzfzjg; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private Date jyxkzyxq; + private String jybapzh; + private String jybabm; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private Date fzrq; + private String suihao; + private String kaihuhang; + private String kaihuzhanghao; + + private Integer auditStatus; + private String unitIdFk; + + private String filePath; + private String newFilePath; + private String filePath2; + private String newFilePath2; + private String filePath3; + private String newFilePath3; + private String filePath4; + private String newFilePath4; + + private String updateCause; + private String newAuditStatus; + private String noPassCause; + private String auditor; + + private String auditStatusList; + + private Date createTime; + private String createBy; + private Date updateTime; + private Date auditTime; + private String auditComment; + private Integer editStatus; + + private int status; //0：启用，1:禁用 + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupManufacturerEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupManufacturerEntity.java new file mode 100644 index 00000000..790c0e2e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupManufacturerEntity.java @@ -0,0 +1,40 @@ +package com.glxp.api.admin.entity.purchase; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SupManufacturerEntity { + + private Long id; + private String companyName; + private String creditCode; + private String companyType; + private String placeArea; + private String placeAreaCode; + private String placeAddress; + private String detailAddr; + private String legalPersonName; + private String legalPersonPapersType; + private String legalPersonPapersCode; + private String productionArea; + private String productionAreaCode; + private String productionAddress; + private String registerStatus; + private String productionLicenceNum; + private Date productionLicenceDate; + private String productionRecordNum; + private String productionRecordSection; + private Date productionRecordDate; + private String remark; + private Date createDate; + private Date updateDate; + private String customerId; + private String manufacturerId; + + private Integer auditStatus; + private String supName; + private String auditComment; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupProductEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupProductEntity.java new file mode 100644 index 00000000..08b15034 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupProductEntity.java @@ -0,0 +1,61 @@ +package com.glxp.api.admin.entity.purchase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class SupProductEntity { + + private Long id; + private String productId; + private Long enterpriseId; + private String recordCode; + private String recordProductName; + private String productManageType; + private String recordPeopleName; + private String recordPeopleArea; + private String recordPeopleAreaCode; + private String recordPeopleAddress; + private String productType; + private String productDirectoryCode; + private String agentName; + private String agentArea; + private String agentAreaCode; + private String agentAddress; + private String instructions; + private String productAddress; + private String recordText; + private String placeOrigin; + private String productionRegion; + private String productionCompanyName; + private String afterSale; + private String specification; + private String structure; + private String scope; + private String other; + private String filePath; + private String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_date; + private Date update_date; + + private String newFilePath; + private String newInstructions; + + private String manufacturerIdFk; + private String customerId; + + + private Integer auditStatus; + private String auditComment; + private String sptm; + private String ybbm; + private String measname; + private String cpms; + + private String hchzsb; + private String relIdFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java index ed1ba96c..c154f586 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java @@ -38,4 +38,6 @@ public class ThrOrderEntity { private Integer editStatus; private String invWarehouseCode; + private String unitIdFk; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/CompanyRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/info/CompanyRequest.java index 0f7ac71a..ca4a7f69 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/CompanyRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/info/CompanyRequest.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class CompanyRequest { - private Long customerId; + private String customerId; private String companyName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterStPrintTempRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterStPrintTempRequest.java index bcb35f92..3f3bb188 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterStPrintTempRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterStPrintTempRequest.java @@ -6,6 +6,6 @@ import lombok.Data; @Data public class FilterStPrintTempRequest extends ListPageRequest { private Integer id; - private Integer printCodeIdFk; - private Integer stockOrderFk; + private String printCodeIdFk; + private String stockOrderFk; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderDetailRequest.java new file mode 100644 index 00000000..13528525 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderDetailRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.inventory; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class InnerOrderDetailRequest extends ListPageRequest { + + private String orderIdFk; + private String productId; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java new file mode 100644 index 00000000..920e1da2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.inventory; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class InnerOrderRequest extends ListPageRequest { + + + private String recordKey; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostInnerOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostInnerOrderRequest.java new file mode 100644 index 00000000..87c421d7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostInnerOrderRequest.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.req.inventory; + +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity; +import com.glxp.api.admin.entity.inventory.InnerOrderEntity; +import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.admin.entity.purchase.PurApplyEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostInnerOrderRequest { + + int editStatus; + InnerOrderEntity innerOrderEntity; + List innerOrderDetailEntities; + List subErpOrders; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/CustomerContactFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/CustomerContactFilterRequest.java new file mode 100644 index 00000000..85ce9f56 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/CustomerContactFilterRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.admin.req.purchase; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class CustomerContactFilterRequest extends ListPageRequest { + private Integer customerId; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java new file mode 100644 index 00000000..7dd6e8f8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.purchase; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterCertSetsRequest extends ListPageRequest { + + private String name; + private Integer type; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanySalesmanRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanySalesmanRequest.java new file mode 100644 index 00000000..bbdeaa5b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanySalesmanRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.purchase; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterCompanySalesmanRequest extends ListPageRequest { + + private String customerId; + private String name; + private String auditStatus; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanyUpdateLogRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanyUpdateLogRequest.java new file mode 100644 index 00000000..976fcb35 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCompanyUpdateLogRequest.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.req.purchase; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterCompanyUpdateLogRequest extends ListPageRequest { + + private String customerId; + private String status; + private String submit; + private String logType; + + private String noStatus; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterPoductRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterPoductRequest.java new file mode 100644 index 00000000..186f9fea --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterPoductRequest.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.req.purchase; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterPoductRequest extends ListPageRequest { + + private Long id; + private Long enterpriseId; + private String recordCode; + private String recordProductName; + private String recordPeopleName; + + + private String productId; + private String manufacturerIdFk; + private String customerId; + private Integer auditStatus; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCertRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCertRequest.java new file mode 100644 index 00000000..0fd9afe2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCertRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.purchase; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterSupCertRequest extends ListPageRequest { + + private String code; + private String customerId; + private String name; + private String manufacturerIdFk; + private String productIdFk; + private Integer auditStatus; + private Integer type; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCompanyRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCompanyRequest.java new file mode 100644 index 00000000..2a0deb07 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCompanyRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.req.purchase; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterSupCompanyRequest extends ListPageRequest { + + private String customerId; + private String companyName; + private String creditNum; + private String auditStatus; + private String unitIdFk; + + private List auditStatusList; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupManufacturerRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupManufacturerRequest.java new file mode 100644 index 00000000..addb60cc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupManufacturerRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.purchase; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterSupManufacturerRequest extends ListPageRequest { + + private Long id; + private String companyName; + private String creditCode; + private String placeArea; + private String customerId; + private Integer auditStatus; + private String manufacturerId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurPlanRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurPlanRequest.java new file mode 100644 index 00000000..e7e05b15 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostPurPlanRequest.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.req.purchase; + +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.admin.entity.purchase.PurApplyEntity; +import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.admin.entity.purchase.PurPlanEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostPurPlanRequest { + + int editStatus; + PurPlanEntity purPlanEntity; + List purPlanDetailEntities; + List subErpOrders; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostSelCertRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostSelCertRequest.java new file mode 100644 index 00000000..2d78a0d1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PostSelCertRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.purchase; + +import com.glxp.api.admin.entity.purchase.SupCertSetEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostSelCertRequest { + + + private Integer certType; + private String manufacturerIdFk; + private String productIdFk; + private List supCertSetEntities; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java index a5b40d0b..42235069 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java @@ -21,7 +21,7 @@ public class PurApplyRequest extends ListPageRequest { * */ @NotNull(message = "不能为空") - private Long id; + private Integer id; /** * 单据号 @@ -39,13 +39,13 @@ public class PurApplyRequest extends ListPageRequest { * 状态（1.草稿，2.未审核，3.已审核） */ @NotNull(message = "状态（1.草稿，2.未审核，3.已审核）不能为空") - private Long status; + private Integer status; /** * 申购类型 */ @NotNull(message = "申购类型不能为空") - private Long billType; + private Integer billType; /** * 申购说明 @@ -94,4 +94,5 @@ public class PurApplyRequest extends ListPageRequest { private Date createTime; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurPlanRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurPlanRequest.java index 65350022..8c06a890 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurPlanRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurPlanRequest.java @@ -41,7 +41,7 @@ public class PurPlanRequest extends ListPageRequest { * 状态（1.草稿，2.未审核，3.已审核） */ @NotNull(message = "状态（1.草稿，2.未审核，3.已审核）不能为空") - private Long status; + private Integer status; /** * 申购类型 diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectCorpBindRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectCorpBindRequest.java new file mode 100644 index 00000000..b9ecc4b7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectCorpBindRequest.java @@ -0,0 +1,9 @@ +package com.glxp.api.admin.req.purchase; + +import lombok.Data; + +@Data +public class SelectCorpBindRequest { + + private String customerId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectProductBindRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectProductBindRequest.java new file mode 100644 index 00000000..5ac15837 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/SelectProductBindRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.purchase; + +import lombok.Data; + +@Data +public class SelectProductBindRequest { + + private String productId; + private String relIdFk; + private String manufacturerId; + private String customerId; + private Integer auditStatus; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java index 5b6855af..0a66d5de 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -86,6 +86,7 @@ public class UdiRelevanceResponse { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + private Integer rlId; public int getBhzxxsbzsl() { diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/OrderNoResult.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/OrderNoResult.java index 2956a16c..bd0e2050 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/OrderNoResult.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/OrderNoResult.java @@ -20,4 +20,11 @@ public class OrderNoResult { //复制单号，多个单号之间使用英文逗号,分隔 private String replicateNo; + //验收出库关联的预验收入库单，多个单号,隔开 + private String preInBillNo; + + //预验收入库单关联的预验收出库单，多个单号,隔开 + private String preOutBillNo; + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductResponse.java index 74c24e8f..ba79ebaa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductResponse.java @@ -25,8 +25,8 @@ public class InvProductResponse { private String invStorageName; private String invSubStorageName; private String invWarehouseCode; - private String price; + private String orderIdFk; public Integer getInCount() { if (inCount == null) diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java new file mode 100644 index 00000000..3781fb0b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java @@ -0,0 +1,71 @@ +package com.glxp.api.admin.res.purchase; + +import lombok.Data; + +import java.util.Date; + +@Data +public class PurApplyResponse { + + + /** + * + */ + private Integer id; + /** + * 单据号 + */ + private String billNo; + /** + * 单据日期 + */ + private Date billDate; + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + private int status; + /** + * 申购类型 + */ + private Long billType; + /** + * 申购说明 + */ + private String remark; + /** + * 当前仓库 + */ + private String locStorageCode; + /** + * 当前分库 + */ + private String invWarehouseCode; + /** + * 所属部门 + */ + private String deptCode; + /** + * 审核人 + */ + private String auditBy; + /** + * 审核时间 + */ + private Date auditTime; + + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + private Date updateTime; + + + private String createByName; + private String auditByName; + private String invName; + private String subInvName; + private String auditRemark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java new file mode 100644 index 00000000..3715ac09 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java @@ -0,0 +1,69 @@ +package com.glxp.api.admin.res.purchase; + +import lombok.Data; + +import java.util.Date; + +@Data +public class PurPlanResponse { + + /** + * + */ + private Integer id; + /** + * 单据号 + */ + private String billNo; + /** + * 单据日期 + */ + private Date billDate; + /** + * 状态（1.草稿，2.未审核，3.已审核） + */ + private Integer status; + /** + * 申购类型 + */ + private Integer billType; + /** + * 申购说明 + */ + private String remark; + /** + * 当前仓库 + */ + private String locStorageCode; + /** + * 当前分库 + */ + private String invWarehouseCode; + /** + * 所属部门 + */ + private String deptCode; + /** + * 审核人 + */ + private String auditBy; + /** + * 审核时间 + */ + private Date auditTime; + + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + private Date updateTime; + + private String createByName; + private String auditByName; + private String invName; + private String subInvName; + private String auditRemark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/SupProductResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/SupProductResponse.java new file mode 100644 index 00000000..517f00eb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/SupProductResponse.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.res.purchase; + +import com.glxp.api.admin.entity.purchase.SupProductEntity; +import lombok.Data; + +@Data +public class SupProductResponse extends SupProductEntity { + + + private String supName; + private String manufacturerName; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java index 8a6650e1..bf843ee3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -94,6 +94,9 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { @Override public BasicUnitMaintainEntity selectByErpId(String id) { + if (id == null) { + return null; + } BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest(); filterUdiInfoRequest.setErpId(id); List basicUnitMaintainEntities = basicUnitMaintainDao.filterList(filterUdiInfoRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java index 13865e17..42f92144 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyProductRelevanceService.java @@ -14,7 +14,7 @@ public interface CompanyProductRelevanceService { List filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); - CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId); + CompanyProductRelevanceEntity findCompanyProductRelevance(String CustomerId); CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java index c7e8c244..ef735692 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java @@ -46,7 +46,7 @@ public class CompanyProductRelevanceServiceImpl implements CompanyProductRelevan } @Override - public CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId) { + public CompanyProductRelevanceEntity findCompanyProductRelevance(String CustomerId) { return companyProductRelevanceDao.findCompanyProductRelevance(CustomerId); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index ae9da344..1b9124a6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -238,6 +238,8 @@ public class OrderServiceImpl implements OrderService { return orderDao.findAllByTime(orderFilterRequest); } + + //平衡补单 @Override public BaseResponse supplementOrder(String billNo, String orderIdFk) { //查询订单数据 @@ -275,6 +277,7 @@ public class OrderServiceImpl implements OrderService { supplementOrder.setCorpOrderId(CustomUtil.getId() + "x"); //修改往来单位及当前库存号 supplementOrder.setFromCorpId(order.getLocStorageCode()); + supplementOrder.setFromSubInvCode(order.getInvWarehouseCode()); supplementOrder.setLocStorageCode(order.getFromCorpId()); supplementOrder.setInvWarehouseCode(null); String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderDetailService.java new file mode 100644 index 00000000..e14f92e6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderDetailService.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.service.inventory; + +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity; +import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface InnerOrderDetailService { + + + List joinQueryList(InnerOrderDetailRequest innerOrderDetailRequest); + + Boolean insert(InnerOrderDetailEntity purApplyDetailEntity); + + Boolean update(InnerOrderDetailEntity purApplyRequest); + + Boolean deleteByIds(List ids); + + Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderService.java new file mode 100644 index 00000000..be248d4c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InnerOrderService.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.service.inventory; + +import com.glxp.api.admin.entity.inventory.InnerOrderEntity; +import com.glxp.api.admin.req.inventory.InnerOrderRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface InnerOrderService { + + + InnerOrderEntity findByRecordKey(String recordKey); + + List queryPageList(InnerOrderRequest innerOrderRequest); + + Integer insert(InnerOrderEntity innerOrderRequest); + + Boolean update(InnerOrderEntity innerOrderRequest); + + Boolean deleteByIds(List ids); + + +} + diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java index 921e039f..3e376d41 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java @@ -31,4 +31,6 @@ public interface InvPreInProductDetailService { InvProductDetailEntity statInvPreInDetail(String code); + + boolean deleteByOrderIdFk(String orderIdFk); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductService.java index 2e284723..a49e4160 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductService.java @@ -25,4 +25,6 @@ public interface InvPreInProductService { boolean deleteById(String id); boolean deleteAll(); + + boolean deleteByOrderIdFk(String orderIdFk); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderDetailServiceImpl.java new file mode 100644 index 00000000..665f756b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderDetailServiceImpl.java @@ -0,0 +1,53 @@ +package com.glxp.api.admin.service.inventory.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inventory.InnerOrderDetailDao; +import com.glxp.api.admin.dao.purchase.PurPlanDetailDao; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity; +import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; +import com.glxp.api.admin.service.inventory.InnerOrderDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class InnerOrderDetailServiceImpl implements InnerOrderDetailService { + @Resource + InnerOrderDetailDao innerOrderDetailDao; + + @Override + public List joinQueryList(InnerOrderDetailRequest innerOrderDetailRequest) { + if (innerOrderDetailRequest == null) { + return Collections.emptyList(); + } + if (innerOrderDetailRequest.getPage() != null) { + int offset = (innerOrderDetailRequest.getPage() - 1) * innerOrderDetailRequest.getLimit(); + PageHelper.offsetPage(offset, innerOrderDetailRequest.getLimit()); + } + List data = innerOrderDetailDao.joinQueryList(innerOrderDetailRequest); + return data; + } + + @Override + public Boolean insert(InnerOrderDetailEntity innerOrderDetailEntity) { + return innerOrderDetailDao.insert(innerOrderDetailEntity); + } + + @Override + public Boolean update(InnerOrderDetailEntity innerOrderDetailEntity) { + return innerOrderDetailDao.update(innerOrderDetailEntity); + } + + @Override + public Boolean deleteByIds(List ids) { + return innerOrderDetailDao.deleteByIds(ids); + } + + @Override + public Boolean deleteByOrderId(String orderIdFk) { + return innerOrderDetailDao.deleteByOrderId(orderIdFk); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderServiceImpl.java new file mode 100644 index 00000000..418519ff --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InnerOrderServiceImpl.java @@ -0,0 +1,60 @@ +package com.glxp.api.admin.service.inventory.impl; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inventory.InnerOrderDao; +import com.glxp.api.admin.entity.inventory.InnerOrderEntity; +import com.glxp.api.admin.req.inventory.InnerOrderRequest; +import com.glxp.api.admin.service.inventory.InnerOrderService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class InnerOrderServiceImpl implements InnerOrderService { + + @Resource + InnerOrderDao innerOrderDao; + + + @Override + public InnerOrderEntity findByRecordKey(String recordKey) { + + if (StrUtil.isEmpty(recordKey)) + return null; + InnerOrderRequest innerOrderRequest = new InnerOrderRequest(); + innerOrderRequest.setRecordKey(recordKey); + List data = innerOrderDao.queryPageList(innerOrderRequest); + return data.get(0); + } + + @Override + public List queryPageList(InnerOrderRequest innerOrderRequest) { + if (innerOrderRequest == null) { + return Collections.emptyList(); + } + if (innerOrderRequest.getPage() != null) { + int offset = (innerOrderRequest.getPage() - 1) * innerOrderRequest.getLimit(); + PageHelper.offsetPage(offset, innerOrderRequest.getLimit()); + } + List data = innerOrderDao.queryPageList(innerOrderRequest); + return data; + } + + @Override + public Integer insert(InnerOrderEntity innerOrderEntity) { + return innerOrderDao.insert(innerOrderEntity); + } + + @Override + public Boolean update(InnerOrderEntity innerOrderEntity) { + return innerOrderDao.update(innerOrderEntity); + } + + @Override + public Boolean deleteByIds(List ids) { + return innerOrderDao.deleteByIds(ids); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java index 4c86000a..8d50dcfd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java @@ -125,10 +125,16 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe } else { bacthNo = invProductDetailEntity.getBatchNo(); } - InvProductEntity invProductEntity = invPreInProductDao.selectByUuid(invProductDetailEntity.getProductIdFk(), bacthNo, invProductDetailEntity.getSupId(), invProductDetailEntity.getInvStorageCode(), invProductDetailEntity.getInvWarehouseCode()); - invProductDetailEntity.setCount(invProductEntity.getInCount() - invProductEntity.getOutCount()); +// InvProductEntity invProductEntity = invPreInProductDao.selectByUuid(invProductDetailEntity.getProductIdFk(), bacthNo, invProductDetailEntity.getSupId(), invProductDetailEntity.getInvStorageCode(), invProductDetailEntity.getInvWarehouseCode()); +// invProductDetailEntity.setCount(invProductEntity.getInCount() - invProductEntity.getOutCount()); return invProductDetailEntity; } return null; } + + @Override + public boolean deleteByOrderIdFk(String orderIdFk) { + return invPreInProductDetailDao.deleteByOrderId(orderIdFk); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductServiceImpl.java index cfa19cbe..b862bb4e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductServiceImpl.java @@ -77,9 +77,15 @@ public class InvPreInProductServiceImpl implements InvPreInProductService { public boolean deleteById(String id) { return invPreInProductDao.deleteById(id); } + @Override public boolean deleteAll() { return invPreInProductDao.deleteAll(); } + @Override + public boolean deleteByOrderIdFk(String orderIdFk) { + return invPreInProductDao.deleteByOrderIdFk(orderIdFk); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanySalesmanService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanySalesmanService.java new file mode 100644 index 00000000..6328da81 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanySalesmanService.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.service.purchase; + + +import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity; +import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest; + +import java.util.List; + +public interface CompanySalesmanService { + + List filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest); + + CompanySalesmanEntity findCompanySalesman(String CustomerId); + + CompanySalesmanEntity findCompanySalesmanByName(String name); + + List getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest); + + boolean updateCompanySalesman(CompanySalesmanEntity companyCertEntity); + + boolean insertCompanySalesman(CompanySalesmanEntity companyCertEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanyUpdateLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanyUpdateLogService.java new file mode 100644 index 00000000..082e82f3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CompanyUpdateLogService.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.service.purchase; + + +import com.glxp.api.admin.entity.purchase.CompanyUpdateLogEntity; +import com.glxp.api.admin.req.purchase.FilterCompanyUpdateLogRequest; + +import java.util.List; + +public interface CompanyUpdateLogService { + + List filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); + + CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId); + + CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit); + + List getCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); + + boolean updateCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity); + + boolean insertCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java new file mode 100644 index 00000000..725ab38b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.service.purchase; + + +import com.glxp.api.admin.entity.purchase.CustomerContactEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest; + +import java.util.List; + +public interface CustomerContactService { + + List filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest); + + boolean insertCustomerContact(CustomerContactEntity customerContactEntity); + + boolean updateCustomerContact(CustomerContactEntity customerContactEntity); + + boolean deleteById(Long id); + + boolean deleteContact(DeleteRequest deleteRequest); + + CustomerContactEntity selectById(Long emailId); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurApplyService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurApplyService.java index f0293ede..5b863116 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurApplyService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurApplyService.java @@ -2,12 +2,13 @@ package com.glxp.api.admin.service.purchase; import com.glxp.api.admin.entity.purchase.PurApplyEntity; import com.glxp.api.admin.req.purchase.PurApplyRequest; +import com.glxp.api.admin.res.purchase.PurApplyResponse; import java.util.List; public interface IPurApplyService { - List queryPageList(PurApplyRequest purApplyRequest); + List queryPageList(PurApplyRequest purApplyRequest); Integer insert(PurApplyEntity purApplyEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java index 2cd4758d..57755ab4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanDetailService.java @@ -1,18 +1,24 @@ package com.glxp.api.admin.service.purchase; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity; import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.admin.req.purchase.PurApplyDetailRequest; import com.glxp.api.admin.req.purchase.PurPlanDetailRequest; import java.util.List; public interface IPurPlanDetailService { + List joinQueryList(PurPlanDetailRequest purApplyRequest); + List queryPageList(PurPlanDetailRequest purPlanDetailRequest); - Boolean insert(PurPlanDetailRequest purPlanDetailRequest); + Boolean insert(PurPlanDetailEntity purPlanDetailRequest); - Boolean update(PurPlanDetailRequest purPlanDetailRequest); + Boolean update(PurPlanDetailEntity purPlanDetailRequest); Boolean deleteByIds(List ids); + Boolean deleteByOrderId(String orderIdfK); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanService.java index 6cca2730..802b63f7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/IPurPlanService.java @@ -4,18 +4,19 @@ import com.glxp.api.admin.entity.purchase.PurApplyEntity; import com.glxp.api.admin.entity.purchase.PurPlanEntity; import com.glxp.api.admin.req.purchase.PurApplyRequest; import com.glxp.api.admin.req.purchase.PurPlanRequest; +import com.glxp.api.admin.res.purchase.PurPlanResponse; import java.util.List; public interface IPurPlanService { - List queryPageList(PurPlanRequest purPlanRequest); + List queryPageList(PurPlanRequest purPlanRequest); - Boolean insert(PurPlanRequest purPlanRequest); + Boolean insert(PurPlanEntity purPlanRequest); - Boolean update(PurPlanRequest purPlanRequest); + Boolean update(PurPlanEntity purPlanRequest); - Boolean deleteByIds(List ids); + Boolean deleteByIds(List ids); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java new file mode 100644 index 00000000..7e553d52 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java @@ -0,0 +1,35 @@ +package com.glxp.api.admin.service.purchase; + + +import com.glxp.api.admin.entity.purchase.SupCertEntity; +import com.glxp.api.admin.req.purchase.FilterSupCertRequest; + +import java.util.List; + +public interface SupCertService { + + List filterCompanyCert(FilterSupCertRequest filterSupCertRequest); + + SupCertEntity findCompanyCertByName(String name); + + List findAll(String customerId); + + List findAll(String customerId, String manufacturerId); + + List findAll(String customerId, String manufacturerId, String productId); + + + List getCompanyCert(FilterSupCertRequest filterSupCertRequest); + + boolean updateCompanyCert(SupCertEntity supCertEntity); + + boolean updateCustomerId(String oldId, String newId); + + boolean updateManufacturerId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk); + + boolean updateProductId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk, String oldProductIdFk, String newProductIdFk); + + boolean insertCompanyCert(SupCertEntity supCertEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java new file mode 100644 index 00000000..b24ababa --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.service.purchase; + + +import com.glxp.api.admin.entity.purchase.SupCertSetEntity; +import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; + +import java.util.List; + +public interface SupCertSetService { + + + List filterCertSets(FilterCertSetsRequest filterCertSetsRequest); + + boolean updateCertSet(SupCertSetEntity supCertSetEntity); + + boolean insertCertSet(SupCertSetEntity supCertSetEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java new file mode 100644 index 00000000..5778819d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java @@ -0,0 +1,29 @@ +package com.glxp.api.admin.service.purchase; + + +import com.glxp.api.admin.entity.purchase.SupCompanyEntity; +import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; + +import java.util.List; + +public interface SupCompanyService { + + SupCompanyEntity findCompanyByUnitFk(String unitFk); + + List filterCompany(FilterSupCompanyRequest companyRequest); + + SupCompanyEntity findCompany(String CustomerId); + + List getSubCompany(FilterSupCompanyRequest commitRequest); + + List getSubCompany2(FilterSupCompanyRequest commitRequest); + + SupCompanyEntity findCompanyByName(String companyName); + + boolean modifyCompany(SupCompanyEntity companyEntity); + + boolean insertCompany(SupCompanyEntity companyEntity); + + + boolean deleteCompany(Long customerId); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupManufacturerService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupManufacturerService.java new file mode 100644 index 00000000..6688a7d2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupManufacturerService.java @@ -0,0 +1,26 @@ +package com.glxp.api.admin.service.purchase; + + +import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; + +import java.util.List; + +public interface SupManufacturerService { + + SupManufacturerEntity findCompany(Long id); + + SupManufacturerEntity findManufacturer(String manufacturerId); + + + SupManufacturerEntity findCompanyByName(String companyName); + + List getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest); + + boolean modifyCompany(SupManufacturerEntity supManufacturerEntity); + + boolean insertCompany(SupManufacturerEntity supManufacturerEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupProductService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupProductService.java new file mode 100644 index 00000000..0fde1058 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupProductService.java @@ -0,0 +1,29 @@ +package com.glxp.api.admin.service.purchase; + +import com.glxp.api.admin.entity.purchase.SupProductEntity; +import com.glxp.api.admin.req.purchase.FilterPoductRequest; +import com.glxp.api.admin.res.purchase.SupProductResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SupProductService { + + SupProductEntity findRegistration(Long id); + + SupProductResponse findByProductId(String productId); + + SupProductResponse findJoinRegistration(Long id); + + SupProductEntity findRegistrationByName(String recordProductName); + + List getRegistration(FilterPoductRequest filterPoductRequest); + + boolean modifyRegistration(SupProductEntity supProductEntity); + + boolean insertRegistration(SupProductEntity supProductEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanySalesmanServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanySalesmanServiceImpl.java new file mode 100644 index 00000000..73753728 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanySalesmanServiceImpl.java @@ -0,0 +1,67 @@ +package com.glxp.api.admin.service.purchase.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.purchase.CompanySalesmanDao; +import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity; +import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest; +import com.glxp.api.admin.service.purchase.CompanySalesmanService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CompanySalesmanServiceImpl implements CompanySalesmanService { + + @Resource + CompanySalesmanDao companySalesmanDao; + + @Override + public List filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest) { + if (filterCompanySalesmanRequest == null) { + return Collections.emptyList(); + } + if (filterCompanySalesmanRequest.getPage() != null) { + int offset = (filterCompanySalesmanRequest.getPage() - 1) * filterCompanySalesmanRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanySalesmanRequest.getLimit()); + } + return companySalesmanDao.filterCompanySalesman(filterCompanySalesmanRequest); + } + + @Override + public CompanySalesmanEntity findCompanySalesman(String CustomerId) { + return companySalesmanDao.findCompanySalesman(CustomerId); + } + + @Override + public List getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest) { + if (filterCompanySalesmanRequest == null) { + return Collections.emptyList(); + } + int offset = (filterCompanySalesmanRequest.getPage() - 1) * filterCompanySalesmanRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanySalesmanRequest.getLimit()); + List companyEntities = companySalesmanDao.getCompanySalesman(filterCompanySalesmanRequest); + return companyEntities; + } + + @Override + public CompanySalesmanEntity findCompanySalesmanByName(String companyName) { + return companySalesmanDao.findCompanySalesmanByName(companyName); + } + + @Override + public boolean updateCompanySalesman(CompanySalesmanEntity companySalesmanEntity) { + return companySalesmanDao.updateCompanySalesman(companySalesmanEntity); + } + + @Override + public boolean insertCompanySalesman(CompanySalesmanEntity companySalesmanEntity) { + return companySalesmanDao.insertCompanySalesman(companySalesmanEntity); + } + + @Override + public boolean deleteById(String id) { + return companySalesmanDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanyUpdateLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanyUpdateLogServiceImpl.java new file mode 100644 index 00000000..6cf9c0ff --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CompanyUpdateLogServiceImpl.java @@ -0,0 +1,67 @@ +package com.glxp.api.admin.service.purchase.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.purchase.CompanyUpdateLogDao; +import com.glxp.api.admin.entity.purchase.CompanyUpdateLogEntity; +import com.glxp.api.admin.req.purchase.FilterCompanyUpdateLogRequest; +import com.glxp.api.admin.service.purchase.CompanyUpdateLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CompanyUpdateLogServiceImpl implements CompanyUpdateLogService { + + @Resource + CompanyUpdateLogDao companyUpdateLogDao; + + @Override + public List filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest) { + if (filterCompanyUpdateLogRequest == null) { + return Collections.emptyList(); + } + if (filterCompanyUpdateLogRequest.getPage() != null) { + int offset = (filterCompanyUpdateLogRequest.getPage() - 1) * filterCompanyUpdateLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanyUpdateLogRequest.getLimit()); + } + return companyUpdateLogDao.filterCompanyUpdateLog(filterCompanyUpdateLogRequest); + } + + @Override + public CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId) { + return companyUpdateLogDao.findCompanyUpdateLog(CustomerId); + } + + @Override + public List getCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest) { + if (filterCompanyUpdateLogRequest == null) { + return Collections.emptyList(); + } + int offset = (filterCompanyUpdateLogRequest.getPage() - 1) * filterCompanyUpdateLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanyUpdateLogRequest.getLimit()); + List companyEntities = companyUpdateLogDao.getCompanyUpdateLog(filterCompanyUpdateLogRequest); + return companyEntities; + } + + @Override + public CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit) { + return companyUpdateLogDao.findCompanyUpdateLogBySubmit(submit); + } + + @Override + public boolean updateCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity) { + return companyUpdateLogDao.updateCompanyUpdateLog(companyUpdateLogEntity); + } + + @Override + public boolean insertCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity) { + return companyUpdateLogDao.insertCompanyUpdateLog(companyUpdateLogEntity); + } + + @Override + public boolean deleteById(String id) { + return companyUpdateLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java new file mode 100644 index 00000000..670e665a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java @@ -0,0 +1,57 @@ +package com.glxp.api.admin.service.purchase.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.purchase.CustomerContacDao; +import com.glxp.api.admin.entity.purchase.CustomerContactEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest; +import com.glxp.api.admin.service.purchase.CustomerContactService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CustomerContactServiceImpl implements CustomerContactService { + + + @Resource + private CustomerContacDao customerContacDao; + + @Override + public List filterCustomerContact(CustomerContactFilterRequest customerContactFilterRequest) { + if (customerContactFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (customerContactFilterRequest.getPage() - 1) * customerContactFilterRequest.getLimit(); + PageHelper.offsetPage(offset, customerContactFilterRequest.getLimit()); + return customerContacDao.filterCustomerContact(customerContactFilterRequest); + } + + @Override + public boolean insertCustomerContact(CustomerContactEntity customerContactEntity) { + return customerContacDao.insertCustomerContact(customerContactEntity); + } + + @Override + public boolean updateCustomerContact(CustomerContactEntity customerContactEntity) { + return customerContacDao.updateCustomerContact(customerContactEntity); + } + + @Override + public boolean deleteById(Long id) { + return customerContacDao.deleteById(id); + } + + @Override + public boolean deleteContact(DeleteRequest deleteRequest) { + return customerContacDao.deleteContact(deleteRequest); + } + + + @Override + public CustomerContactEntity selectById(Long emailId) { + return customerContacDao.selectById(emailId); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurApplyServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurApplyServiceImpl.java index f44bf830..cfccb4c8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurApplyServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurApplyServiceImpl.java @@ -5,6 +5,7 @@ import com.glxp.api.admin.dao.purchase.PurApplyDao; import com.glxp.api.admin.entity.purchase.PurApplyEntity; import com.glxp.api.admin.entity.purchase.PurPlanEntity; import com.glxp.api.admin.req.purchase.PurApplyRequest; +import com.glxp.api.admin.res.purchase.PurApplyResponse; import com.glxp.api.admin.service.purchase.IPurApplyService; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Service; @@ -20,7 +21,7 @@ public class PurApplyServiceImpl implements IPurApplyService { PurApplyDao purApplyDao; @Override - public List queryPageList(PurApplyRequest purApplyRequest) { + public List queryPageList(PurApplyRequest purApplyRequest) { if (purApplyRequest == null) { return Collections.emptyList(); } @@ -28,7 +29,7 @@ public class PurApplyServiceImpl implements IPurApplyService { int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); PageHelper.offsetPage(offset, purApplyRequest.getLimit()); } - List data = purApplyDao.queryPageList(purApplyRequest); + List data = purApplyDao.queryPageList(purApplyRequest); return data; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java index 1b52f130..b2d0cf0a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanDetailServiceImpl.java @@ -1,24 +1,37 @@ package com.glxp.api.admin.service.purchase.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.purchase.PurPlanDao; import com.glxp.api.admin.dao.purchase.PurPlanDetailDao; -import com.glxp.api.admin.entity.purchase.PurApplyEntity; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity; import com.glxp.api.admin.req.purchase.PurPlanDetailRequest; -import com.glxp.api.admin.req.purchase.PurPlanRequest; import com.glxp.api.admin.service.purchase.IPurPlanDetailService; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.Collections; import java.util.List; + @Service public class PurPlanDetailServiceImpl implements IPurPlanDetailService { - @Mapper + @Resource PurPlanDetailDao purPlanDetailDao; + @Override + public List joinQueryList(PurPlanDetailRequest purApplyRequest) { + if (purApplyRequest == null) { + return Collections.emptyList(); + } + if (purApplyRequest.getPage() != null) { + int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); + PageHelper.offsetPage(offset, purApplyRequest.getLimit()); + } + List data = purPlanDetailDao.joinQueryList(purApplyRequest); + return data; + } + @Override public List queryPageList(PurPlanDetailRequest purPlanDetailRequest) { if (purPlanDetailRequest == null) { @@ -33,12 +46,12 @@ public class PurPlanDetailServiceImpl implements IPurPlanDetailService { } @Override - public Boolean insert(PurPlanDetailRequest purPlanDetailRequest) { + public Boolean insert(PurPlanDetailEntity purPlanDetailRequest) { return purPlanDetailDao.insert(purPlanDetailRequest); } @Override - public Boolean update(PurPlanDetailRequest purPlanDetailRequest) { + public Boolean update(PurPlanDetailEntity purPlanDetailRequest) { return purPlanDetailDao.update(purPlanDetailRequest); } @@ -46,4 +59,10 @@ public class PurPlanDetailServiceImpl implements IPurPlanDetailService { public Boolean deleteByIds(List ids) { return purPlanDetailDao.deleteByIds(ids); } + + @Override + public Boolean deleteByOrderId(String orderIdfK) { + return purPlanDetailDao.deleteByOrderId(orderIdfK); + + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanServiceImpl.java index 8c6f8c4e..82ce432d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/PurPlanServiceImpl.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.purchase.PurPlanDao; import com.glxp.api.admin.entity.purchase.PurPlanEntity; import com.glxp.api.admin.req.purchase.PurPlanRequest; +import com.glxp.api.admin.res.purchase.PurPlanResponse; import com.glxp.api.admin.service.purchase.IPurPlanService; import org.springframework.stereotype.Service; @@ -18,7 +19,7 @@ public class PurPlanServiceImpl implements IPurPlanService { PurPlanDao purPlanDao; @Override - public List queryPageList(PurPlanRequest purPlanRequest) { + public List queryPageList(PurPlanRequest purPlanRequest) { if (purPlanRequest == null) { return Collections.emptyList(); } @@ -26,22 +27,22 @@ public class PurPlanServiceImpl implements IPurPlanService { int offset = (purPlanRequest.getPage() - 1) * purPlanRequest.getLimit(); PageHelper.offsetPage(offset, purPlanRequest.getLimit()); } - List data = purPlanDao.queryPageList(purPlanRequest); + List data = purPlanDao.queryPageList(purPlanRequest); return data; } @Override - public Boolean insert(PurPlanRequest purPlanRequest) { + public Boolean insert(PurPlanEntity purPlanRequest) { return purPlanDao.insert(purPlanRequest); } @Override - public Boolean update(PurPlanRequest purPlanRequest) { + public Boolean update(PurPlanEntity purPlanRequest) { return purPlanDao.update(purPlanRequest); } @Override - public Boolean deleteByIds(List ids) { + public Boolean deleteByIds(List ids) { return purPlanDao.deleteByIds(ids); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java new file mode 100644 index 00000000..f8cd89d5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java @@ -0,0 +1,117 @@ +package com.glxp.api.admin.service.purchase.impl; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.dao.purchase.SupCertDao; +import com.glxp.api.admin.entity.purchase.SupCertEntity; +import com.glxp.api.admin.req.purchase.FilterSupCertRequest; +import com.glxp.api.admin.service.purchase.SupCertService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SupCertServiceImpl implements SupCertService { + + @Resource + SupCertDao supCertDao; + + @Override + public List filterCompanyCert(FilterSupCertRequest filterSupCertRequest) { + if (filterSupCertRequest == null) { + return Collections.emptyList(); + } + if (filterSupCertRequest.getPage() != null) { + int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit(); + PageHelper.offsetPage(offset, filterSupCertRequest.getLimit()); + } + return supCertDao.filterCompanyCert(filterSupCertRequest); + } + + + @Override + public List getCompanyCert(FilterSupCertRequest filterSupCertRequest) { + if (filterSupCertRequest == null) { + return Collections.emptyList(); + } + int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit(); + PageHelper.offsetPage(offset, filterSupCertRequest.getLimit()); + List companyEntities = supCertDao.getCompanyCert(filterSupCertRequest); + return companyEntities; + } + + @Override + public SupCertEntity findCompanyCertByName(String companyName) { + return supCertDao.findCompanyCertByName(companyName); + } + + @Override + public List findAll(String customerId) { + if (StrUtil.isEmpty(customerId)) + return null; + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(customerId); + filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertEntityList = supCertDao.filterCompanyCert(filterSupCertRequest); + return supCertEntityList; + } + + @Override + public List findAll(String customerId, String manufacturerId) { + if (StrUtil.isEmpty(customerId) || StrUtil.isEmpty(manufacturerId)) + return null; + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(customerId); + filterSupCertRequest.setManufacturerIdFk(manufacturerId); + filterSupCertRequest.setType(ConstantStatus.CERT_MANUFACTURER); + List supCertEntityList = supCertDao.filterCompanyCert(filterSupCertRequest); + return supCertEntityList; + } + + @Override + public List findAll(String customerId, String manufacturerId, String productId) { + if (StrUtil.isEmpty(customerId) || StrUtil.isEmpty(manufacturerId) || StrUtil.isEmpty(productId)) + return null; + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(customerId); + filterSupCertRequest.setManufacturerIdFk(manufacturerId); + filterSupCertRequest.setProductIdFk(productId); + filterSupCertRequest.setType(ConstantStatus.CERT_PRODUCT); + List supCertEntityList = supCertDao.filterCompanyCert(filterSupCertRequest); + return supCertEntityList; + } + + + @Override + public boolean updateCompanyCert(SupCertEntity supCertEntity) { + return supCertDao.updateCompanyCert(supCertEntity); + } + + @Override + public boolean updateCustomerId(String oldId, String newId) { + return supCertDao.updateCustomerId(oldId, newId); + } + + @Override + public boolean updateManufacturerId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk) { + return supCertDao.updateManufacturerId(oldCustomerId, newCustomerId, oldManufacturerIdFk, newManufacturerIdFk); + } + + @Override + public boolean updateProductId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk, String oldProductIdFk, String newProductIdFk) { + return supCertDao.updateProductId(oldCustomerId, newCustomerId, oldManufacturerIdFk, newManufacturerIdFk, oldProductIdFk, newProductIdFk); + } + + @Override + public boolean insertCompanyCert(SupCertEntity supCertEntity) { + return supCertDao.insertCompanyCert(supCertEntity); + } + + @Override + public boolean deleteById(String id) { + return supCertDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java new file mode 100644 index 00000000..411ecf0b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java @@ -0,0 +1,48 @@ +package com.glxp.api.admin.service.purchase.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.purchase.SupCertSetDao; +import com.glxp.api.admin.entity.purchase.SupCertSetEntity; +import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; +import com.glxp.api.admin.service.purchase.SupCertSetService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SupCertSetServiceImpl implements SupCertSetService { + + @Resource + SupCertSetDao supCertSetDao; + + @Override + public List filterCertSets(FilterCertSetsRequest filterCertSetsRequest) { + + if (filterCertSetsRequest == null) { + return Collections.emptyList(); + } + if (filterCertSetsRequest.getPage() != null) { + int offset = (filterCertSetsRequest.getPage() - 1) * filterCertSetsRequest.getLimit(); + PageHelper.offsetPage(offset, filterCertSetsRequest.getLimit()); + } + return supCertSetDao.filterCertSets(filterCertSetsRequest); + + } + + @Override + public boolean updateCertSet(SupCertSetEntity supCertSetEntity) { + return supCertSetDao.updateCertSet(supCertSetEntity); + } + + @Override + public boolean insertCertSet(SupCertSetEntity supCertSetEntity) { + return supCertSetDao.insertCertSet(supCertSetEntity); + } + + @Override + public boolean deleteById(String id) { + return supCertSetDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java new file mode 100644 index 00000000..9e8b08ff --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java @@ -0,0 +1,83 @@ +package com.glxp.api.admin.service.purchase.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.purchase.SupCompanyDao; +import com.glxp.api.admin.entity.purchase.SupCompanyEntity; +import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; +import com.glxp.api.admin.service.purchase.SupCompanyService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SupCompanyServiceImpl implements SupCompanyService { + + @Resource + SupCompanyDao supCompanyDao; + + @Override + public SupCompanyEntity findCompanyByUnitFk(String unitFk) { + FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest(); + filterSupCompanyRequest.setUnitIdFk(unitFk); + List companyEntities = supCompanyDao.filterCompany(filterSupCompanyRequest); + if (companyEntities != null && companyEntities.size() > 0) { + return companyEntities.get(0); + } + return null; + } + + @Override + public List filterCompany(FilterSupCompanyRequest companyRequest) { + return supCompanyDao.filterCompany(companyRequest); + } + + @Override + public SupCompanyEntity findCompany(String CustomerId) { + return supCompanyDao.findCompany(CustomerId); + } + + @Override + public List getSubCompany(FilterSupCompanyRequest commitRequest) { + if (commitRequest == null) { + return Collections.emptyList(); + } + int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); + PageHelper.offsetPage(offset, commitRequest.getLimit()); + List companyEntities = supCompanyDao.getSubCompany(commitRequest); + return companyEntities; + } + + @Override + public List getSubCompany2(FilterSupCompanyRequest commitRequest) { + if (commitRequest == null) { + return Collections.emptyList(); + } + int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); + PageHelper.offsetPage(offset, commitRequest.getLimit()); + List companyEntities = supCompanyDao.getSubCompany2(commitRequest); + return companyEntities; + } + + @Override + public SupCompanyEntity findCompanyByName(String companyName) { + return supCompanyDao.findCompanyByName(companyName); + } + + @Override + public boolean modifyCompany(SupCompanyEntity companyEntity) { + return supCompanyDao.modifyCompany(companyEntity); + } + + @Override + public boolean insertCompany(SupCompanyEntity companyEntity) { + return supCompanyDao.insertCompany(companyEntity); + } + + + @Override + public boolean deleteCompany(Long customerId) { + return supCompanyDao.deleteCompany(customerId); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupManufacturerServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupManufacturerServiceImpl.java new file mode 100644 index 00000000..a94f08b7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupManufacturerServiceImpl.java @@ -0,0 +1,72 @@ +package com.glxp.api.admin.service.purchase.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.purchase.SupManufacturerDao; +import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; +import com.glxp.api.admin.service.purchase.SupManufacturerService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SupManufacturerServiceImpl implements SupManufacturerService { + + @Resource + SupManufacturerDao supManufacturerDao; + + @Override + public SupManufacturerEntity findCompany(Long id) { + return supManufacturerDao.findCompany(id); + } + + @Override + public SupManufacturerEntity findCompanyByName(String companyName) { + return supManufacturerDao.findCompanyByName(companyName); + } + + @Override + public SupManufacturerEntity findManufacturer(String manufacturerId) { + + if (StrUtil.isEmpty(manufacturerId)) { + return null; + } + FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest(); + filterSupManufacturerRequest.setManufacturerId(manufacturerId); + List companyEntities = supManufacturerDao.getCompany(filterSupManufacturerRequest); + if (CollUtil.isNotEmpty(companyEntities)) { + return companyEntities.get(0); + } + return null; + } + + @Override + public List getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest) { + if (filterSupManufacturerRequest == null) { + return Collections.emptyList(); + } + int offset = (filterSupManufacturerRequest.getPage() - 1) * filterSupManufacturerRequest.getLimit(); + PageHelper.offsetPage(offset, filterSupManufacturerRequest.getLimit()); + List companyEntities = supManufacturerDao.getCompany(filterSupManufacturerRequest); + return companyEntities; + } + + @Override + public boolean modifyCompany(SupManufacturerEntity companyEntity) { + return supManufacturerDao.modifyCompany(companyEntity); + } + + @Override + public boolean insertCompany(SupManufacturerEntity companyEntity) { + return supManufacturerDao.insertCompany(companyEntity); + } + + @Override + public boolean deleteById(String id) { + return supManufacturerDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupProductServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupProductServiceImpl.java new file mode 100644 index 00000000..f381ef3c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupProductServiceImpl.java @@ -0,0 +1,92 @@ +package com.glxp.api.admin.service.purchase.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.purchase.SupProductDao; +import com.glxp.api.admin.entity.purchase.SupProductEntity; +import com.glxp.api.admin.req.purchase.FilterPoductRequest; +import com.glxp.api.admin.res.purchase.SupProductResponse; +import com.glxp.api.admin.service.purchase.SupProductService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SupProductServiceImpl implements SupProductService { + + @Resource + SupProductDao supProductDao; + + @Override + public SupProductEntity findRegistration(Long id) { + return supProductDao.findRegistration(id); + } + + @Override + public SupProductResponse findJoinRegistration(Long id) { + if (id == null) + return null; + FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); + filterPoductRequest.setId(id); + List companyEntities = supProductDao.getRegistration(filterPoductRequest); + if (CollUtil.isNotEmpty(companyEntities)) + return companyEntities.get(0); + + return null; + } + + @Override + public SupProductResponse findByProductId(String productId) { + + if (StrUtil.isEmpty(productId)) { + return null; + } + FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); + filterPoductRequest.setProductId(productId); + List supProductEntities = supProductDao.getRegistration(filterPoductRequest); + if (CollUtil.isNotEmpty(supProductEntities)) + return supProductEntities.get(0); + return null; + } + + @Override + public SupProductEntity findRegistrationByName(String recordProductName) { + return supProductDao.findRegistrationByName(recordProductName); + } + + @Override + public List getRegistration(FilterPoductRequest filterPoductRequest) { + if (filterPoductRequest == null) { + return Collections.emptyList(); + } + if (filterPoductRequest.getPage() != null) { + int offset = (filterPoductRequest.getPage() - 1) * filterPoductRequest.getLimit(); + PageHelper.offsetPage(offset, filterPoductRequest.getLimit()); + } + List companyEntities = supProductDao.getRegistration(filterPoductRequest); + return companyEntities; + } + + @Override + public boolean modifyRegistration(SupProductEntity companyEntity) { + return supProductDao.modifyRegistration(companyEntity); + } + + @Override + public boolean insertRegistration(SupProductEntity companyEntity) { + return supProductDao.insertRegistration(companyEntity); + } + + @Override + public boolean deleteById(String id) { + return supProductDao.deleteById(id); + } + + @Override + public boolean deleteByEnterpriseId(String enterpriseId) { + return supProductDao.deleteByEnterpriseId(enterpriseId); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/CompanyProductsRelService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/CompanyProductsRelService.java index 78cae0ba..8bc2ec38 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/CompanyProductsRelService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/CompanyProductsRelService.java @@ -36,8 +36,8 @@ public class CompanyProductsRelService { companyProductRelevanceEntity.setUpdate_time(new Date()); companyProductRelevanceEntity.setAuditStatus("3"); companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk()); - companyProductRelevanceEntity.setUdiRlIdFk(Integer.parseInt(uuid)); - companyProductRelevanceEntity.setCustomerId(Long.parseLong(udiInfoExportRequest.getUnitFk())); + companyProductRelevanceEntity.setUdiRlIdFk(uuid); + companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getUnitFk()); boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java index d4beff9c..aad2ab2c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java @@ -94,27 +94,32 @@ public class InvProductsTrService { ErpOrderEntity erpOrderEntity = getErpOrders(warehouseEntity, erpOrderEntities); if (bussinessTypeEntity.isPreIn()) { - InvProductEntity invPreProductEntity = - invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId() - , warehouseEntity.getLocStorageCode(), warehouseEntity.getInvWarehouseCode()); + InvProductEntity invPreProductEntity = null; +// invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId() +// , warehouseEntity.getLocStorageCode(), warehouseEntity.getInvWarehouseCode()); if (invPreProductEntity == null) { - invPreProductEntity = buildInvProduct(erpOrderEntity.getGoodsid(), erpOrderEntity, orderEntity, warehouseEntity); + invPreProductEntity = buildInvPreInProduct(orderEntity, erpOrderEntity, warehouseEntity); invPreProductEntity.setUpdateTime(new Date()); invPreInProductService.insertInvProduct(invPreProductEntity); - } else { - int actCount = getActCount(warehouseEntity); - int count = actCount * warehouseEntity.getCount(); - if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invPreProductEntity.setOutCount(invPreProductEntity.getOutCount() + count); - } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count); - } - if (erpOrderEntity.getPrice() != null) { - invPreProductEntity.setPrice(erpOrderEntity.getPrice() + ""); - } - invPreProductEntity.setUpdateTime(new Date()); - invPreInProductService.updateInvProduct(invPreProductEntity); } + + /** + * else { + * int actCount = getActCount(warehouseEntity); + * int count = actCount * warehouseEntity.getCount(); + * if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { + * invPreProductEntity.setOutCount(invPreProductEntity.getOutCount() + count); + * } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { + * invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count); + * } + * if (erpOrderEntity.getPrice() != null) { + * invPreProductEntity.setPrice(erpOrderEntity.getPrice() + ""); + * } + * invPreProductEntity.setUpdateTime(new Date()); + * invPreInProductService.updateInvProduct(invPreProductEntity); + * } + */ + } else if (bussinessTypeEntity.isAdvanceType()) {//预入库，则转存预入库 InvProductEntity invPreProductEntity = invPreProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId() @@ -161,20 +166,20 @@ public class InvProductsTrService { } if (orderEntity.isPreCheck()) { - int actCount = getActCount(warehouseEntity); - int count = actCount * warehouseEntity.getCount(); - InvProductEntity preInvEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), - warehouseEntity.getSupId(), null, null); - if (preInvEntity != null) { - if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - preInvEntity.setOutCount(preInvEntity.getOutCount() + count); - } - if (erpOrderEntity.getPrice() != null) { - preInvEntity.setPrice(erpOrderEntity.getPrice() + ""); - } - } - preInvEntity.setUpdateTime(new Date()); - invPreInProductService.updateInvProduct(preInvEntity); +// int actCount = getActCount(warehouseEntity); +// int count = actCount * warehouseEntity.getCount(); +// InvProductEntity preInvEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), +// warehouseEntity.getSupId(), null, null); +// if (preInvEntity != null) { +// if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { +// preInvEntity.setOutCount(preInvEntity.getOutCount() + count); +// } +// if (erpOrderEntity.getPrice() != null) { +// preInvEntity.setPrice(erpOrderEntity.getPrice() + ""); +// } +// } +// preInvEntity.setUpdateTime(new Date()); +// invPreInProductService.updateInvProduct(preInvEntity); } } @@ -201,11 +206,11 @@ public class InvProductsTrService { } else { invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 2); - if (orderEntity.isPreCheck()) { -// insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存 - - invPreInProductDetailService.insertInvProducts(invProductDetailEntities); - } +// if (orderEntity.isPreCheck()) { +//// insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存 +// +// invPreInProductDetailService.insertInvProducts(invProductDetailEntities); +// } } if (invProductDetailEntities != null && invProductDetailEntities.size() > 0) { mInvProductDetailEntities.addAll(invProductDetailEntities); @@ -864,6 +869,38 @@ public class InvProductsTrService { return invProductEntity; } + //生成预验收库存 + private InvProductEntity buildInvPreInProduct(OrderEntity orderEntity, ErpOrderEntity erpOrderEntity, WarehouseEntity warehouseEntity) { + InvProductEntity invProductEntity = new InvProductEntity(); + invProductEntity.setRelIdFk(erpOrderEntity.getGoodsid()); + if (StrUtil.isNotEmpty(erpOrderEntity.getBatchNo())) { + invProductEntity.setBatchNo(erpOrderEntity.getBatchNo()); + } else + invProductEntity.setBatchNo(null); + invProductEntity.setCustomerId(orderEntity.getCustomerId()); + invProductEntity.setExpireDate(erpOrderEntity.getExpireDate()); + invProductEntity.setProductionDate(erpOrderEntity.getProductDate()); + 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()); + invProductEntity.setInvStorageCode(warehouseEntity.getLocStorageCode()); + invProductEntity.setOrderIdFk(orderEntity.getId()); + invProductEntity.setInvWarehouseCode(warehouseEntity.getInvWarehouseCode()); + int count = getActCount(warehouseEntity) * warehouseEntity.getCount(); + if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { + invProductEntity.setOutCount(count); + } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { + invProductEntity.setInCount(count); + } + + return invProductEntity; + } + + //生成库存条码 private List buildInvProductDetail(String orderId, ErpOrderEntity erpOrderEntity, OrderEntity orderEntity, Integer purchaseType) { @@ -1046,30 +1083,6 @@ public class InvProductsTrService { } - //根据条码获取预入库结余数量 - public int getPreCountByOrder(String mainAction, String code, String supId) { - FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); - filterInvProductDetailRequest.setCode(code); - filterInvProductDetailRequest.setSupId(supId); - if (mainAction != null) - filterInvProductDetailRequest.setMainAction(mainAction); - List detailJoinResponseList - = invPreProductDetailService.filterJoinInvProduct(filterInvProductDetailRequest); - int invCount = 0; - if (detailJoinResponseList != null && detailJoinResponseList.size() > 0) { - for (InvProductDetailJoinResponse invProductDetailJoinResponse : detailJoinResponseList) { - if (invProductDetailJoinResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { - invCount = invCount - invProductDetailJoinResponse.getCount(); - } else { - invCount = invCount + invProductDetailJoinResponse.getCount(); - } - - } - } - return invCount; - } - - public int getPreCountByOrder(String mainAction, String relId, String batchNo, String supId, String invWarehouseCode) { FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setSupId(supId); @@ -1094,53 +1107,6 @@ public class InvProductsTrService { } - //根据条码获取库存结余数量 - public int getCountByProduct(String mainAction, String productId, String batchNo, String supId) { - FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); - filterInvProductDetailRequest.setProductIdFk(productId); - filterInvProductDetailRequest.setBatchNo(batchNo); - filterInvProductDetailRequest.setSupId(supId); - if (mainAction != null) - filterInvProductDetailRequest.setMainAction(mainAction); - List detailJoinResponseList - = invProductDetailService.filterJoinInvProduct(filterInvProductDetailRequest); - int invCount = 0; - if (detailJoinResponseList != null && detailJoinResponseList.size() > 0) { - for (InvProductDetailJoinResponse invProductDetailJoinResponse : detailJoinResponseList) { - if (invProductDetailJoinResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { - invCount = invCount - invProductDetailJoinResponse.getCount(); - } else { - invCount = invCount + invProductDetailJoinResponse.getCount(); - } - } - } - return invCount; - } - - //根据条码获取预入库结余数量 - public int getPreCountByProduct(String mainAction, String productId, String batchNo, String supId) { - FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); - filterInvProductDetailRequest.setProductIdFk(productId); - filterInvProductDetailRequest.setBatchNo(batchNo); - filterInvProductDetailRequest.setSupId(supId); - if (mainAction != null) - filterInvProductDetailRequest.setMainAction(mainAction); - List detailJoinResponseList - = invPreProductDetailService.filterJoinInvProduct(filterInvProductDetailRequest); - int invCount = 0; - if (detailJoinResponseList != null && detailJoinResponseList.size() > 0) { - for (InvProductDetailJoinResponse invProductDetailJoinResponse : detailJoinResponseList) { - if (invProductDetailJoinResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { - invCount = invCount - invProductDetailJoinResponse.getCount(); - } else { - invCount = invCount + invProductDetailJoinResponse.getCount(); - } - - } - } - return invCount; - } - //合并条码 public List filterMapCodes(List warehouseEntityList) { Map filterMap = new HashMap<>(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index 1c16cfe7..b39909c4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -64,9 +64,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; @Service public class IoTransInoutService { @@ -109,6 +107,15 @@ public class IoTransInoutService { @Resource StockOrderRemakDao stockOrderRemakDao; + @Resource + InvPreInProductService invPreInProductService; + @Resource + InvPreInProductDetailService invPreInProductDetailService; + @Resource + InvPreProductDetailService invPreProductDetailService; + @Resource + InvProductDetailService invProductDetailService; + @Async public void creatOrderAsycn(PostOrderRequest postOrderRequest, Integer fromType) { creatOrder(postOrderRequest, fromType); @@ -443,11 +450,6 @@ public class IoTransInoutService { } } - @Resource - InvPreProductDetailService invPreProductDetailService; - @Resource - InvProductDetailService invProductDetailService; - public String checkOriginCode(WarehouseEntity warehouseEntity, BussinessTypeEntity bussinessTypeEntity) { UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode()); @@ -898,8 +900,31 @@ public class IoTransInoutService { stockOrderEntity.setOrderIdFk(orderEntity.getId()); stockOrderService.updateById(stockOrderEntity); } + } - + //预验收出库，1：删除对应的预验收库存；2.把预验收单关联到对应的扫码单据与业务单据 + if (bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT) && bussinessTypeEntity.isScanPreIn()) { + List codeList = warehouseService.findByReceiptId(orderEntity.getId()); + Map preInOrder = new HashMap<>(); + for (WarehouseEntity warehouseEntity : codeList) { + List invProductDetailEntities = invPreInProductDetailService.findByOriginCode(warehouseEntity.getCode()); + if (invProductDetailEntities.size() > 0) { + preInOrder.put(invProductDetailEntities.get(0).getOrderIdFk(), invProductDetailEntities.get(0).getOrderIdFk()); + } + } + if (preInOrder.size() > 0) { + String preInBillNo = ""; + for (String key : preInOrder.keySet()) { + preInBillNo = preInBillNo + "," + key; + OrderEntity preInEntity = orderService.findById(key); + preInEntity.setPreOutBillNo(orderEntity.getId()); + orderService.updateOrder(preInEntity); + invPreInProductService.deleteByOrderIdFk(preInEntity.getId()); + invPreInProductDetailService.deleteByOrderIdFk(preInEntity.getId()); + } + orderEntity.setPreInBillNo(preInBillNo.substring(1)); + orderService.updateOrder(orderEntity); + } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java index b81547f1..76a74fa6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java @@ -110,11 +110,6 @@ public class ThrOrdersDlService { ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey); if (erpOrderResponses != null && erpOrderResponses.size() > 0) { for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { -// ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); -// BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); -// thrOrderEntity.setThirdSysFk(thirdSys); -// thrOrderEntity.setUpdateTime(new Date()); -// thrOrderService.insertThrOrder(thrOrderEntity); List thrOrderDetailEntities = new ArrayList<>(); for (ErpOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/upload/DownloadController.java b/api-admin/src/main/java/com/glxp/api/admin/upload/DownloadController.java index 4fad618f..602f6b2c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/upload/DownloadController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/upload/DownloadController.java @@ -31,7 +31,7 @@ public class DownloadController { ImageIO.write(image, "png", os); } } catch (IOException e) { - + e.printStackTrace(); } finally { if (os != null) { os.flush(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/upload/ImageController.java b/api-admin/src/main/java/com/glxp/api/admin/upload/ImageController.java new file mode 100644 index 00000000..b6a8ff70 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/upload/ImageController.java @@ -0,0 +1,49 @@ +package com.glxp.api.admin.upload; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; + +@RestController +public class ImageController { + @Value("${file_path}") + private String filePath; + + + @GetMapping(value = "/spms/donwload/pdf") + public void downloadPdf(HttpServletResponse response, + @RequestParam String fileName) throws IOException { + OutputStream os = null; + try { + FileInputStream input = new FileInputStream(new File(filePath + "/pdfprint/" + fileName)); + response.setDateHeader("Expires", 0); + response.setHeader("Content-disposition", "inline; filename=" + "export.pdf"); + response.setContentType("application/pdf; charset=utf-8"); + OutputStream out = response.getOutputStream(); +// JasperExportManager.exportReportToPdfStream(input,out); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + } catch (IOException e) { + + } finally { + if (os != null) { + os.flush(); + os.close(); + } + } + } + +} \ No newline at end of file diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 777e793a..b4131426 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,6 +1,6 @@ server.port=9991 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://192.168.1.18:3306/udiwms_ph1?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 2f828c28..5a8c82b9 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -31,7 +31,7 @@ basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid ,basic_products.basicPrductRemak1 ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 - ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 + ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8,basic_products.hchzsb FROM basic_udirel inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid @@ -404,7 +404,6 @@ - - replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2, thirdId3, + replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2, + thirdId3, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory, measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime) values diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml index 3768cb8d..3e6a3946 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml @@ -138,7 +138,7 @@ UPDATE stock_order_detail - + batchNo=#{batchNo}, productDate=#{productDate}, expireDate=#{expireDate}, @@ -153,8 +153,7 @@ relId=#{relId}, manufactory=#{manufactory}, zczbhhzbapzbh=#{zczbhhzbapzbh}, -0 - + WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 2c1841aa..c4e840d3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -35,7 +35,7 @@ exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, - codeFillCheck) + codeFillCheck, preInBillNo, preOutBillNo) values (#{id}, #{action}, #{corpOrderId}, @@ -57,53 +57,60 @@ #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck}, #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType}, #{invStorageCode}, #{deptCode}, #{printRemark}, - #{codeFillCheck}) + #{codeFillCheck}, #{preInBillNo}, #{preOutBillNo}) insert - ignore + ignore INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction, fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, - fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, codeFillCheck) - values (#{id}, - #{action}, - #{corpOrderId}, - #{actDate}, - #{fromCorpId}, - #{actor}, - #{mainAction}, - #{fromCorp}, - #{status}, - #{remark}, - #{exportStatus}, - #{fromType}, - #{contrastStatus}, - #{signStatus}, - #{receiveStatus}, - #{erpFk}, - #{stockCheckFk}, - #{thirdBillNo}, - #{supId}, - #{exportFilePath}, - #{locStorageCode}, - #{supplementNo}, - #{ullageSupNo}, - #{createUser}, - #{reviewUser}, - #{outChangeEnable}, - #{originUllageSupNo}, - #{preCheck}, - #{updateTime}, - #{replicateNo}, - #{invWarehouseCode}, - #{fromSubInvCode}, - #{createTime}, - #{originFromType}, #{invStorageCode}, #{deptCode}, #{printRemark}, - #{codeFillCheck}) + fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo) + values ( + #{id}, + #{action}, + #{corpOrderId}, + #{actDate}, + #{fromCorpId}, + #{actor}, + #{mainAction}, + #{fromCorp}, + #{status}, + #{remark}, + #{exportStatus}, + #{fromType}, + #{contrastStatus}, + #{signStatus}, + #{receiveStatus}, + #{erpFk}, + #{stockCheckFk}, + #{thirdBillNo}, + #{supId}, + #{exportFilePath}, + #{locStorageCode}, + #{supplementNo}, + #{ullageSupNo}, + #{createUser}, + #{reviewUser}, + #{outChangeEnable}, + #{originUllageSupNo}, + #{preCheck}, + #{updateTime}, + #{replicateNo}, + #{invWarehouseCode}, + #{fromSubInvCode}, + #{createTime}, + #{originFromType}, + #{invStorageCode}, + #{deptCode}, + #{printRemark}, + #{codeFillCheck}, + #{preInBillNo}, + #{preOutBillNo} + ) @@ -148,6 +155,8 @@ deptCode=#{deptCode}, printRemark=#{printRemark}, codeFillCheck=#{codeFillCheck}, + preInBillNo=#{preInBillNo}, + preOutBillNo=#{preOutBillNo}, WHERE id = #{id} @@ -205,7 +214,7 @@ left join basic_bussiness_type on io_order.action = basic_bussiness_type.action LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code` LEFT JOIN inv_warehouse_sub iws ON io_order.invWarehouseCode = iws.`code` - LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code` + LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.code = io_order.invWarehouseCode LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code` left join auth_dept on io_order.deptCode =auth_dept.code @@ -300,7 +309,7 @@ inv_warehouse_sub.name as subInvName FROM io_order LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code` - LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code` + LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.code = io_order.invWarehouseCode LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code` @@ -382,7 +391,7 @@ resultType="com.glxp.api.admin.entity.inout.OrderEntity"> SELECT io_order.* FROM io_order LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code` - LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code` + LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.code = io_order.invWarehouseCode LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code` @@ -463,7 +472,7 @@ resultType="com.glxp.api.admin.entity.inout.OrderEntity"> SELECT io_order.* FROM io_order LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code` - LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code` + LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.code = io_order.invWarehouseCode LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code` @@ -647,7 +656,7 @@ diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml new file mode 100644 index 00000000..d1bcffdc --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml @@ -0,0 +1,70 @@ + + + + + + + + + replace + INTO inv_inner_order + ( + recordKey,createTime,genStatus,printStatus,updateTime,remark,createBy,status + ) + values ( + #{recordKey}, + #{createTime}, + #{genStatus}, + #{printStatus}, + #{updateTime}, + #{remark}, + #{createBy}, + #{status} + ) + + + + + DELETE FROM inv_inner_order WHERE id in + + #{item} + + + + + + DELETE + FROM inv_inner_order + WHERE id = #{id} + + + + UPDATE inv_inner_order + + recordKey=#{recordKey}, + createTime=#{createTime}, + genStatus=#{genStatus}, + printStatus=#{printStatus}, + updateTime=#{updateTime}, + remark=#{remark}, + createBy=#{createBy}, + createTime=#{createTime}, + status=#{status}, + + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDetailDao.xml new file mode 100644 index 00000000..9f09abc8 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDetailDao.xml @@ -0,0 +1,80 @@ + + + + + + + + + + replace + INTO inv_inner_order_detail + ( + orderIdFk,productId,productName,`count`,productDate,expireDate,batchNo + ) + values ( + #{orderIdFk}, + #{productId}, + #{productName}, + #{count}, + #{productDate}, + #{expireDate}, + #{batchNo} + ) + + + + + DELETE FROM inv_inner_order_detail WHERE id in + + #{item} + + + + + + DELETE + FROM inv_inner_order_detail + WHERE id = #{id} + + + + DELETE + FROM inv_inner_order_detail + WHERE orderIdFk = #{orderIdFk} + + + + + UPDATE inv_inner_order_detail + + orderIdFk=#{orderIdFk}, + productId=#{productId}, + productName=#{productName}, + `count`=#{count}, + expireDate=#{expireDate}, + productDate=#{productDate}, + batchNo=#{batchNo}, + + WHERE id = #{id} + + + \ No newline at end of file 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 a7d6fe19..2c4dc149 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml @@ -123,7 +123,7 @@ ,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,inv_prein_product.price,inv_warehouse_sub.name invSubStorageName - ,inv_prein_product.invWarehouseCode + ,inv_prein_product.invWarehouseCode,inv_prein_product.orderIdFk 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 @@ -202,13 +202,14 @@ insert INTO inv_prein_product (productsName, nameCode, relIdFk, ggxh, batchNo, productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, - inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode, price) + inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode, price, updateTime, + orderIdFk) values (#{productsName}, #{nameCode}, #{relIdFk}, #{ggxh}, #{batchNo}, #{productionDate}, #{expireDate}, #{ylqxzcrbarmc}, #{zczbhhzbapzbh}, #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk} - , #{invStorageCode}, #{invWarehouseCode}, #{price}) + , #{invStorageCode}, #{invWarehouseCode}, #{price}, #{updateTime}, #{orderIdFk}) @@ -217,6 +218,14 @@ FROM inv_prein_product WHERE id = #{id} + + + + DELETE + FROM inv_prein_product + WHERE orderIdFk = #{orderIdFk} + + DELETE FROM inv_prein_product @@ -243,6 +252,8 @@ invStorageCode=#{invStorageCode}, invWarehouseCode=#{invWarehouseCode}, price=#{price}, + updateTime=#{updateTime}, + orderIdFk=#{orderIdFk}, WHERE id = #{id} 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 b4616273..122be18f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml @@ -124,7 +124,7 @@ ,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,inv_pre_product.price,inv_warehouse_sub.name invSubStorageName - ,inv_product.invWarehouseCode + ,inv_pre_product.invWarehouseCode 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 diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/CompanySalesmanDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/CompanySalesmanDao.xml new file mode 100644 index 00000000..bd0e4ad0 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/CompanySalesmanDao.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + UPDATE company_salesman + + customerId=#{customerId}, + name=#{name}, + tel=#{tel}, + phone=#{phone}, + email=#{email}, + certType=#{certType}, + certCode=#{certCode}, + filePath=#{filePath}, + filePath2=#{filePath2}, + create_time=#{create_time}, + update_time=#{update_time}, + auditStatus=#{auditStatus}, + + WHERE id = #{id} + + + + INSERT INTO company_salesman(customerId,name,tel,phone,email,certType,certCode,filePath,filePath2,create_time,update_time, + auditStatus) values + ( + #{customerId}, + #{name}, + #{tel}, + #{phone}, + #{email}, + #{certType}, + #{certCode}, + #{filePath}, + #{filePath2}, + #{create_time}, + #{update_time}, + #{auditStatus} + ) + + + + DELETE + FROM company_salesman + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/CompanyUpdateLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/CompanyUpdateLogDao.xml new file mode 100644 index 00000000..c1c5a1d0 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/CompanyUpdateLogDao.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + UPDATE company_update_log + + customerId=#{customerId}, + updateCause=#{updateCause}, + status=#{status}, + create_time=#{create_time}, + update_time=#{update_time}, + submit=#{submit}, + auditor=#{auditor}, + noPassCause=#{noPassCause}, + param=#{param}, + logType=#{logType}, + + WHERE id = #{id} + + + + INSERT INTO company_update_log(customerId,updateCause,status,create_time,update_time, + submit,auditor,noPassCause,param,logType) values + ( + #{customerId}, + #{updateCause}, + #{status}, + #{create_time}, + #{update_time}, + #{submit}, + #{auditor}, + #{noPassCause}, + #{param}, + #{logType} + ) + + + + DELETE + FROM company_update_log + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml new file mode 100644 index 00000000..c38a309a --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml @@ -0,0 +1,62 @@ + + + + + + + + + + INSERT INTO customer_contact + (customerId, contacts, + mobile, tel, email, + comments) + values (#{customerId}, #{contacts}, + #{mobile}, #{tel}, #{email}, + #{comments}) + + + + UPDATE customer_contact + + contacts=#{contacts}, + mobile=#{mobile}, + tel=#{tel}, + email=#{email}, + comments=#{comments}, + + WHERE customerId=#{customerId} + + + + delete + from customer_contact + where customerId = #{customerId} + + + delete + from customer_contact + where customerId = #{customerId} + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index 8d2f9568..320966d3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -4,16 +4,29 @@ + resultType="com.glxp.api.admin.entity.purchase.PurApplyDetailEntity"> select * FROM pur_apply_detail diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index 75821a5b..ac239181 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -4,16 +4,30 @@ + parameterType="com.glxp.api.admin.entity.purchase.PurPlanEntity" useGeneratedKeys="true"> replace INTO pur_plan ( billNo,billDate,status,billType,remark,locStorageCode,invWarehouseCode, - deptCode,createBy,createTime,auditBy,auditTime + deptCode,createBy,createTime,auditBy,auditTime,updateTime ) values ( #{billNo}, @@ -53,7 +67,8 @@ #{createBy}, #{createTime}, #{auditBy}, - #{auditTime} + #{auditTime}, + #{updateTime} ) @@ -72,7 +87,7 @@ WHERE id = #{id} - + UPDATE pur_plan billNo=#{billNo}, @@ -87,6 +102,7 @@ auditTime=#{auditTime}, createBy=#{createBy}, createTime=#{createTime}, + updateTime=#{updateTime}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml index 3712aa99..d961473a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml @@ -21,8 +21,31 @@ + + + + parameterType="com.glxp.api.admin.entity.purchase.PurPlanDetailEntity"> replace INTO pur_plan_detail ( @@ -52,7 +75,13 @@ WHERE id = #{id} - + + DELETE + FROM pur_plan_detail + WHERE orderIdFk = #{orderIdFk} + + + UPDATE pur_plan_detail orderIdFk=#{orderIdFk}, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml new file mode 100644 index 00000000..f33526d5 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + UPDATE sup_cert + + name=#{name}, + customerId=#{customerId}, + filePath=#{filePath}, + remark=#{remark}, + createTime=#{createTime}, + updateTime=#{updateTime}, + vailDate=#{vailDate}, + expireDate=#{expireDate}, + `type`=#{type}, + `manufacturerIdFk`=#{manufacturerIdFk}, + `productIdFk`=#{productIdFk}, + `code`=#{code}, + `auditStatus`=#{auditStatus}, + `auditComment`=#{auditComment}, + `status`=#{status}, + + + WHERE id = #{id} + + + + UPDATE sup_cert + set customerId = #{newId} + WHERE customerId = #{oldId} + + + + + UPDATE sup_cert + set customerId = #{newCustomerId} + , manufacturerIdFk = #{newManufacturerIdFk} + WHERE customerId = #{oldCustomerId} + and manufacturerIdFk = #{oldManufacturerIdFk} + + + + + UPDATE sup_cert + set customerId = #{newCustomerId} + , manufacturerIdFk = #{newManufacturerIdFk} + , productIdFk = #{newProductIdFk} + WHERE customerId = #{oldCustomerId} + and manufacturerIdFk = #{oldManufacturerIdFk} + and productIdFk = #{oldProductIdFk} + + + + + INSERT INTO sup_cert( `name`, customerId, filePath, remark, createTime, updateTime + , vailDate, expireDate, `type`, manufacturerIdFk, productIdFk, code, auditStatus + , auditComment,status) + values (#{name}, + #{customerId}, + #{filePath}, + #{remark}, + #{createTime}, + #{updateTime}, + #{vailDate}, + #{expireDate}, + #{type}, #{manufacturerIdFk}, #{productIdFk}, #{code}, #{auditStatus}, #{auditComment},#{status}) + + + + DELETE + FROM sup_cert + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml new file mode 100644 index 00000000..8904bc0a --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml @@ -0,0 +1,60 @@ + + + + + + + + + + DELETE + FROM sup_cert_set + WHERE id = #{id} + + + + + UPDATE sup_cert_set + + name=#{name}, + `need`=#{need}, + `foreign`=#{foreign}, + remark=#{remark}, + cplx=#{cplx}, + updateTime=#{updateTime}, + hchzsb=#{hchzsb}, + flbm=#{flbm}, + `imports`=#{imports}, + `type`=#{type}, + + WHERE id = #{id} + + + + + INSERT INTO sup_cert_set(`name`, `need`, `foreign`, remark, cplx, updateTime, hchzsb, flbm, imports, `type`) + values (#{name}, + #{need}, + #{foreign}, + #{remark}, + #{cplx}, + #{updateTime}, + #{hchzsb}, + #{flbm}, + #{imports}, #{type}) + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml new file mode 100644 index 00000000..b9c741d5 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -0,0 +1,180 @@ + + + + + + + + + + + + delete + from sup_company + where customerId = #{customerId} + + + + + + + + + + + UPDATE sup_company + + companyName=#{companyName}, + bussinessStatus=#{bussinessStatus}, + creditNum=#{creditNum}, + classes=#{classes}, + area=#{area}, + detailAddr=#{detailAddr}, + appId=#{appId}, + appSecret=#{appSecret}, + contacts=#{contacts}, + mobile=#{mobile}, + tel=#{tel}, + email=#{email}, + areaCode=#{areaCode}, + auditStatus=#{auditStatus}, + createTime=#{createTime}, + createBy=#{createBy}, + updateTime=#{updateTime}, + auditTime=#{auditTime}, + auditComment=#{auditComment}, + editStatus=#{editStatus}, + + + WHERE customerId=#{customerId} + + + + + + INSERT INTO sup_company(companyName, bussinessStatus, creditNum, classes, area, + detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode, + auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment, + editStatus) + values (#{companyName}, + #{bussinessStatus}, + #{creditNum}, + #{classes}, + #{area}, + #{detailAddr}, + #{appId}, + #{appSecret}, + #{contacts}, + #{mobile}, + #{tel}, + #{email}, + #{customerId}, + #{areaCode}, + #{auditStatus}, + #{unitIdFk}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{auditTime}, #{auditComment}, #{editStatus}) + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml new file mode 100644 index 00000000..e9d6a7fc --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + UPDATE sup_manufacturer + + companyName=#{companyName}, + creditCode=#{creditCode}, + companyType=#{companyType}, + placeArea=#{placeArea}, + placeAreaCode=#{placeAreaCode}, + placeAddress=#{placeAddress}, + legalPersonName=#{legalPersonName}, + legalPersonPapersType=#{legalPersonPapersType}, + legalPersonPapersCode=#{legalPersonPapersCode}, + productionArea=#{productionArea}, + productionAreaCode=#{productionAreaCode}, + productionAddress=#{productionAddress}, + registerStatus=#{registerStatus}, + productionLicenceNum=#{productionLicenceNum}, + productionLicenceDate=#{productionLicenceDate}, + productionRecordNum=#{productionRecordNum}, + productionRecordSection=#{productionRecordSection}, + productionRecordDate=#{productionRecordDate}, + remark=#{remark}, + create_date=#{createDate}, + update_date=#{updateDate}, + customerId=#{customerId}, + manufacturerId=#{manufacturerId}, + auditStatus=#{auditStatus}, + auditComment=#{auditComment}, + + + + WHERE id=#{id} + + + + + INSERT INTO sup_manufacturer(companyName, creditCode, companyType, + placeArea, placeAreaCode, placeAddress, + legalPersonName, legalPersonPapersType, legalPersonPapersCode, + productionArea, productionAreaCode, productionAddress, + registerStatus, productionLicenceNum, productionLicenceDate, + productionRecordNum, productionRecordSection, productionRecordDate, + remark, create_date, update_date, customerId, manufacturerId, + auditStatus, auditComment) + values (#{companyName}, #{creditCode}, #{companyType}, + #{placeArea}, #{placeAreaCode}, #{placeAddress}, + #{legalPersonName}, #{legalPersonPapersType}, #{legalPersonPapersCode}, + #{productionArea}, #{productionAreaCode}, #{productionAddress}, + #{registerStatus}, #{productionLicenceNum}, #{productionLicenceDate}, + #{productionRecordNum}, #{productionRecordSection}, #{productionRecordDate}, + #{remark}, #{createDate}, #{updateDate}, #{customerId}, #{manufacturerId}, #{auditStatus}, + #{auditComment}) + + + + DELETE + FROM sup_manufacturer + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml new file mode 100644 index 00000000..dbc95c1a --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + UPDATE sup_product + + enterpriseId=#{enterpriseId}, + recordCode=#{recordCode}, + recordProductName=#{recordProductName}, + productManageType=#{productManageType}, + recordPeopleName=#{recordPeopleName}, + recordPeopleArea=#{recordPeopleArea}, + recordPeopleAreaCode=#{recordPeopleAreaCode}, + recordPeopleAddress=#{recordPeopleAddress}, + productType=#{productType}, + productDirectoryCode=#{productDirectoryCode}, + agentName=#{agentName}, + agentArea=#{agentArea}, + agentAreaCode=#{agentAreaCode}, + agentAddress=#{agentAddress}, + instructions=#{instructions}, + productAddress=#{productAddress}, + recordText=#{recordText}, + placeOrigin=#{placeOrigin}, + productionRegion=#{productionRegion}, + productionCompanyName=#{productionCompanyName}, + afterSale=#{afterSale}, + specification=#{specification}, + structure=#{structure}, + scope=#{scope}, + other=#{other}, + filePath=#{filePath}, + remark=#{remark}, + create_date=#{create_date}, + update_date=#{update_date}, + manufacturerIdFk=#{manufacturerIdFk}, + customerId=#{customerId}, + productId=#{productId}, + auditStatus=#{auditStatus}, + auditComment=#{auditComment}, + sptm=#{sptm}, + ybbm=#{ybbm}, + measname=#{measname}, + cpms=#{cpms}, + hchzsb=#{hchzsb}, + relIdFk=#{relIdFk}, + + + + WHERE id=#{id} + + + + + INSERT INTO sup_product(enterpriseId, recordCode, recordProductName, + productManageType, recordPeopleName, recordPeopleArea, + recordPeopleAreaCode, recordPeopleAddress, productType, + productDirectoryCode, agentName, agentArea, + agentAreaCode, agentAddress, instructions, + productAddress, recordText, placeOrigin, + productionRegion, productionCompanyName, afterSale, + specification, structure, `scope`, + other, filePath, remark, + create_date, update_date, manufacturerIdFk, customerId, productId + , auditStatus, auditComment, sptm, ybbm, measname, cpms,hchzsb,relIdFk) + values (#{enterpriseId}, #{recordCode}, #{recordProductName}, + #{productManageType}, #{recordPeopleName}, #{recordPeopleArea}, + #{recordPeopleAreaCode}, #{recordPeopleAddress}, #{productType}, + #{productDirectoryCode}, #{agentName}, #{agentArea}, + #{agentAreaCode}, #{agentAddress}, #{instructions}, + #{productAddress}, #{recordText}, #{placeOrigin}, + #{productionRegion}, #{productionCompanyName}, #{afterSale}, + #{specification}, #{structure}, #{scope}, + #{other}, #{filePath}, #{remark}, + #{create_date}, #{update_date}, #{manufacturerIdFk}, #{customerId}, #{productId} + , #{auditStatus}, #{auditComment}, #{sptm}, #{ybbm}, #{measname}, #{cpms},#{hchzsb},#{relIdFk}) + + + + DELETE + FROM sup_product + WHERE id = #{id} + + + + DELETE + FROM sup_product + WHERE enterpriseId = #{enterpriseId} + + + \ No newline at end of file