From 36f14e193af058ca291d7016d11d976989dadbad Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 25 Feb 2022 22:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthAdminController.java | 4 +- .../controller/auth/RegisterController.java | 40 +- .../basic/BasicUnitMaintainController.java | 25 +- .../basic/BussinessChangeTypeController.java | 3 + .../basic/BussinessLocalTypeController.java | 22 + .../basic/BussinessOriginTypeController.java | 2 +- .../basic/BussinessTypeController.java | 38 +- .../inout/IOOrderStatusController.java | 99 ++ .../controller/inout/OrderController.java | 4 +- .../inout/OrderDetailController.java | 52 +- .../inout/StockOrderDetailController.java | 36 +- .../inout/StockQRCodeTextController.java | 51 +- .../controller/inout/utils/InoutUtils.java | 1 + .../inventory/InvProductsController.java | 1 - .../inventory/InvWarehouseController.java | 121 +++ .../itextpdf/PDFDawnloadController.java | 6 +- .../param/SystemPDFModuleController.java | 53 +- .../dao/basic/BussinessLocalTypeDao.java | 2 + .../dao/basic/BussinessOriginTypeDao.java | 9 + .../admin/dao/basic/BussinessTypeDao.java | 1 + .../glxp/sale/admin/dao/info/CompanyDao.java | 2 + .../admin/dao/inout/IOOrderStatusDao.java | 23 + .../admin/dao/inventory/InvWarehouseDao.java | 23 + .../param/SystemPDFTemplateRelevanceDao.java | 16 +- .../admin/entity/auth/UserRegisterEntity.java | 2 + .../basic/BussinessOriginTypeEntity.java | 4 + .../entity/inout/IOOrderStatusEntity.java | 13 + .../sale/admin/entity/inout/OrderEntity.java | 3 +- .../entity/inout/StockOrderPrintEntity.java | 9 + .../admin/entity/inout/WarehouseEntity.java | 3 +- .../admin/entity/inout/Warehousetemp.java | 18 + .../inventory/InvProductDetailEntity.java | 3 + .../entity/inventory/InvProductEntity.java | 2 + .../entity/inventory/InvWarehouseEntity.java | 22 + .../SystemPDFTemplateRelevanceEntity.java | 10 +- .../BussinessOriginTypeFilterRequest.java | 3 + .../admin/req/inout/FilterOrderRequest.java | 4 + .../admin/req/inout/OrderFilterRequest.java | 2 +- .../req/inout/OrderStatusFilterRequest.java | 10 + .../admin/req/inout/StockOrderIdsRequest.java | 2 + .../inventory/FilterInvProductRequest.java | 2 + .../inventory/FilterInvWarehouseRequest.java | 18 + .../StockQRCodeTextPDFTemplateRequest.java | 2 + .../SystemPDFTemplateRelevanceRequest.java | 10 + .../req/thrsys/FilterThrCorpRequest.java | 1 + .../basic/BussinessOriginTypeResponse.java | 11 + .../sale/admin/res/inout/DlOrderResponse.java | 17 + .../InvProductDetailJoinResponse.java | 3 + .../res/inventory/InvWarehouseResponse.java | 25 + .../SystemPDFTemplateRelevanceResponse.java | 25 + .../basic/BussinessLocalTypeService.java | 2 + .../basic/BussinessOriginTypeService.java | 15 + .../service/basic/BussinessTypeService.java | 2 + .../impl/BussinessLocalTypeServiceImpl.java | 5 + .../impl/BussinessOriginTypeServiceImpl.java | 53 ++ .../basic/impl/BussinessTypeServiceImpl.java | 7 + .../admin/service/info/CompanyService.java | 4 + .../service/info/impl/CompanyServiceImpl.java | 16 + .../service/inout/IOOrderStatusService.java | 20 + .../inout/impl/IOOrderStatusServiceImpl.java | 48 + .../inventory/InvWarehouseService.java | 23 + .../impl/InvWarehouseServiceImpl.java | 68 ++ .../SystemPDFTemplateRelevanceService.java | 8 +- ...SystemPDFTemplateRelevanceServiceImpl.java | 25 +- .../admin/thread/InvProductsTrService.java | 9 + .../admin/thread/IoTransInoutService.java | 15 +- .../com/glxp/sale/admin/util/FileUtils.java | 892 ++++++++++++++++++ .../main/resources/application-pro.properties | 11 +- .../mybatis/mapper/auth/UserRegisterDao.xml | 50 +- .../mapper/basic/BussinessOriginTypeDao.xml | 65 ++ .../mybatis/mapper/basic/BussinessTypeDao.xml | 1 - .../mybatis/mapper/info/CompanyDao.xml | 129 ++- .../mybatis/mapper/inout/CodesDao.xml | 11 +- .../mybatis/mapper/inout/CodesTempDao.xml | 11 +- .../mybatis/mapper/inout/IOOrderStatusDao.xml | 45 + .../mybatis/mapper/inout/OrderDao.xml | 12 +- .../mybatis/mapper/inout/StockOrderDao.xml | 4 + .../mapper/inventory/InvPreProductDao.xml | 11 +- .../inventory/InvPreProductDetailDao.xml | 19 +- .../mapper/inventory/InvProductDao.xml | 7 +- .../mapper/inventory/InvProductDetailDao.xml | 13 +- .../mapper/inventory/InvWarehouseDao.xml | 99 ++ .../param/SystemPDFTemplateRelevanceDao.xml | 69 +- 83 files changed, 2384 insertions(+), 243 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/dao/inout/IOOrderStatusDao.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IOOrderStatusEntity.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvWarehouseEntity.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderStatusFilterRequest.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessOriginTypeResponse.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/res/inout/DlOrderResponse.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvWarehouseResponse.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateRelevanceResponse.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/service/inout/IOOrderStatusService.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/IOOrderStatusServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/inout/IOOrderStatusDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java index f625465..7b1c151 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java @@ -224,7 +224,7 @@ public class AuthAdminController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - + AuthAdmin curUser = getCustomerId(); // 检查是否存在相同名称的管理员 AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName()); if (byUserName != null) { @@ -237,7 +237,7 @@ public class AuthAdminController { if (authAdmin.getPassWord() != null) { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } - + authAdmin.setCustomerId(curUser.getCustomerId()); boolean b = authAdminService.insertAuthAdmin(authAdmin); authAdmin = authAdminService.findByUserName(authAdmin.getUserName()); if (!b) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index c7c7003..e64d2fe 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -6,6 +6,7 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.CustomerContactEntity; import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; import com.glxp.sale.admin.entity.auth.UserRegisterEntity; +import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.sale.admin.entity.info.ApilogEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.SetupEntity; @@ -198,22 +199,22 @@ public class RegisterController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } log.info(httpSession.getId()); - JSONObject userCode = (JSONObject) httpSession.getAttribute("code"); - if (userCode == null) { - return ResultVOUtils.error(500, "验证码已失效，请重新获取"); - } - long lastTime = userCode.getLong("createTime"); - int checkCode = (Integer) userCode.get("code"); - String phoneNum = userCode.getString("memPhone"); - if ((System.currentTimeMillis() - lastTime) > 1000 * 60 * 5) { - return ResultVOUtils.error(500, "验证码已过期，请重新获取"); - } - if (checkCode != userRegisterEntity.getCheckCode()) { - return ResultVOUtils.error(500, "验证码错误，请重新获取"); - } - if (!phoneNum.equals(userRegisterEntity.getMobile())) { - return ResultVOUtils.error(500, "手机号与获取验证码不一致"); - } +// JSONObject userCode = (JSONObject) httpSession.getAttribute("code"); +// if (userCode == null) { +// return ResultVOUtils.error(500, "验证码已失效，请重新获取"); +// } +// long lastTime = userCode.getLong("createTime"); +// int checkCode = (Integer) userCode.get("code"); +// String phoneNum = userCode.getString("memPhone"); +// if ((System.currentTimeMillis() - lastTime) > 1000 * 60 * 5) { +// return ResultVOUtils.error(500, "验证码已过期，请重新获取"); +// } +// if (checkCode != userRegisterEntity.getCheckCode()) { +// return ResultVOUtils.error(500, "验证码错误，请重新获取"); +// } +// if (!phoneNum.equals(userRegisterEntity.getMobile())) { +// return ResultVOUtils.error(500, "手机号与获取验证码不一致"); +// } boolean isExitPhone = userRegisterService.isExit(userRegisterEntity.getMobile()); if (isExitPhone) { return ResultVOUtils.error(500, "该手机号已被注册"); @@ -370,6 +371,13 @@ public class RegisterController { companyEntity.setBussinessStatus(userRegisterEntity.getBussinessStatus()); companyEntity.setCreditNum(userRegisterEntity.getCreditNum()); + BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(userRegisterEntity.getCompanyId()); + if (basicUnitMaintainEntity != null) { + basicUnitMaintainEntity.setThirdId1(userRegisterEntity.getUdplatCompanyId()); + basicUnitMaintainEntity.setThirdName1(userRegisterEntity.getUdplatCompanyName()); + basicUnitMaintainService.updateById(basicUnitMaintainEntity); + } + FilterAliCertRequest filterAliCertRequest = new FilterAliCertRequest(); filterAliCertRequest.setId(registerCheckRequest.getAliCertId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java index a2d0182..60a1789 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java @@ -5,11 +5,14 @@ import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity; import com.glxp.sale.admin.httpclient.ErpBasicClient; import com.glxp.sale.admin.req.basic.*; import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.inout.OrderFilterRequest; import com.glxp.sale.admin.req.thrsys.FilterThrCorpRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.BasicProductThirdSysResponse; @@ -18,6 +21,8 @@ import com.glxp.sale.admin.res.basic.ErpUnitsResponse; import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService; import com.glxp.sale.admin.service.basic.BasicThirdSysService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; +import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.thrsys.ThrCorpService; import com.glxp.sale.admin.thread.BasicUnitImportService; @@ -57,6 +62,10 @@ public class BasicUnitMaintainController { BasicUnitImportService basicUnitImportService; @Resource private ThrCorpService thrCorpService; + @Resource + private CompanyService companyService; + @Resource + private OrderService orderService; @GetMapping("/udiwms/basic/unit/maintain/filter") public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, @@ -278,6 +287,7 @@ public class BasicUnitMaintainController { return ResultVOUtils.success("解除绑定成功！"); } + @PostMapping("/udiwms/basic/unit/maintain/delete") public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -285,9 +295,22 @@ public class BasicUnitMaintainController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } String id = deleteRequest.getId(); + BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectById(id); + + //判断是否被单据绑定 + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setFromCorpId(basicUnitMaintainEntity.getErpId()); + OrderEntity orderEntity = orderService.findOne(orderFilterRequest); + if (orderEntity != null) { + return ResultVOUtils.error(500, "已存在该供应商单据，无法删除!"); + } + //判断供应商是否已存在 + CompanyEntity companyEntity = companyService.findCompanyByUnitFk(basicUnitMaintainEntity.getErpId()); + if (companyEntity != null) { + return ResultVOUtils.error(500, "供应商已注册，无法删除!"); + } basicUnitMaintainService.deleteById(id); - return ResultVOUtils.success("删除成功"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java index 2f016ac..0d74bd3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java @@ -43,6 +43,9 @@ public class BussinessChangeTypeController { } List bussinessTypeEntities; BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getAction()); + if (bussinessLocalTypeEntity == null) { + return ResultVOUtils.error(500, "该业务类型未绑定扫码单据类型！"); + } BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessLocalTypeEntity.getAction()); bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java index bed663c..bd4eb45 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java @@ -3,15 +3,20 @@ package com.glxp.sale.admin.controller.basic; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.basic.BussinessChangeTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; +import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.basic.BussinessChangeTypeService; import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService; +import com.glxp.sale.admin.service.inout.StockOrderService; import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; @@ -35,9 +40,13 @@ public class BussinessLocalTypeController { @Resource private BussinessLocalTypeService bussinessLocalTypeService; @Resource + private BussinessChangeTypeService bussinessChangeTypeService; + @Resource private AuthAdminService authAdminService; @Resource private BussinessTypeService bussinessTypeService; + @Resource + private StockOrderService stockOrderService; @GetMapping("/udiwms/localBusType/filterJoin") public BaseResponse filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest, @@ -102,6 +111,19 @@ public class BussinessLocalTypeController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } String id = deleteRequest.getId(); + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.selectById(id); + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction()); + StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); + if (stockOrderEntity != null) { + return ResultVOUtils.error(500, "已存在该类型码业务单据，无法删除！"); + } + + BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeService.findFirstByAction(bussinessLocalTypeEntity.getAction()); + if (bussinessChangeTypeEntity != null && bussinessChangeTypeEntity.getScAction() != null) { + return ResultVOUtils.error(500, "该业务单据类型已绑定流转单据类型，无法删除！"); + } + bussinessLocalTypeService.deleteById(id); return ResultVOUtils.success("删除成功"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java index fd06ea6..f951774 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java @@ -34,7 +34,7 @@ public class BussinessOriginTypeController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List bussinessTypeEntities; - bussinessTypeEntities = bussinessOriginTypeService.filterList( + bussinessTypeEntities = bussinessOriginTypeService.filterEnableList( bussinessTypeFilterRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(bussinessTypeEntities); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index c751b6e..e06e0bf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -1,16 +1,22 @@ package com.glxp.sale.admin.controller.basic; +import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; +import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.inout.OrderFilterRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.BussinessTypResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.basic.BussinessTypeService; +import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.FileUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; @@ -41,6 +47,8 @@ public class BussinessTypeController { private BussinessTypeService bussinessTypeService; @Resource private AuthAdminService authAdminService; + @Resource + private OrderService orderService; @GetMapping("/udiwms/bussinessType/filter") public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest, @@ -92,6 +100,18 @@ public class BussinessTypeController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } String id = deleteRequest.getId(); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.selectById(id); + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setAction(bussinessTypeEntity.getAction()); + OrderEntity orderEntity = orderService.findOne(orderFilterRequest); + if (orderEntity != null) { + return ResultVOUtils.error(500, "已存在该类型扫码单据，无法删除！"); + } + if (bussinessTypeEntity.getLocalAction() != null && !"".equals(bussinessTypeEntity.getLocalAction())) { + return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型，无法删除！"); + } + + bussinessTypeService.deleteById(id); return ResultVOUtils.success("删除成功"); } @@ -118,7 +138,9 @@ public class BussinessTypeController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + if (bussinessTypeEntity != null) { + bussinessTypeEntity.setAction("SC" + CustomUtil.getId()); bussinessTypeService.insertBussinessType(bussinessTypeEntity); } else { ResultVOUtils.error(999, "参数错误"); @@ -137,7 +159,7 @@ public class BussinessTypeController { return authAdmin.getCustomerId() + ""; } - //往来单位信息文件导入 + //扫码单据类型导入 @PostMapping("/udiwms/busstiness/file/upload") public BaseResponse uploadProducts(@RequestParam("file") List files) { for (int i = 0; i < files.size(); i++) { @@ -148,20 +170,12 @@ public class BussinessTypeController { try { InputStream inputStream = file.getInputStream(); String json = FileUtils.readStream(inputStream); - String[] list = json.split("\r\n"); - if (list != null && list.length > 0) { - for (String item : list) { - item.replace(" ", ""); - String[] data = item.split(","); - BussinessTypeEntity bussinessTypeEntity = new BussinessTypeEntity(); - bussinessTypeEntity.setIndex(Integer.parseInt(data[0])); - bussinessTypeEntity.setMainAction(data[1]); - bussinessTypeEntity.setAction(data[2]); - bussinessTypeEntity.setName(data[3]); + List bussinessTypeEntities = JSON.parseArray(json, BussinessTypeEntity.class); + if (bussinessTypeEntities != null && bussinessTypeEntities.size() > 0) { + for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { bussinessTypeService.insertIgnoreBussinessType(bussinessTypeEntity); } } - System.out.println(json.toUpperCase(Locale.ROOT)); } catch (Exception e) { e.printStackTrace(); return ResultVOUtils.error(500, "文件格式错误！"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java new file mode 100644 index 0000000..9ef8345 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java @@ -0,0 +1,99 @@ +package com.glxp.sale.admin.controller.inout; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.constant.Constant; +import com.glxp.sale.admin.entity.inout.*; +import com.glxp.sale.admin.entity.udid.UdiEntity; +import com.glxp.sale.admin.req.inout.OrderFilterRequest; +import com.glxp.sale.admin.req.inout.OrderStatusFilterRequest; +import com.glxp.sale.admin.req.inout.UpdateExportStatusRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.inout.DlOrderResponse; +import com.glxp.sale.admin.service.inout.CodesService; +import com.glxp.sale.admin.service.inout.IOOrderStatusService; +import com.glxp.sale.admin.service.inout.OrderDetailService; +import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.admin.util.FilterUdiUtils; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@RestController +public class IOOrderStatusController { + + @Resource + private OrderService orderService; + @Resource + private CodesService codesService; + @Resource + private OrderDetailService orderDetailService; + @Resource + private IOOrderStatusService ioOrderStatusService; + + @GetMapping("spms/inout/order/status") + public BaseResponse listOrderStatus(OrderStatusFilterRequest orderStatusFilterRequest) { + List orderStatusEntities = ioOrderStatusService.filterOrderStatus(orderStatusFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderStatusEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderStatusEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("spms/inout/order/dlByStatus") + public BaseResponse dlByStatus(OrderStatusFilterRequest orderStatusFilterRequest) { + List dlOrderResponses = new ArrayList<>(); + List orderStatusEntities = ioOrderStatusService.filterOrderStatus(orderStatusFilterRequest); + if (orderStatusEntities != null && orderStatusEntities.size() > 0) { + for (IOOrderStatusEntity orderStatusEntity : orderStatusEntities) { + DlOrderResponse dlOrderResponse = new DlOrderResponse(); + OrderEntity orderEntity = orderService.findById(orderStatusEntity.getOrderId()); + dlOrderResponse.setOrderEntity(orderEntity); + List orderDetailEntityList = orderDetailService.filterAllByOrderIdFk(orderStatusEntity.getOrderId()); + dlOrderResponse.setOrderDetails(orderDetailEntityList); + List codes = codesService.findByReceiptId(orderStatusEntity.getOrderId()); + dlOrderResponse.setCodes(codes); + dlOrderResponses.add(dlOrderResponse); + } + } + return ResultVOUtils.success(dlOrderResponses); + } + + //更新订单 + @PostMapping("/spms/inout/order/deleteStatus") + public BaseResponse deleteStatus(@RequestBody OrderStatusFilterRequest orderStatusFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = ioOrderStatusService.deleteByOrderId(orderStatusFilterRequest.getOrderId()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("更新成功"); + } + + + @PostMapping("/spms/inout/order/updateStatus") + public BaseResponse updateStatus(@RequestBody IOOrderStatusEntity orderStatusFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = ioOrderStatusService.updateOrderStatus(orderStatusFilterRequest); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("更新成功"); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index b0cf2be..8498ef5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -343,8 +343,8 @@ public class OrderController { String mainOrder = orderList.get(0); for (int i = 1; i < orderList.size(); i++) { codesService.updateOrderId(orderList.get(i), mainOrder); - orderService.deleteById(orderList.get(i)); codesTempService.updateOrderId(orderList.get(i), mainOrder); + orderService.deleteById(orderList.get(i)); } OrderEntity mainOrderEntity = orderService.findById(mainOrder); List docids = getDocids(mergeList); @@ -357,7 +357,7 @@ public class OrderController { } mainOrderEntity.setErpFk(docidStr); orderService.updateOrder(mainOrderEntity); - ioTransInoutService.transStatus(mainOrderEntity.getId()); +// ioTransInoutService.transStatus(mainOrderEntity.getId()); } else { return ResultVOUtils.error(ResultEnum.DATA_ERROR); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index 570b4b9..e039112 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java @@ -21,8 +21,10 @@ import com.glxp.sale.admin.req.param.SystemParamConfigRequest; import com.glxp.sale.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest; import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse; import com.glxp.sale.admin.res.inout.ErpOrderResponse; import com.glxp.sale.admin.res.inout.PurchaseinResponse; +import com.glxp.sale.admin.service.basic.BussinessOriginTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; @@ -101,6 +103,8 @@ public class OrderDetailController { InvProductsTrService invProductsTrService; @Resource IoTransInoutService ioTransInoutService; + @Resource + BussinessOriginTypeService bussinessOriginTypeService; @GetMapping("/spms/erpOrder/filter") public BaseResponse filterSpmsOrder(FilterOrderRequest filterErpOrderRequest, @@ -227,38 +231,41 @@ public class OrderDetailController { BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity); String billNo = CustomUtil.getId(); stockOrderEntity.setBillNo(billNo); - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderEntity.getBillType()); - stockOrderEntity.setBillType(bussinessTypeEntity.getLocalAction()); + BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finAllByAction(thrOrderEntity.getBillType()); + + stockOrderEntity.setBillType(bussinessOriginTypeResponse.getLocalAction()); stockOrderEntity.setId(null); stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交 stockOrderEntity.setThirdOrderFk(thrOrderEntity.getBillNo()); stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交 stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印 stockOrderEntity.setBilldate(DateUtil.formatDate(new Date())); - boolean b = stockOrderService.insertStockOrder(stockOrderEntity); + stockOrderEntity = stockOrderService.findByBillNo(billNo); - if (b) { - FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); - filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); - List thrOrderDetailEntities = - thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); - if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { - List stockOrderDetailEntityList = new ArrayList<>(); - for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { - StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk()); - BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity); - stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId()); - stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + ""); - stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + ""); - stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId()); - stockOrderDetailEntity.setSweepCount(0 + ""); - stockOrderDetailEntityList.add(stockOrderDetailEntity); + FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); + filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); + List thrOrderDetailEntities = + thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { + 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, "单据里含有未维护的产品信息，选入失败！"); } - stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntityList); + BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity); + stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId()); + stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + ""); + stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + ""); + stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId()); + stockOrderDetailEntity.setSweepCount(0 + ""); + stockOrderDetailEntityList.add(stockOrderDetailEntity); } + stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntityList); } - + boolean b = stockOrderService.insertStockOrder(stockOrderEntity); return ResultVOUtils.success(); } @@ -503,7 +510,6 @@ public class OrderDetailController { orderFilterRequest.setId(filterErpOrderRequest.getOrderId()); OrderEntity orderEntity = orderService.findOne(orderFilterRequest); - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); ioTransInoutService.transStatus(orderEntity.getId()); orderEntity = orderService.findById(orderEntity.getId()); if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index ca0d2b6..df10376 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java @@ -239,6 +239,7 @@ public class StockOrderDetailController { public BaseResponse getStockOrderDetailInstrumentById(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) { List stockOrderDetailEntityList = new ArrayList<>(); + List originDatas = stockOrderIdsRequest.getStockOrderLists(); for (String id : stockOrderIdsRequest.getIds()) { CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); companyProductRelevanceRequest.setId(id); @@ -264,25 +265,48 @@ public class StockOrderDetailController { stockOrderDetailEntity.setProductId(udiInfoEntity.getRlId() + ""); stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc()); stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh()); + stockOrderDetailEntity.setCount(0 + ""); + stockOrderDetailEntity.setReCount(0 + ""); + stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); + stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); if (stockOrderIdsRequest.getUdiEntity() != null) { UdiEntity udiEntity = stockOrderIdsRequest.getUdiEntity(); stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo()); + stockOrderDetailEntity.setCount(1 + ""); stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate()); stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate()); - } - stockOrderDetailEntity.setCount(0 + ""); - stockOrderDetailEntity.setReCount(0 + ""); - stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); - stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); - stockOrderDetailEntityList.add(stockOrderDetailEntity); + if (originDatas != null && originDatas.size() > 0) { + if (!isSameBatch(originDatas, stockOrderDetailEntity)) { + stockOrderDetailEntityList.add(stockOrderDetailEntity); + } + } else { + stockOrderDetailEntityList.add(stockOrderDetailEntity); + } + + } else + stockOrderDetailEntityList.add(stockOrderDetailEntity); } } + if (originDatas != null && originDatas.size() > 0) { + stockOrderDetailEntityList.addAll(originDatas); + } if (stockOrderDetailEntityList.size() == 0) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到产品"); } return ResultVOUtils.success(stockOrderDetailEntityList); } + public boolean isSameBatch(List originDatas, StockOrderDetailEntity stockOrderDetailEntity) { + for (StockOrderDetailEntity temp : originDatas) { + if ((temp.getBatchNo() != null && temp.getBatchNo().equals(stockOrderDetailEntity.getBatchNo())) + && (temp.getProductId().equals(stockOrderDetailEntity.getProductId()))) { + temp.setCount(Integer.parseInt(temp.getCount()) + Integer.parseInt(stockOrderDetailEntity.getCount()) + ""); + return true; + } + } + return false; + } + @GetMapping("/udiwms/stock/order/detail/addFromCode") public BaseResponse addStockOrderDetailFromCode(@RequestParam("orderId") String orderId, @RequestParam("count") String count, diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java index f74ce7e..9179b55 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java @@ -20,10 +20,13 @@ import com.glxp.sale.admin.req.basic.FilterStockprintRequest; import com.glxp.sale.admin.req.inventory.DeleteStPrintTempRequest; import com.glxp.sale.admin.req.inventory.FilterStPrintTempRequest; import com.glxp.sale.admin.req.itextpdf.PdfPrintCountEntity; +import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse; +import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inventory.InvStockPrintService; import com.glxp.sale.admin.service.inventory.StockPrintTempService; +import com.glxp.sale.admin.service.param.SystemPDFTemplateRelevanceService; import com.glxp.sale.admin.thread.JaspaperService; import com.glxp.sale.admin.util.CustomUtil; import org.springframework.beans.BeanUtils; @@ -74,6 +77,8 @@ public class StockQRCodeTextController { @Resource private SystemPDFModuleService systemPDFModuleService; @Resource + private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService; + @Resource InvStockPrintService stockPrintService; @Resource CompanyService companyService; @@ -349,42 +354,11 @@ public class StockQRCodeTextController { @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { - - /* - StockOrderEntity stockOrderEntity = - stockOrderService.findById(stockQRCodeTextPDFTemplateRequest.getId()); - if (stockOrderEntity == null) { - return; - } - - SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + ""); - if (systemPDFModuleEntity == null) return; - SystemPDFTemplateEntity systemPDFTemplateEntity = - systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); - if (systemPDFTemplateEntity == null) return; - stockQRCodeTextPDFTemplateRequest.setPath(systemPDFTemplateEntity.getPath()); - stockQRCodeTextPDFTemplateRequest.setRowCount(systemPDFTemplateEntity.getRowCount()); - stockQRCodeTextPDFTemplateRequest.setQrcodeCount(systemPDFTemplateEntity.getQrcodeCount()); - //----------------------------------------------- - stockQRCodeTextPDFTemplateRequest.setOrderId(stockOrderEntity.getId()); - - stockQRCodeTextPDFTemplateRequest.setBillNo(stockOrderEntity.getBillNo()); - - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(stockOrderEntity.getBillType()); - stockQRCodeTextPDFTemplateRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName()); - - StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest(); - stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId()); - List stockOrderDetailEntityList = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); - ITextPDFUtils.exportStockOrderPDFFromTemplateFile( - stockQRCodeTextPDFTemplateRequest, stockOrderEntity, stockOrderDetailEntityList, request, response); - */ /*打印订单*/ List list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId()); if (list != null && list.size() > 0) { int index = 1; -// List stockOrderPrintResponses = new ArrayList<>(); CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(list.get(0).getCustomerId())); for (StockOrderPrintEntity stockOrderPrintEntity : list) { stockOrderPrintEntity.setIndex(index + ""); @@ -393,17 +367,22 @@ public class StockQRCodeTextController { // BeanUtils.copyProperties(stockOrderPrintEntity, stockOrderPrintResponse); // stockOrderPrintResponse.setPrice(stockOrderPrintEntity.getPrice()); // stockOrderPrintResponse.setTotalPrice(stockOrderPrintEntity.getTotalPrice()); - stockOrderPrintEntity.setAmount(BigDecimal.valueOf(85.36)); - stockOrderPrintEntity.setTotalPrice(BigDecimal.valueOf(1888.88)); - stockOrderPrintEntity.setTotalPriceWord("18888"); +// stockOrderPrintEntity.setAmount(BigDecimal.valueOf(85.36)); +// stockOrderPrintEntity.setTotalPrice(BigDecimal.valueOf(1888.88)); +// stockOrderPrintEntity.setTotalPriceWord("18888"); stockOrderPrintEntity.setCorpName(companyEntity.getCompanyName()); + stockOrderPrintEntity.setOrderName(stockQRCodeTextPDFTemplateRequest.getOrderName()); index++; // stockOrderPrintResponses.add(stockOrderPrintResponse); } SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + ""); - if (systemPDFModuleEntity == null) return; + SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest(); + systemPDFTemplateRelevanceRequest.setModuleId(systemPDFModuleEntity.getId()); + systemPDFTemplateRelevanceRequest.setLocalAction(list.get(0).getBillType()); + List systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); + if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return; SystemPDFTemplateEntity systemPDFTemplateEntity = - systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); + systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponses.get(0).getTemplateId())); if (systemPDFTemplateEntity == null) return; Map data = new HashMap(); data.put("data", list); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java index 1de3da9..665743d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java @@ -247,6 +247,7 @@ public class InoutUtils { erpOrderEntity.setProductDate(erpDetailCodeEntity.getProduceDate()); erpOrderEntity.setExpireDate(erpDetailCodeEntity.getExpireDate()); erpOrderEntity.setGoodsid(erpDetailCodeEntity.getRelId()); + erpOrderEntity.setBindRlFk(erpDetailCodeEntity.getRelId()); erpOrderEntity.setCount(erpDetailCodeEntity.getCount()); erpOrderEntity.setOrderIdFk(warehouseEntityList.get(0).getOrderId()); erpOrderEntity.setProductCompany(erpDetailCodeEntity.getYlqxzcrbarmc()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java index d4f6d48..3283379 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java @@ -226,7 +226,6 @@ public class InvProductsController { code = filterCodeTraceRequest.getCode(); } - FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setCode(code); filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java new file mode 100644 index 0000000..4d6ba17 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java @@ -0,0 +1,121 @@ +package com.glxp.sale.admin.controller.inventory; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.auth.AuthPermissionRule; +import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.sale.admin.req.auth.AuthPermissionRuleSaveRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.inventory.FilterInvProductRequest; +import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; +import com.glxp.sale.admin.res.auth.AuthPermissionRuleMergeResponse; +import com.glxp.sale.admin.res.inventory.InvProductPageRespnonse; +import com.glxp.sale.admin.res.inventory.InvProductResponse; +import com.glxp.sale.admin.res.inventory.InvWarehouseResponse; +import com.glxp.sale.admin.service.inventory.InvProductService; +import com.glxp.sale.admin.service.inventory.InvWarehouseService; +import com.glxp.sale.admin.util.PermissionRuleTreeUtils; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +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 javax.validation.Valid; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static com.glxp.sale.admin.constant.Constant.SYSTEM_CUSTOMER_ID; + +@RestController +public class InvWarehouseController { + + @Resource + InvWarehouseService invWarehouseService; + + @GetMapping("spms/inv/warehouse/filter") + public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { + List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); + List merge = merge(invWarehouseEntities, 0); + + Map restMap = new HashMap<>(); + restMap.put("list", merge); + return ResultVOUtils.success(restMap); + } + + public List merge(List invWarehouseEntities, + Integer pid) { + List invWarehouseResponses = new ArrayList<>(); + for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { + InvWarehouseResponse invWarehouseResponse = new InvWarehouseResponse(); + BeanUtils.copyProperties(invWarehouseEntity, invWarehouseResponse); + if (pid.equals(invWarehouseEntity.getPid())) { + invWarehouseResponse.setChildren(merge(invWarehouseEntities, invWarehouseEntity.getId())); + invWarehouseResponses.add(invWarehouseResponse); + } + } + return invWarehouseResponses; + } + + + @PostMapping("/spms/inv/warehouse/save") + public BaseResponse save(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + if (invWarehouseEntity.getPid() == null) { + invWarehouseEntity.setPid(0); // 默认设置 + } + + boolean b = invWarehouseService.insertInvWarehouse(invWarehouseEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success("添加成功！"); + } + + @PostMapping("/spms/inv/warehouse/edit") + public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (invWarehouseEntity.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + invWarehouseEntity.setPid(null); // 不能修改父级 pid + boolean b = invWarehouseService.updateInvWarehouse(invWarehouseEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success(); + } + + @PostMapping("/spms/inv/warehouse/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { + + if (deleteRequest.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean b = invWarehouseService.deleteById(deleteRequest.getId()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success(); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java index fccdbf2..cbd62d1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java @@ -89,7 +89,7 @@ public class PDFDawnloadController { } inoutOrderDetailPDFCodeRequest.setFromCorp(orderEntity.getFromCorp()); - inoutOrderDetailPDFCodeRequest.setFromType(orderEntity.getFromType()+""); + inoutOrderDetailPDFCodeRequest.setFromType(orderEntity.getFromType() + ""); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); inoutOrderDetailPDFCodeRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName()); @@ -130,7 +130,7 @@ public class PDFDawnloadController { inoutOrderDetailPDFCodeRequest.setSettingData(settingData); //----------------------------------------------- inoutOrderDetailPDFCodeRequest.setFromCorp(orderEntity.getFromCorp()); - inoutOrderDetailPDFCodeRequest.setFromType(orderEntity.getFromType()+""); + inoutOrderDetailPDFCodeRequest.setFromType(orderEntity.getFromType() + ""); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); inoutOrderDetailPDFCodeRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName()); @@ -253,7 +253,7 @@ public class PDFDawnloadController { SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = systemPDFTemplateRelevanceEntityList.get(0); SystemPDFTemplateRequest systemPDFTemplateRequest = new SystemPDFTemplateRequest(); - systemPDFTemplateRequest.setId(systemPDFTemplateRelevanceEntity.getTemplate_id()); + systemPDFTemplateRequest.setId(systemPDFTemplateRelevanceEntity.getTemplateId()); SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.findSystemPDFTemplate(systemPDFTemplateRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFModuleController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFModuleController.java index f592249..e0d3a3e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFModuleController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFModuleController.java @@ -2,15 +2,22 @@ package com.glxp.sale.admin.controller.param; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity; import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; +import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity; +import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; import com.glxp.sale.admin.req.param.SystemPDFModuleRequest; import com.glxp.sale.admin.req.param.SystemPDFModuleSaveRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.param.SystemPDFModuleResponse; import com.glxp.sale.admin.res.param.SystemPDFModuleSelectResponse; +import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse; import com.glxp.sale.admin.res.param.SystemPDFTemplateSelectResponse; +import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.param.SystemPDFModuleService; +import com.glxp.sale.admin.service.param.SystemPDFTemplateRelevanceService; import com.glxp.sale.admin.service.param.SystemPDFTemplateService; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; @@ -33,12 +40,16 @@ public class SystemPDFModuleController { @Resource private SystemPDFModuleService systemPDFModuleService; @Resource + private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService; + @Resource private SystemPDFTemplateService systemPDFTemplateService; + @Resource + BussinessLocalTypeService bussinessLocalTypeService; @AuthRuleAnnotation("system/pdf/module/list") @GetMapping("/system/pdf/module/list") public BaseResponse list(@Valid SystemPDFModuleRequest systemPDFModuleRequest, - BindingResult bindingResult) { + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -65,10 +76,47 @@ public class SystemPDFModuleController { return ResultVOUtils.success(pageSimpleResponse); } + + @AuthRuleAnnotation("system/pdf/module/detail") + @GetMapping("/system/pdf/module/detail") + public BaseResponse moduleDetail(@Valid SystemPDFTemplateRelevanceRequest systemPDFModuleRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + if (systemPDFModuleRequest.getTemplateType() != null && systemPDFModuleRequest.getTemplateType() == 2) { + BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); + List bussinessLocalTypeEntities = bussinessLocalTypeService.filterList(bussinessLocalTypeFilterRequest); + for (BussinessLocalTypeEntity bussinessLocalTypeEntity : bussinessLocalTypeEntities) { + SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); + systemPDFTemplateRelevanceEntity.setLocalAction(bussinessLocalTypeEntity.getAction()); + systemPDFTemplateRelevanceEntity.setModuleId(systemPDFModuleRequest.getModuleId()); + systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity); + } + + List systemPDFTemplateRelevanceEntityList = + systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest); + return ResultVOUtils.success(systemPDFTemplateRelevanceEntityList); + } + return ResultVOUtils.success(null); + + + } + + @AuthRuleAnnotation("system/pdf/module/update") + @PostMapping("/system/pdf/module/updateRl") + public BaseResponse updateRl(@RequestBody SystemPDFTemplateRelevanceEntity systemPDFModuleSaveRequest) { + systemPDFTemplateRelevanceService.udpateRl(systemPDFModuleSaveRequest); + return ResultVOUtils.success("修改成功"); + } + + @AuthRuleAnnotation("system/pdf/module/list") @GetMapping("/system/pdf/module/pdfModules") public BaseResponse pdfModules(@RequestParam(value = "page", defaultValue = "1") Integer page, - @RequestParam(value = "limit", defaultValue = "100") Integer limit) { + @RequestParam(value = "limit", defaultValue = "100") Integer limit) { List systemPDFModuleEntityList = systemPDFModuleService.listPDFModules(page, limit); PageInfo pageInfo = new PageInfo<>(systemPDFModuleEntityList); @@ -85,6 +133,7 @@ public class SystemPDFModuleController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("system/pdf/module/save") @PostMapping("/system/pdf/module/save") public BaseResponse save(@RequestBody @Valid SystemPDFModuleSaveRequest systemPDFModuleSaveRequest, diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java index 334265a..81e0031 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java @@ -23,4 +23,6 @@ public interface BussinessLocalTypeDao { boolean insertBussinessType(BussinessLocalTypeEntity bussinessTypeEntity); boolean deleteById(@Param("id") String id); + + BussinessLocalTypeEntity selectById(String id); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessOriginTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessOriginTypeDao.java index c996e79..ffff169 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessOriginTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessOriginTypeDao.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.dao.basic; import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity; import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,4 +11,12 @@ import java.util.List; public interface BussinessOriginTypeDao { List filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest); + + List filterJoinList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest); + + List filterEnableList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest); + + boolean updateBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity); + + boolean insertBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java index e7287ae..a5a6d21 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java @@ -10,6 +10,7 @@ import java.util.List; @Mapper public interface BussinessTypeDao { + BussinessTypeEntity selectById(String id); List filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java index d3a6405..e8e05dc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java @@ -18,6 +18,8 @@ public interface CompanyDao { List getSubCompany2(FilterCompanyRequest companyRequest); + List filterCompany(FilterCompanyRequest companyRequest); + boolean modifyCompany(CompanyEntity companyEntity); boolean insertCompany(CompanyEntity companyEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/IOOrderStatusDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/IOOrderStatusDao.java new file mode 100644 index 0000000..e4fe2fd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/IOOrderStatusDao.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.dao.inout; + +import com.glxp.sale.admin.entity.inout.IOOrderStatusEntity; +import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import com.glxp.sale.admin.req.inout.OrderStatusFilterRequest; +import com.glxp.sale.admin.req.inout.WarehouseQueryRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface IOOrderStatusDao { + + List filterOrderStatus(OrderStatusFilterRequest warehouseQueryRequest); + + boolean insertOrderStatus(IOOrderStatusEntity ioOrderStatusEntity); + + boolean deleteByOrderId(@Param("orderId") String orderId); + + boolean updateOrderStatus(IOOrderStatusEntity warehouseEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java new file mode 100644 index 0000000..e1a06ed --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.dao.inventory; + +import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface InvWarehouseDao { + + List filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); + + List filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); + + boolean insertInvWarehouse(InvWarehouseEntity InvWarehouseEntity); + + boolean updateInvWarehouse(InvWarehouseEntity InvWarehouseEntity); + + InvWarehouseEntity selectById(@Param("id") String id); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFTemplateRelevanceDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFTemplateRelevanceDao.java index ceef5eb..1dc0901 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFTemplateRelevanceDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFTemplateRelevanceDao.java @@ -1,6 +1,9 @@ package com.glxp.sale.admin.dao.param; import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity; +import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; +import com.glxp.sale.admin.req.param.SystemPDFModuleRequest; +import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -9,8 +12,12 @@ import java.util.List; @Mapper public interface SystemPDFTemplateRelevanceDao { + + List filterList(SystemPDFTemplateRelevanceRequest systemPDFModuleRequest); + /** * 根据 customerId 查询 + * * @param customerId 传入的 customerId * @return */ @@ -18,6 +25,7 @@ public interface SystemPDFTemplateRelevanceDao { /** * 根据 多个 customerId 查询 + * * @param customerIds 传入的 customerIds * @return */ @@ -25,6 +33,7 @@ public interface SystemPDFTemplateRelevanceDao { /** * 根据 template_id 查询 customer_id + * * @param templateId 传入的 templateId * @return */ @@ -32,6 +41,7 @@ public interface SystemPDFTemplateRelevanceDao { /** * 批量插入 + * * @param systemPDFTemplateRelevanceEntityList * @return */ @@ -42,8 +52,10 @@ public interface SystemPDFTemplateRelevanceDao { /** * 根据 customerId 删除 - * @param customerId + * * @return */ - boolean deleteByCustomerId(Long customerId); + boolean deleteById(Integer id); + + boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UserRegisterEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UserRegisterEntity.java index 79918be..7705e1d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UserRegisterEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UserRegisterEntity.java @@ -27,4 +27,6 @@ public class UserRegisterEntity { private String areaCode; private String userName; private String licenseUrl; + private String udplatCompanyName; + private String udplatCompanyId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessOriginTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessOriginTypeEntity.java index 37ff779..58a3847 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessOriginTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessOriginTypeEntity.java @@ -7,5 +7,9 @@ public class BussinessOriginTypeEntity { private String id; private String name; private String action; + private String thirdSys; + private String thirdSysName; + private Boolean enable; + private String remark; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IOOrderStatusEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IOOrderStatusEntity.java new file mode 100644 index 0000000..ae0c5ec --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IOOrderStatusEntity.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.entity.inout; + +import lombok.Data; + +import java.util.Date; + +@Data +public class IOOrderStatusEntity { + private Integer id; + private String orderId; + private Integer status; + private Date updateTime; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java index fc79b87..7c906c5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java @@ -31,7 +31,8 @@ public class OrderEntity { private Integer exportStatus; private String exportFilePath; private Integer dlCount; + private String invStorageCode; + private String invWarehouseCode; - } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java index 58d2b89..1cb80f6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java @@ -24,10 +24,19 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String unitIdFk; private String customerId; private BigDecimal totalPrice; + + public BigDecimal getPrice() { +// if (price == null) +// return new BigDecimal(0); + return price; + + } + private BigDecimal price; private BigDecimal amount; private String title; private String zczbhhzbapzbh; private String index; private String totalPriceWord; + private String orderName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java index d71f5eb..2816a9f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java @@ -25,7 +25,8 @@ public class WarehouseEntity { private String customerId; private String nameCode; private String supId;//供应商ID - + private String invStorageCode; + private String invWarehouseCode; private String relId; private Integer status; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/Warehousetemp.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/Warehousetemp.java index c77a3e3..976a1de 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/Warehousetemp.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/Warehousetemp.java @@ -37,6 +37,8 @@ public class Warehousetemp { private Integer count; private Integer type; + private String invStorageCode; + private String invWarehouseCode; public Long getId() { return id; @@ -189,4 +191,20 @@ public class Warehousetemp { public void setType(Integer type) { this.type = type; } + + public String getInvStorageCode() { + return invStorageCode; + } + + public void setInvStorageCode(String invStorageCode) { + this.invStorageCode = invStorageCode; + } + + public String getInvWarehouseCode() { + return invWarehouseCode; + } + + public void setInvWarehouseCode(String invWarehouseCode) { + this.invWarehouseCode = invWarehouseCode; + } } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductDetailEntity.java index 14be7c2..10f569f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductDetailEntity.java @@ -23,4 +23,7 @@ public class InvProductDetailEntity { private String stockIdFk; private String supId; private String originCode; + private String invStorageCode; + private String invWarehouseCode; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java index 3f400f0..857a28e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java @@ -20,6 +20,8 @@ public class InvProductEntity { private String customerId; private String supId; private String unitFk; + private String invStorageCode; + private String invWarehouseCode; public Integer getInCount() { if (inCount == null) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvWarehouseEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvWarehouseEntity.java new file mode 100644 index 0000000..e1436d9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvWarehouseEntity.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.entity.inventory; + +import lombok.Data; + +import java.util.Date; + +@Data +public class InvWarehouseEntity { + + + private Integer id; + private Integer pid; + private String code; + private String name; + private Boolean advanceType; + private Boolean isDefault; + private Integer status; + private Date updateTime; + private String remark; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java index ae8f9a3..22f9e4a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java @@ -7,9 +7,11 @@ import lombok.Data; */ @Data public class SystemPDFTemplateRelevanceEntity { - private int id; - private int template_id; - private Long customerId; - private int admin_id; + private int id; + private Integer templateId; + private Long customerId; + private Integer adminId; + private Integer moduleId; + private String localAction; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java index 5dcc026..38533c6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java @@ -7,4 +7,7 @@ import lombok.Data; public class BussinessOriginTypeFilterRequest extends ListPageRequest { private String action; private String name; + private String thirdSys; + private String thirdSysName; + private Boolean enable; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java index 57c5362..44c7046 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java @@ -18,4 +18,8 @@ public class FilterOrderRequest { private String customerId; private String status; + private Boolean isDownThrSys; + private Boolean isLocal; + private String localAction; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java index 25b0873..1168a8b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java @@ -22,6 +22,6 @@ public class OrderFilterRequest extends ListPageRequest { private Integer receiveStatus; private Integer statusOrOne; private String customerId; - + private String fromCorpId; private String orderId;//业务单据ID，手持终端上传上来的 } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderStatusFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderStatusFilterRequest.java new file mode 100644 index 0000000..19c5baf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderStatusFilterRequest.java @@ -0,0 +1,10 @@ +package com.glxp.sale.admin.req.inout; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class OrderStatusFilterRequest extends ListPageRequest { + private String orderId; + private Integer status; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java index 87986df..a060c55 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.req.inout; +import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import lombok.Data; @@ -12,4 +13,5 @@ public class StockOrderIdsRequest { List ids; boolean filterUDIType; UdiEntity udiEntity; + List stockOrderLists; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java index 59af3fa..9ebd932 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java @@ -20,4 +20,6 @@ public class FilterInvProductRequest extends ListPageRequest { private String productsName; private String supId; private String unitFk; + private String invStorageCode; + private String invWarehouseCode; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java new file mode 100644 index 0000000..326d0f7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.req.inventory; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class FilterInvWarehouseRequest extends ListPageRequest { + + private Integer id; + private Integer pid; + private String code; + private String name; + private Boolean advanceType; + private Boolean isDefault; + private Date updateTime; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java index 2bebcc5..e8e4811 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java @@ -20,4 +20,6 @@ public class StockQRCodeTextPDFTemplateRequest { private int rowCount; private int qrcodeCount; private List countList; + + private String orderName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java new file mode 100644 index 0000000..9540fa0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/SystemPDFTemplateRelevanceRequest.java @@ -0,0 +1,10 @@ +package com.glxp.sale.admin.req.itextpdf; + +import lombok.Data; + +@Data +public class SystemPDFTemplateRelevanceRequest { + private Integer moduleId; + private Integer templateType; + private String localAction; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrCorpRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrCorpRequest.java index d55d440..1cb3bae 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrCorpRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrCorpRequest.java @@ -12,5 +12,6 @@ public class FilterThrCorpRequest extends ListPageRequest { private String thirdSys; private String unitId; private String name; + private String key; List thrCorpEntities; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessOriginTypeResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessOriginTypeResponse.java new file mode 100644 index 0000000..359bdb9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessOriginTypeResponse.java @@ -0,0 +1,11 @@ +package com.glxp.sale.admin.res.basic; + +import lombok.Data; + +@Data +public class BussinessOriginTypeResponse { + private String name; + private String action; + private String localAction; + private String thirdAction; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/DlOrderResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/DlOrderResponse.java new file mode 100644 index 0000000..dbd3431 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/DlOrderResponse.java @@ -0,0 +1,17 @@ +package com.glxp.sale.admin.res.inout; + +import com.glxp.sale.admin.entity.inout.ErpOrderEntity; +import com.glxp.sale.admin.entity.inout.OrderDetailEntity; +import com.glxp.sale.admin.entity.inout.OrderEntity; +import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class DlOrderResponse { + private OrderEntity orderEntity; + private List orderDetails; + private List codes; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductDetailJoinResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductDetailJoinResponse.java index 3832d02..8ae8765 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductDetailJoinResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductDetailJoinResponse.java @@ -23,4 +23,7 @@ public class InvProductDetailJoinResponse { private String stockIdFk; private String fromCorpId; private String fromCorp; + private String invStorageCode; + private String invWarehouseCode; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvWarehouseResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvWarehouseResponse.java new file mode 100644 index 0000000..3db8fac --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvWarehouseResponse.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.res.inventory; + +import com.glxp.sale.admin.res.auth.AuthPermissionRuleMergeResponse; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class InvWarehouseResponse { + + + private Integer id; + private Integer pid; + private String code; + private String name; + private Boolean advanceType; + private Boolean isDefault; + private Integer status; + private Date updateTime; + private String remark; + + private List children; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateRelevanceResponse.java new file mode 100644 index 0000000..28d26da --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateRelevanceResponse.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.res.param; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SystemPDFTemplateRelevanceResponse { + + + private String param; + private String fieldExplain; + + private String templateDlUrl; + private Integer templateType; + + private int id; + private String moduleName; + private String templateName; + private int templateId; + private String localAction; + private String localActionName; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java index 28f81cc..007b630 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java @@ -22,4 +22,6 @@ public interface BussinessLocalTypeService { boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity); boolean deleteById(String id); + + BussinessLocalTypeEntity selectById(String id); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessOriginTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessOriginTypeService.java index 68f6e5d..cc9ef46 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessOriginTypeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessOriginTypeService.java @@ -1,14 +1,29 @@ package com.glxp.sale.admin.service.basic; +import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity; import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest; import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse; import java.util.List; public interface BussinessOriginTypeService { + + BussinessOriginTypeEntity findByAction(String action); + + List filterEnableList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest); + + BussinessOriginTypeResponse finAllByAction(String action); + + BasicThirdSysDetailEntity findSysByAction(String action, String key); + List filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest); + boolean updateBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity); + + boolean insertBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessTypeService.java index 841c6fa..2c8025d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessTypeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessTypeService.java @@ -13,6 +13,8 @@ public interface BussinessTypeService { List filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + BussinessTypeEntity selectById(String id); + BussinessTypeEntity findBTByAction(String action); BussinessTypeEntity findBTByName(String name); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java index 8e9f7a2..a7787bf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java @@ -79,4 +79,9 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService public boolean deleteById(String id) { return bussinessLocalTypeDao.deleteById(id); } + + @Override + public BussinessLocalTypeEntity selectById(String id) { + return bussinessLocalTypeDao.selectById(id); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java index ddf3e0c..426366c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java @@ -2,9 +2,12 @@ package com.glxp.sale.admin.service.basic.impl; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.basic.BussinessOriginTypeDao; +import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity; import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService; import com.glxp.sale.admin.service.basic.BussinessOriginTypeService; import org.springframework.stereotype.Service; @@ -17,6 +20,46 @@ public class BussinessOriginTypeServiceImpl implements BussinessOriginTypeServic @Resource BussinessOriginTypeDao bussinessOriginTypeDao; + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; + + @Override + public BussinessOriginTypeEntity findByAction(String action) { + BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest(); + bussinessOriginTypeFilterRequest.setAction(action); + List bussinessOriginTypeEntities = filterList(bussinessOriginTypeFilterRequest); + if (bussinessOriginTypeEntities != null && bussinessOriginTypeEntities.size() > 0) + return bussinessOriginTypeEntities.get(0); + return null; + } + + @Override + public List filterEnableList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest) { + return bussinessOriginTypeDao.filterEnableList(bussinessOriginTypeFilterRequest); + } + + @Override + public BussinessOriginTypeResponse finAllByAction(String action) { + BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest(); + bussinessOriginTypeFilterRequest.setAction(action); + List bussinessOriginTypeEntities = bussinessOriginTypeDao.filterJoinList(bussinessOriginTypeFilterRequest); + if (bussinessOriginTypeEntities != null && bussinessOriginTypeEntities.size() > 0) { + return bussinessOriginTypeEntities.get(0); + } + return null; + } + + @Override + public BasicThirdSysDetailEntity findSysByAction(String action, String key) { + BussinessOriginTypeEntity bussinessOriginTypeEntity = findByAction(action); + if (bussinessOriginTypeEntity != null) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey(key, bussinessOriginTypeEntity.getThirdSys()); +// basicThirdSysDetailEntity.setLocalAction(bussinessTypResponse.getLocalAction()); + return basicThirdSysDetailEntity; + } + + return null; + } @Override public List filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest) { @@ -30,4 +73,14 @@ public class BussinessOriginTypeServiceImpl implements BussinessOriginTypeServic List data = bussinessOriginTypeDao.filterList(bussinessOriginTypeFilterRequest); return data; } + + @Override + public boolean updateBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity) { + return bussinessOriginTypeDao.updateBusOriginType(bussinessTypeEntity); + } + + @Override + public boolean insertBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity) { + return bussinessOriginTypeDao.insertBusOriginType(bussinessTypeEntity); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java index 7a7f93c..13b9fa7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java @@ -48,6 +48,13 @@ public class BussinessTypeServiceImpl implements BussinessTypeService { return data; } + @Override + public BussinessTypeEntity selectById(String id) { + return bussinessTypeDao.selectById( + id + ); + } + @Override public BussinessTypeEntity findBTByAction(String action) { BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java index 1489c4b..d7e99b6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java @@ -9,6 +9,10 @@ import java.util.List; public interface CompanyService { + CompanyEntity findCompanyByUnitFk(String unitFk); + + List filterCompany(FilterCompanyRequest companyRequest); + CompanyEntity findCompany(Long CustomerId); List getSubCompany(FilterCompanyRequest commitRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java index db300df..6bb0369 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java @@ -18,6 +18,22 @@ public class CompanyServiceImpl implements CompanyService { @Resource CompanyDao companyDao; + @Override + public CompanyEntity findCompanyByUnitFk(String unitFk) { + FilterCompanyRequest filterCompanyRequest = new FilterCompanyRequest(); + filterCompanyRequest.setUnitIdFk(unitFk); + List companyEntities = companyDao.filterCompany(filterCompanyRequest); + if (companyEntities != null && companyEntities.size() > 0) { + return companyEntities.get(0); + } + return null; + } + + @Override + public List filterCompany(FilterCompanyRequest companyRequest) { + return companyDao.filterCompany(companyRequest); + } + @Override public CompanyEntity findCompany(Long CustomerId) { return companyDao.findCompany(CustomerId); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/IOOrderStatusService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/IOOrderStatusService.java new file mode 100644 index 0000000..0e09bbd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/IOOrderStatusService.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.service.inout; + +import com.glxp.sale.admin.entity.inout.IOOrderStatusEntity; +import com.glxp.sale.admin.req.inout.OrderStatusFilterRequest; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Service; + +import java.util.List; + +public interface IOOrderStatusService { + + + List filterOrderStatus(OrderStatusFilterRequest warehouseQueryRequest); + + boolean insertOrderStatus(IOOrderStatusEntity ioOrderStatusEntity); + + boolean deleteByOrderId(String orderId); + + boolean updateOrderStatus(IOOrderStatusEntity warehouseEntity); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/IOOrderStatusServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/IOOrderStatusServiceImpl.java new file mode 100644 index 0000000..832424b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/IOOrderStatusServiceImpl.java @@ -0,0 +1,48 @@ +package com.glxp.sale.admin.service.inout.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.inout.IOOrderStatusDao; +import com.glxp.sale.admin.entity.inout.IOOrderStatusEntity; +import com.glxp.sale.admin.req.inout.OrderStatusFilterRequest; +import com.glxp.sale.admin.service.inout.IOOrderStatusService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class IOOrderStatusServiceImpl implements IOOrderStatusService { + + + @Resource + IOOrderStatusDao ioOrderStatusDao; + + + @Override + public List filterOrderStatus(OrderStatusFilterRequest orderStatusFilterRequest) { + if (orderStatusFilterRequest == null) { + return Collections.emptyList(); + } + if (orderStatusFilterRequest.getPage() != null) { + int offset = (orderStatusFilterRequest.getPage() - 1) * orderStatusFilterRequest.getLimit(); + PageHelper.offsetPage(offset, orderStatusFilterRequest.getLimit()); + } + return ioOrderStatusDao.filterOrderStatus(orderStatusFilterRequest); + } + + @Override + public boolean insertOrderStatus(IOOrderStatusEntity ioOrderStatusEntity) { + return ioOrderStatusDao.insertOrderStatus(ioOrderStatusEntity); + } + + @Override + public boolean deleteByOrderId(String orderId) { + return ioOrderStatusDao.deleteByOrderId(orderId); + } + + @Override + public boolean updateOrderStatus(IOOrderStatusEntity ioOrderStatusEntity) { + return ioOrderStatusDao.updateOrderStatus(ioOrderStatusEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java new file mode 100644 index 0000000..b951906 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.service.inventory; + +import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface InvWarehouseService { + + List filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); + + List filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); + + boolean insertInvWarehouse(InvWarehouseEntity invWarehouseEntity); + + boolean updateInvWarehouse(InvWarehouseEntity invWarehouseEntity); + + InvWarehouseEntity selectById(String id); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java new file mode 100644 index 0000000..9ab44a9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java @@ -0,0 +1,68 @@ +package com.glxp.sale.admin.service.inventory.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.inventory.InvWarehouseDao; +import com.glxp.sale.admin.entity.inventory.InvProductEntity; +import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; +import com.glxp.sale.admin.res.inventory.InvProductResponse; +import com.glxp.sale.admin.service.inventory.InvWarehouseService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class InvWarehouseServiceImpl implements InvWarehouseService { + + + @Resource + InvWarehouseDao invWarehouseDao; + + @Override + public List filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { + if (filterInvWarehouseRequest == null) { + return Collections.emptyList(); + } + if (filterInvWarehouseRequest.getPage() != null) { + int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit()); + } + List data = invWarehouseDao.filterInvWarehouse(filterInvWarehouseRequest); + return data; + } + + @Override + public List filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { + if (filterInvWarehouseRequest == null) { + return Collections.emptyList(); + } + if (filterInvWarehouseRequest.getPage() != null) { + int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit()); + } + List data = invWarehouseDao.filterGroupInvWarehouse(filterInvWarehouseRequest); + return data; + } + + @Override + public boolean insertInvWarehouse(InvWarehouseEntity invWarehouseEntity) { + return invWarehouseDao.insertInvWarehouse(invWarehouseEntity); + } + + @Override + public boolean updateInvWarehouse(InvWarehouseEntity invWarehouseEntity) { + return invWarehouseDao.updateInvWarehouse(invWarehouseEntity); + } + + @Override + public InvWarehouseEntity selectById(String id) { + return invWarehouseDao.selectById(id); + } + + @Override + public boolean deleteById(String id) { + return invWarehouseDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemPDFTemplateRelevanceService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemPDFTemplateRelevanceService.java index 4107584..89cc50b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemPDFTemplateRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemPDFTemplateRelevanceService.java @@ -3,10 +3,14 @@ package com.glxp.sale.admin.service.param; import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity; +import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; +import com.glxp.sale.admin.req.param.SystemPDFModuleRequest; +import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse; import java.util.List; public interface SystemPDFTemplateRelevanceService { + List filterList(SystemPDFTemplateRelevanceRequest systemPDFModuleRequest); List listByCustomerId(Long customerId); @@ -20,6 +24,8 @@ public interface SystemPDFTemplateRelevanceService { int insertRolesCustomerIdAll(List templates, Long customerId); - boolean deleteByCustomerId(Long customerId); + boolean deleteByCustomerId(Integer customerId); + + boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemPDFTemplateRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemPDFTemplateRelevanceServiceImpl.java index 26604cb..bbeb1a5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemPDFTemplateRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemPDFTemplateRelevanceServiceImpl.java @@ -2,6 +2,9 @@ package com.glxp.sale.admin.service.param.impl; import com.glxp.sale.admin.dao.param.SystemPDFTemplateRelevanceDao; import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity; +import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; +import com.glxp.sale.admin.req.param.SystemPDFModuleRequest; +import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse; import com.glxp.sale.admin.service.param.SystemPDFTemplateRelevanceService; import org.springframework.stereotype.Service; @@ -16,8 +19,14 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR @Resource private SystemPDFTemplateRelevanceDao systemPDFTemplateRelevanceDao; + @Override + public List filterList(SystemPDFTemplateRelevanceRequest systemPDFModuleRequest) { + return systemPDFTemplateRelevanceDao.filterList(systemPDFModuleRequest); + } + /** * 根据 customerId 获取模板id + * * @param customerId * @return */ @@ -28,6 +37,7 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR /** * 根据多个 customerId 查询角色列表 + * * @param customerIds * @return */ @@ -41,6 +51,7 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR /** * 根据 roleId 获取 customerId + * * @param templateId * @return */ @@ -51,6 +62,7 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR /** * 批量插入 + * * @param systemPDFTemplateRelevanceEntityList * @return */ @@ -71,6 +83,7 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR /** * 根据 模板ids 和 customerId 批量插入 + * * @param templates * @param customerId * @return @@ -80,7 +93,7 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR List systemPDFTemplateRelevanceEntityList = templates.stream().map(aLong -> { SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); - systemPDFTemplateRelevanceEntity.setTemplate_id(aLong); + systemPDFTemplateRelevanceEntity.setTemplateId(aLong); systemPDFTemplateRelevanceEntity.setCustomerId(customerId); return systemPDFTemplateRelevanceEntity; }).collect(Collectors.toList()); @@ -93,12 +106,18 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR /** * 根据 customerId 删除对应的模板关联 + * * @param customerId * @return */ @Override - public boolean deleteByCustomerId(Long customerId) { + public boolean deleteByCustomerId(Integer customerId) { - return systemPDFTemplateRelevanceDao.deleteByCustomerId(customerId); + return systemPDFTemplateRelevanceDao.deleteById(customerId); + } + + @Override + public boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) { + return systemPDFTemplateRelevanceDao.udpateRl(systemPDFTemplateRelevanceEntity); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index 1b6bf96..810aeff 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -76,9 +76,18 @@ public class InvProductsTrService { CompanyService companyService; @Resource SystemParamConfigService systemParamConfigService; + @Resource + IOOrderStatusService ioOrderStatusService; @Async public void genInvProducts(String orderId) { + //导入订单状态 + IOOrderStatusEntity ioOrderStatusEntity = new IOOrderStatusEntity(); + ioOrderStatusEntity.setStatus(1); + ioOrderStatusEntity.setUpdateTime(new Date()); + ioOrderStatusEntity.setOrderId(orderId); + ioOrderStatusService.insertOrderStatus(ioOrderStatusEntity); + OrderEntity orderEntity = orderService.findById(orderId); if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && (orderEntity.getContrastStatus() == ConstantStatus.ORDER_CHECK_SUCCESS || diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 6c45417..0bbc4dc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -271,7 +271,11 @@ public class IoTransInoutService { } UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode()); - if (udiRelevanceResponse.getIsUseDy() == 0 && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) { + if (udiRelevanceResponse == null) { + orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); + orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "该产品信息未维护！"); + return; + } else if (udiRelevanceResponse.getIsUseDy() == 0 && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) { orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "该产品不允许以使用单元入库！"); return; @@ -304,7 +308,7 @@ public class IoTransInoutService { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setNameCode(warehouseEntity.getNameCode()); List udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); - if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1) { + if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) { warehouseEntity.setRelId(null); warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI); } else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) { @@ -312,12 +316,15 @@ public class IoTransInoutService { warehouseEntity.setStatus(2); } else { warehouseEntity.setStatus(0); - warehouseEntity.setRelId(udiRelevanceEntities.get(0).getId() + ""); + if (warehouseEntity.getRelId() == null) + warehouseEntity.setRelId(udiRelevanceEntities.get(0).getId() + ""); String originSupId = checkOriginExitSup(warehouseEntity); String supId = null; if (originSupId == null) supId = checkExitSup(warehouseEntity.getRelId()); - if (supId != null && !supId.equals("MUTI")) { + else + supId = originSupId; + if (supId != null) {//&& !supId.equals("MUTI") warehouseEntity.setSupId(supId); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/FileUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/FileUtils.java index f745ebe..4aa61e8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/FileUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/FileUtils.java @@ -3,11 +3,15 @@ package com.glxp.sale.admin.util; import org.junit.Test; import java.io.*; +import java.net.MalformedURLException; +import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; +import java.util.ArrayList; +import java.util.List; public class FileUtils { @@ -60,4 +64,892 @@ public class FileUtils { return e.getMessage(); } } + + /** + * 私有构造方法，防止类的实例化，因为工具类不需要实例化。 + */ + private FileUtils() { + + } + + /** + * 修改文件的最后访问时间。 + * 如果文件不存在则创建该文件。 + * 目前这个方法的行为方式还不稳定，主要是方法有些信息输出，这些信息输出是否保留还在考虑中。 + * + * @param file 需要修改最后访问时间的文件。 + * @since 1.0 + */ + public static void touch(File file) { + long currentTime = System.currentTimeMillis(); + if (!file.exists()) { + System.err.println("file not found:" + file.getName()); + System.err.println("Create a new file:" + file.getName()); + try { + if (file.createNewFile()) { + System.out.println("Succeeded!"); + } else { + System.err.println("Create file failed!"); + } + } catch (IOException e) { + System.err.println("Create file failed!"); + e.printStackTrace(); + } + } + boolean result = file.setLastModified(currentTime); + if (!result) { + System.err.println("touch failed: " + file.getName()); + } + } + + /** + * 修改文件的最后访问时间。 + * 如果文件不存在则创建该文件。 + * 目前这个方法的行为方式还不稳定，主要是方法有些信息输出，这些信息输出是否保留还在考虑中。 + * + * @param fileName 需要修改最后访问时间的文件的文件名。 + * @since 1.0 + */ + public static void touch(String fileName) { + File file = new File(fileName); + touch(file); + } + + /** + * 修改文件的最后访问时间。 + * 如果文件不存在则创建该文件。 + * 目前这个方法的行为方式还不稳定，主要是方法有些信息输出，这些信息输出是否保留还在考虑中。 + * + * @param files 需要修改最后访问时间的文件数组。 + * @since 1.0 + */ + public static void touch(File[] files) { + for (int i = 0; i < files.length; i++) { + touch(files[i]); + } + } + + /** + * 修改文件的最后访问时间。 + * 如果文件不存在则创建该文件。 + * 目前这个方法的行为方式还不稳定，主要是方法有些信息输出，这些信息输出是否保留还在考虑中。 + * + * @param fileNames 需要修改最后访问时间的文件名数组。 + * @since 1.0 + */ + public static void touch(String[] fileNames) { + File[] files = new File[fileNames.length]; + for (int i = 0; i < fileNames.length; i++) { + files[i] = new File(fileNames[i]); + } + touch(files); + } + + /** + * 判断指定的文件是否存在。 + * + * @param fileName 要判断的文件的文件名 + * @return 存在时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean isFileExist(String fileName) { + return new File(fileName).isFile(); + } + + /** + * 创建指定的目录。 + * 如果指定的目录的父目录不存在则创建其目录书上所有需要的父目录。 + * 注意：可能会在返回false的时候创建部分父目录。 + * + * @param file 要创建的目录 + * @return 完全创建成功时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean makeDirectory(File file) { + File parent = file.getParentFile(); + if (parent != null) { + return parent.mkdirs(); + } + return false; + } + + /** + * 创建指定的目录。 + * 如果指定的目录的父目录不存在则创建其目录书上所有需要的父目录。 + * 注意：可能会在返回false的时候创建部分父目录。 + * + * @param fileName 要创建的目录的目录名 + * @return 完全创建成功时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean makeDirectory(String fileName) { + File file = new File(fileName); + return makeDirectory(file); + } + + /** + * 清空指定目录中的文件。 + * 这个方法将尽可能删除所有的文件，但是只要有一个文件没有被删除都会返回false。 + * 另外这个方法不会迭代删除，即不会删除子目录及其内容。 + * + * @param directory 要清空的目录 + * @return 目录下的所有文件都被成功删除时返回true，否则返回false. + * @since 1.0 + */ + public static boolean emptyDirectory(File directory) { + boolean result = true; + File[] entries = directory.listFiles(); + for (int i = 0; i < entries.length; i++) { + if (!entries[i].delete()) { + result = false; + } + } + return result; + } + + /** + * 清空指定目录中的文件。 + * 这个方法将尽可能删除所有的文件，但是只要有一个文件没有被删除都会返回false。 + * 另外这个方法不会迭代删除，即不会删除子目录及其内容。 + * + * @param directoryName 要清空的目录的目录名 + * @return 目录下的所有文件都被成功删除时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean emptyDirectory(String directoryName) { + File dir = new File(directoryName); + return emptyDirectory(dir); + } + + /** + * 删除指定目录及其中的所有内容。 + * + * @param dirName 要删除的目录的目录名 + * @return 删除成功时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean deleteDirectory(String dirName) { + return deleteDirectory(new File(dirName)); + } + + /** + * 删除指定目录及其中的所有内容。 + * + * @param dir 要删除的目录 + * @return 删除成功时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean deleteDirectory(File dir) { + if ((dir == null) || !dir.isDirectory()) { + throw new IllegalArgumentException("Argument " + dir + + " is not a directory. "); + } + + File[] entries = dir.listFiles(); + int sz = entries.length; + + for (int i = 0; i < sz; i++) { + if (entries[i].isDirectory()) { + if (!deleteDirectory(entries[i])) { + return false; + } + } else { + if (!entries[i].delete()) { + return false; + } + } + } + + if (!dir.delete()) { + return false; + } + return true; + } + + /** + * 列出目录中的所有内容，包括其子目录中的内容。 + * + * @param file 要列出的目录 + * @param filter 过滤器 + * @return 目录内容的文件数组。 + * @since 1.0 + */ + public static File[] listAll(File file, + javax.swing.filechooser.FileFilter filter) { + ArrayList list = new ArrayList(); + File[] files; + if (!file.exists() || file.isFile()) { + return null; + } + list(list, file, filter); + files = new File[list.size()]; + list.toArray(files); + return files; + } + + /** + * 将目录中的内容添加到列表。 + * + * @param list 文件列表 + * @param filter 过滤器 + * @param file 目录 + */ + private static void list(ArrayList list, File file, + javax.swing.filechooser.FileFilter filter) { + if (filter.accept(file)) { + list.add(file); + if (file.isFile()) { + return; + } + } + if (file.isDirectory()) { + File files[] = file.listFiles(); + for (int i = 0; i < files.length; i++) { + list(list, files[i], filter); + } + } + + } + + /** + * 返回文件的URL地址。 + * + * @param file 文件 + * @return 文件对应的的URL地址 + * @throws MalformedURLException + * @since 1.0 + * @deprecated 在实现的时候没有注意到File类本身带一个toURL方法将文件路径转换为URL。 + * 请使用File.toURL方法。 + */ + public static URL getURL(File file) throws MalformedURLException { + String fileURL = "file:/" + file.getAbsolutePath(); + URL url = new URL(fileURL); + return url; + } + + /** + * 从文件路径得到文件名。 + * + * @param filePath 文件的路径，可以是相对路径也可以是绝对路径 + * @return 对应的文件名 + * @since 1.0 + */ + public static String getFileName(String filePath) { + File file = new File(filePath); + return file.getName(); + } + + /** + * 从文件名得到文件绝对路径。 + * + * @param fileName 文件名 + * @return 对应的文件路径 + * @since 1.0 + */ + public static String getFilePath(String fileName) { + File file = new File(fileName); + return file.getAbsolutePath(); + } + + /** + * 将DOS/Windows格式的路径转换为UNIX/Linux格式的路径。 + * 其实就是将路径中的"\"全部换为"/"，因为在某些情况下我们转换为这种方式比较方便， + * 某中程度上说"/"比"\"更适合作为路径分隔符，而且DOS/Windows也将它当作路径分隔符。 + * + * @param filePath 转换前的路径 + * @return 转换后的路径 + * @since 1.0 + */ + public static String toUNIXpath(String filePath) { + return filePath.replace('\\', '/'); + } + + /** + * 从文件名得到UNIX风格的文件绝对路径。 + * + * @param fileName 文件名 + * @return 对应的UNIX风格的文件路径 + * @see #toUNIXpath(String filePath) toUNIXpath + * @since 1.0 + */ + public static String getUNIXfilePath(String fileName) { + File file = new File(fileName); + return toUNIXpath(file.getAbsolutePath()); + } + + /** + * 得到文件的类型。 + * 实际上就是得到文件名中最后一个“.”后面的部分。 + * + * @param fileName 文件名 + * @return 文件名中的类型部分 + * @since 1.0 + */ + public static String getTypePart(String fileName) { + int point = fileName.lastIndexOf('.'); + int length = fileName.length(); + if (point == -1 || point == length - 1) { + return ""; + } else { + return fileName.substring(point + 1, length); + } + } + + /** + * 得到文件的类型。 + * 实际上就是得到文件名中最后一个“.”后面的部分。 + * + * @param file 文件 + * @return 文件名中的类型部分 + * @since 1.0 + */ + public static String getFileType(File file) { + return getTypePart(file.getName()); + } + + /** + * 得到文件的名字部分。 + * 实际上就是路径中的最后一个路径分隔符后的部分。 + * + * @param fileName 文件名 + * @return 文件名中的名字部分 + * @since 1.0 + */ + public static String getNamePart(String fileName) { + int point = getPathLsatIndex(fileName); + int length = fileName.length(); + if (point == -1) { + return fileName; + } else if (point == length - 1) { + int secondPoint = getPathLsatIndex(fileName, point - 1); + if (secondPoint == -1) { + if (length == 1) { + return fileName; + } else { + return fileName.substring(0, point); + } + } else { + return fileName.substring(secondPoint + 1, point); + } + } else { + return fileName.substring(point + 1); + } + } + + /** + * 得到文件名中的父路径部分。 + * 对两种路径分隔符都有效。 + * 不存在时返回""。 + * 如果文件名是以路径分隔符结尾的则不考虑该分隔符，例如"/path/"返回""。 + * + * @param fileName 文件名 + * @return 父路径，不存在或者已经是父目录时返回"" + * @since 1.0 + */ + public static String getPathPart(String fileName) { + int point = getPathLsatIndex(fileName); + int length = fileName.length(); + if (point == -1) { + return ""; + } else if (point == length - 1) { + int secondPoint = getPathLsatIndex(fileName, point - 1); + if (secondPoint == -1) { + return ""; + } else { + return fileName.substring(0, secondPoint); + } + } else { + return fileName.substring(0, point); + } + } + + /** + * 得到路径分隔符在文件路径中首次出现的位置。 + * 对于DOS或者UNIX风格的分隔符都可以。 + * + * @param fileName 文件路径 + * @return 路径分隔符在路径中首次出现的位置，没有出现时返回-1。 + * @since 1.0 + */ + public static int getPathIndex(String fileName) { + int point = fileName.indexOf('/'); + if (point == -1) { + point = fileName.indexOf('\\'); + } + return point; + } + + /** + * 得到路径分隔符在文件路径中指定位置后首次出现的位置。 + * 对于DOS或者UNIX风格的分隔符都可以。 + * + * @param fileName 文件路径 + * @param fromIndex 开始查找的位置 + * @return 路径分隔符在路径中指定位置后首次出现的位置，没有出现时返回-1。 + * @since 1.0 + */ + public static int getPathIndex(String fileName, int fromIndex) { + int point = fileName.indexOf('/', fromIndex); + if (point == -1) { + point = fileName.indexOf('\\', fromIndex); + } + return point; + } + + /** + * 得到路径分隔符在文件路径中最后出现的位置。 + * 对于DOS或者UNIX风格的分隔符都可以。 + * + * @param fileName 文件路径 + * @return 路径分隔符在路径中最后出现的位置，没有出现时返回-1。 + * @since 1.0 + */ + public static int getPathLsatIndex(String fileName) { + int point = fileName.lastIndexOf('/'); + if (point == -1) { + point = fileName.lastIndexOf('\\'); + } + return point; + } + + /** + * 得到路径分隔符在文件路径中指定位置前最后出现的位置。 + * 对于DOS或者UNIX风格的分隔符都可以。 + * + * @param fileName 文件路径 + * @param fromIndex 开始查找的位置 + * @return 路径分隔符在路径中指定位置前最后出现的位置，没有出现时返回-1。 + * @since 1.0 + */ + public static int getPathLsatIndex(String fileName, int fromIndex) { + int point = fileName.lastIndexOf('/', fromIndex); + if (point == -1) { + point = fileName.lastIndexOf('\\', fromIndex); + } + return point; + } + + /** + * 将文件名中的类型部分去掉。 + * + * @param filename 文件名 + * @return 去掉类型部分的结果 + * @since 1.0 + */ + public static String trimType(String filename) { + int index = filename.lastIndexOf("."); + if (index != -1) { + return filename.substring(0, index); + } else { + return filename; + } + } + + /** + * 得到相对路径。 + * 文件名不是目录名的子节点时返回文件名。 + * + * @param pathName 目录名 + * @param fileName 文件名 + * @return 得到文件名相对于目录名的相对路径，目录下不存在该文件时返回文件名 + * @since 1.0 + */ + public static String getSubpath(String pathName, String fileName) { + int index = fileName.indexOf(pathName); + if (index != -1) { + return fileName.substring(index + pathName.length() + 1); + } else { + return fileName; + } + } + + /** + * 检查给定目录的存在性 + * 保证指定的路径可用，如果指定的路径不存在，那么建立该路径，可以为多级路径 + * + * @param path + * @return 真假值 + * @since 1.0 + */ + public static final boolean pathValidate(String path) { + //String path="d:/web/www/sub"; + //System.out.println(path); + //path = getUNIXfilePath(path); + + //path = ereg_replace("^\\/+", "", path); + //path = ereg_replace("\\/+$", "", path); + String[] arraypath = path.split("/"); + String tmppath = ""; + for (int i = 0; i < arraypath.length; i++) { + tmppath += "/" + arraypath[i]; + File d = new File(tmppath.substring(1)); + if (!d.exists()) { //检查Sub目录是否存在 + System.out.println(tmppath.substring(1)); + if (!d.mkdir()) { + return false; + } + } + } + return true; + } + + /** + * 读取文件的内容 + * 读取指定文件的内容 + * + * @param path 为要读取文件的绝对路径 + * @return 以行读取文件后的内容。 + * @since 1.0 + */ + public static final String getFileContent(String path) throws IOException { + String filecontent = ""; + try { + File f = new File(path); + if (f.exists()) { + FileReader fr = new FileReader(path); + BufferedReader br = new BufferedReader(fr); //建立BufferedReader对象，并实例化为br + String line = br.readLine(); //从文件读取一行字符串 + //判断读取到的字符串是否不为空 + while (line != null) { + filecontent += line + "\n"; + line = br.readLine(); //从文件中继续读取一行数据 + } + br.close(); //关闭BufferedReader对象 + fr.close(); //关闭文件 + } + + } catch (IOException e) { + throw e; + } + return filecontent; + } + + /** + * 根据内容生成文件 + * + * @param path 要生成文件的绝对路径， + * @param modulecontent 文件的内容。 + * @return 真假值 + * @since 1.0 + */ + public static final boolean genModuleTpl(String path, String modulecontent) throws IOException { + + path = getUNIXfilePath(path); + String[] patharray = path.split("\\/"); + String modulepath = ""; + for (int i = 0; i < patharray.length - 1; i++) { + modulepath += "/" + patharray[i]; + } + File d = new File(modulepath.substring(1)); + if (!d.exists()) { + if (!pathValidate(modulepath.substring(1))) { + return false; + } + } + try { + FileWriter fw = new FileWriter(path); //建立FileWriter对象，并实例化fw + //将字符串写入文件 + fw.write(modulecontent); + fw.close(); + } catch (IOException e) { + throw e; + } + return true; + } + + /** + * 获取图片文件的扩展名（发布系统专用） + * + * @param pic_path 为图片名称加上前面的路径不包括扩展名 + * @return 图片的扩展名 + * @since 1.0 + */ + public static final String getPicExtendName(String pic_path) { + pic_path = getUNIXfilePath(pic_path); + String pic_extend = ""; + if (isFileExist(pic_path + ".gif")) { + pic_extend = ".gif"; + } + if (isFileExist(pic_path + ".jpeg")) { + pic_extend = ".jpeg"; + } + if (isFileExist(pic_path + ".jpg")) { + pic_extend = ".jpg"; + } + if (isFileExist(pic_path + ".png")) { + pic_extend = ".png"; + } + return pic_extend; //返回图片扩展名 + } + + /** + * 拷贝文件 + * + * @param in 输入文件 + * @param out 输出文件 + * @return + * @throws Exception + */ + public static final boolean CopyFile(File in, File out) throws Exception { + try { + FileInputStream fis = new FileInputStream(in); + FileOutputStream fos = new FileOutputStream(out); + byte[] buf = new byte[1024]; + int i = 0; + while ((i = fis.read(buf)) != -1) { + fos.write(buf, 0, i); + } + fis.close(); + fos.close(); + return true; + } catch (IOException ie) { + ie.printStackTrace(); + return false; + } + } + + /** + * 拷贝文件 + * + * @param infile 输入字符串 + * @param outfile 输出字符串 + * @return + * @throws Exception + */ + public static final boolean CopyFile(String infile, String outfile) throws Exception { + try { + File in = new File(infile); + File out = new File(outfile); + return CopyFile(in, out); + } catch (IOException ie) { + ie.printStackTrace(); + return false; + } + + } + + /** + * 把内容content写的path文件中 + * + * @param content 输入内容 + * @param path 文件路径 + * @return + */ + public static boolean SaveFileAs(String content, String path) { + FileWriter fw = null; + try { + fw = new FileWriter(new File(path), false); + if (content != null) { + fw.write(content); + } + } catch (IOException e) { + e.printStackTrace(); + return false; + } finally { + if (fw != null) { + try { + fw.flush(); + fw.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return true; + } + + /** + * 以字节为单位读取文件，常用于读二进制文件，如图片、声音、影像等文件。 + */ + public static byte[] readFileByBytes(String fileName) throws IOException { + FileInputStream in = new FileInputStream(fileName); + byte[] bytes = null; + try { + + ByteArrayOutputStream out = new ByteArrayOutputStream(1024); + + byte[] temp = new byte[1024]; + + int size = 0; + + while ((size = in.read(temp)) != -1) { + out.write(temp, 0, size); + } + + in.close(); + + bytes = out.toByteArray(); + + } catch (Exception e1) { + e1.printStackTrace(); + } finally { + if (in != null) { + in.close(); + } + } + return bytes; + } + + /** + * 以字符为单位读取文件，常用于读文本，数字等类型的文件 + */ + public static void readFileByChars(String fileName) { + File file = new File(fileName); + Reader reader = null; + try { + System.out.println("以字符为单位读取文件内容，一次读一个字节："); + // 一次读一个字符 + reader = new InputStreamReader(new FileInputStream(file)); + int tempchar; + while ((tempchar = reader.read()) != -1) { + // 对于windows下，\r\n这两个字符在一起时，表示一个换行。 + // 但如果这两个字符分开显示时，会换两次行。 + // 因此，屏蔽掉\r，或者屏蔽\n。否则，将会多出很多空行。 + if (((char) tempchar) != '\r') { + System.out.print((char) tempchar); + } + } + reader.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + System.out.println("以字符为单位读取文件内容，一次读多个字节："); + // 一次读多个字符 + char[] tempchars = new char[30]; + int charread = 0; + reader = new InputStreamReader(new FileInputStream(fileName)); + // 读入多个字符到字符数组中，charread为一次读取字符数 + while ((charread = reader.read(tempchars)) != -1) { + // 同样屏蔽掉\r不显示 + if ((charread == tempchars.length) + && (tempchars[tempchars.length - 1] != '\r')) { + System.out.print(tempchars); + } else { + for (int i = 0; i < charread; i++) { + if (tempchars[i] == '\r') { + continue; + } else { + System.out.print(tempchars[i]); + } + } + } + } + + } catch (Exception e1) { + e1.printStackTrace(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e1) { + } + } + } + } + + /** + * 以行为单位读取文件，常用于读面向行的格式化文件 + */ + public static List readFileByLines(String fileName) { + List returnString = new ArrayList(); + File file = new File(fileName); + BufferedReader reader = null; + try { + reader = new BufferedReader(new FileReader(file)); + String tempString = null; + int line = 1; + // 一次读入一行，直到读入null为文件结束 + while ((tempString = reader.readLine()) != null) { + // 显示行号 + returnString.add(tempString); + line++; + } + reader.close(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e1) { + } + } + } + return returnString; + } + + /** + * 随机读取文件内容 + */ + public static void readFileByRandomAccess(String fileName) { + RandomAccessFile randomFile = null; + try { + System.out.println("随机读取一段文件内容："); + // 打开一个随机访问文件流，按只读方式 + randomFile = new RandomAccessFile(fileName, "r"); + // 文件长度，字节数 + long fileLength = randomFile.length(); + // 读文件的起始位置 + int beginIndex = (fileLength > 4) ? 4 : 0; + // 将读文件的开始位置移到beginIndex位置。 + randomFile.seek(beginIndex); + byte[] bytes = new byte[10]; + int byteread = 0; + // 一次读10个字节，如果文件内容不足10个字节，则读剩下的字节。 + // 将一次读取的字节数赋给byteread + while ((byteread = randomFile.read(bytes)) != -1) { + System.out.write(bytes, 0, byteread); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (randomFile != null) { + try { + randomFile.close(); + } catch (IOException e1) { + } + } + } + } + + /** + * 读取文件内容 + * + * @param fileName + * @return + */ + public static String readFileAll(String fileName) { + String encoding = "UTF-8"; + File file = new File(fileName); + Long filelength = file.length(); + byte[] filecontent = new byte[filelength.intValue()]; + try { + FileInputStream in = new FileInputStream(file); + in.read(filecontent); + in.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + try { + return new String(filecontent, encoding); + } catch (UnsupportedEncodingException e) { + System.err.println("The OS does not support " + encoding); + e.printStackTrace(); + return ""; + } + } + + /** + * 显示输入流中还剩的字节数 + */ + private static void showAvailableBytes(InputStream in) { + try { + System.out.println("当前字节输入流中的字节数为:" + in.available()); + } catch (IOException e) { + e.printStackTrace(); + } + } } diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index 3165b5a..b6bea87 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -20,13 +20,22 @@ spring.servlet.multipart.max-file-size=200MB spring.servlet.multipart.max-request-size=200MB server.connectionTimeout=180000 logging.level.com.glxp.sale.admin.dao=debug +logging.level.com.glxp.api.admin.dao.auth=debug +logging.level.com.glxp.api.admin.dao.basic=debug +logging.level.com.glxp.api.admin.dao.business=debug +logging.level.com.glxp.api.admin.dao.info=debug +logging.level.com.glxp.api.admin.dao.inout=debug +logging.level.com.glxp.api.admin.dao.inventory=debug +logging.level.com.glxp.api.admin.dao.thrsys=debug # \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002 logging.file=D:/1s/udiwms/udiwms.log #file_path=/home/anthony/udiwms file_path=D:/1s/udiwms #UDI\u6570\u636E\u4E0B\u8F7D UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df -UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test +#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test +#UDI_SERVER_URL=http://127.0.0.1:9994 +UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server #UCLOD\u670D\u52A1 #UCLOD_SERVER_URL=http://127.0.0.1:9997 #UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml index e1dc71d..7ce68d6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml @@ -23,22 +23,19 @@ INSERT INTO user_register - ( - nickName, password, realName, - tel, mobile, userId, - email, companyName, creditNum, - area, detailAddr, bussinessStatus, - checkType, registerTime, checkTime,comments,areaCode,userName,licenseUrl,companyId - ) - values - ( - #{nickName},#{password},#{realName}, - #{tel},#{mobile},#{userId}, - #{email},#{companyName},#{creditNum}, - #{area},#{detailAddr},#{bussinessStatus}, - #{checkType},#{registerTime},#{checkTime}, - #{comments},#{areaCode},#{userName},#{licenseUrl},#{companyId} - ) + (nickName, password, realName, + tel, mobile, userId, + email, companyName, creditNum, + area, detailAddr, bussinessStatus, + checkType, registerTime, checkTime, comments, areaCode, userName, licenseUrl, companyId + , udplatCompanyName, udplatCompanyId) + values (#{nickName}, #{password}, #{realName}, + #{tel}, #{mobile}, #{userId}, + #{email}, #{companyName}, #{creditNum}, + #{area}, #{detailAddr}, #{bussinessStatus}, + #{checkType}, #{registerTime}, #{checkTime}, + #{comments}, #{areaCode}, #{userName}, #{licenseUrl}, #{companyId} + , #{udplatCompanyName}, #{udplatCompanyId}) @@ -68,37 +65,42 @@ - delete from user_register where id = #{id} + delete + from user_register + where id = #{id} - delete from user_register where userId = #{userId} + delete + from user_register + where userId = #{userId} \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml index fe862e2..d740aec 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml @@ -15,7 +15,72 @@ + + + + + + + + + INSERT INTO basic_bustype_origin + (action, name, enable, remark, thirdSys, thirdSysName) + values (#{action}, + #{name}, + #{enable}, + #{remark}, #{thirdSys}, #{thirdSysName}) + + + + + UPDATE basic_bustype_origin + + action = #{action}, + name = #{name}, + enable = #{enable}, + thirdSys = #{thirdSys}, + thirdSysName = #{thirdSysName}, + remark = #{remark}, + + + WHERE id = #{id} + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 2855177..904411b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -76,7 +76,6 @@ order by basic_bussiness_type.`index` - replace diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml index 42e1cab..972e137 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml @@ -6,9 +6,33 @@ + + delete from company @@ -18,7 +42,9 @@ - SELECT - company.refEntId,company.entId, - alicert.appKey,alicert.appSecret - from company INNER JOIN alicert on company.certIdFk = alicert.id - where company.customerId = #{customerId} + SELECT company.refEntId, + company.entId, + alicert.appKey, + alicert.appSecret + from company + INNER JOIN alicert on company.certIdFk = alicert.id + where company.customerId = #{customerId} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml index 18fb259..727163d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml @@ -38,7 +38,8 @@ INSERT INTO io_codes(action, mainAction, code, corpOrderId, actor, actDate, fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, - serialNo, count, packageLevel, warehouseCode, nameCode, supId, relId, status) + serialNo, count, packageLevel, warehouseCode, nameCode, supId, relId, status, + invStorageCode,invWarehouseCode) values (#{action}, #{mainAction}, #{code}, @@ -48,7 +49,7 @@ #{fromCorpId}, #{fromCorp}, #{orderId}, #{batchNo}, #{produceDate}, #{expireDate}, #{serialNo}, #{count}, #{packageLevel}, #{warehouseCode}, - #{nameCode}, #{supId}, #{relId}, #{status}) + #{nameCode}, #{supId}, #{relId}, #{status}, #{invStorageCode}, #{invWarehouseCode}) @@ -60,7 +61,7 @@ actor, actDate, fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate, - serialNo,count,packageLevel,warehouseCode,nameCode,supId, relId,status) + serialNo,count,packageLevel,warehouseCode,nameCode,supId, relId,status,invStorageCode,invWarehouseCode) VALUES @@ -80,7 +81,7 @@ ,#{item.serialNo} ,#{item.count} ,#{item.packageLevel} ,#{item.warehouseCode},#{item.nameCode},#{item.supId} - ,#{item.relId},#{item.status}) + ,#{item.relId},#{item.status},#{item.invStorageCode},#{item.invWarehouseCode}) @@ -158,6 +159,8 @@ count=#{count}, status=#{status}, supId=#{supId}, + invStorageCode=#{invStorageCode}, + invWarehouseCode=#{invWarehouseCode}, WHERE id=#{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml index 59e32eb..3cfa175 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml @@ -7,7 +7,9 @@ INSERT INTO io_codes_temp (action, mainAction,code, corpOrderId, actor,actDate, - fromCorpId, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo,count,nameCode,supId) + fromCorpId, fromCorp, + orderId,batchNo,produceDate,expireDate,serialNo, + count,nameCode,supId,invStorageCode,invWarehouseCode) VALUES @@ -25,7 +27,8 @@ ,#{item.produceDate} ,#{item.expireDate} ,#{item.serialNo} - ,#{item.count},#{item.nameCode},#{item.supId} + ,#{item.count},#{item.nameCode},#{item.supId}, + #{item.invStorageCode},#{item.invWarehouseCode} ) @@ -35,7 +38,7 @@ parameterType="com.glxp.sale.admin.entity.inout.WarehouseEntity"> INSERT INTO io_codes_temp(action, mainAction, code, corpOrderId, actor, actDate, fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo, - count, nameCode, supId) + count, nameCode, supId, invStorageCode, invWarehouseCode) values (#{action}, #{mainAction}, #{code}, @@ -49,7 +52,7 @@ #{produceDate}, #{expireDate}, #{serialNo}, - #{count}, #{nameCode}, #{supId}) + #{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}) + select * from io_order_status + + + and orderId = #{orderId} + + + and status = #{status} + + + + + + + replace + INTO io_order_status(orderId,status,updateTime) + values( + #{orderId}, + #{status}, + #{updateTime} + ) + + + + UPDATE io_order_status + + status=#{status}, + updateTime=#{updateTime}, + + WHERE orderId = #{orderId} + + + DELETE + FROM io_order_status + WHERE orderId = #{orderId} + + + \ No newline at end of file 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 0c86052..79c8561 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -32,7 +32,7 @@ insert INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction, fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, - receiveStatus,erpFk, stockCheckFk, customerId,supId,exportFilePath) + receiveStatus, erpFk, stockCheckFk, customerId, supId, exportFilePath) values (#{id}, #{action}, #{corpOrderId}, @@ -50,7 +50,7 @@ #{receiveStatus}, #{erpFk}, #{stockCheckFk}, - #{customerId},#{supId},#{exportFilePath}) + #{customerId}, #{supId}, #{exportFilePath}) UPDATE io_order @@ -84,7 +84,6 @@ - DELETE FROM io_order @@ -294,6 +293,13 @@ and corpOrderId =#{corpOrderId} + + + and `action` =#{action} + + + and `fromCorpId` =#{fromCorpId} + limit 1 diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index b5bd7e1..22302ef 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -164,6 +164,10 @@ and billNo =#{billNo} + + and billType =#{billType} + + and customerId =#{customerId} 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 5228080..1fda378 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml @@ -67,11 +67,11 @@ basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, inv_pre_product.inCount,inv_pre_product.outCount ,inv_pre_product.reCount,inv_pre_product.customerId, - company.companyName,inv_pre_product.supId,inv_pre_product.unitFk + basic_corp.name companyName,inv_pre_product.supId,inv_pre_product.unitFk 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 - inner join company on inv_pre_product.customerId=company.customerId + inner join basic_corp on inv_pre_product.supId=basic_corp.erpId basic_products.diType=1 @@ -118,12 +118,13 @@ insert INTO inv_pre_product (productsName, nameCode, relIdFk, ggxh, batchNo, productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, - inCount, outCount, reCount, customerId, supId, unitFk) + inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode) values (#{productsName}, #{nameCode}, #{relIdFk}, #{ggxh}, #{batchNo}, #{productionDate}, #{expireDate}, #{ylqxzcrbarmc}, #{zczbhhzbapzbh}, - #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk}) + #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk} + , #{invStorageCode}, #{invWarehouseCode}) @@ -151,6 +152,8 @@ customerId=#{customerId}, supId=#{supId}, unitFk=#{unitFk}, + invStorageCode=#{invStorageCode}, + invWarehouseCode=#{invWarehouseCode}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml index 13f69e2..625a678 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml @@ -94,11 +94,13 @@ parameterType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity"> insert INTO inv_pre_product_detail (code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime, - purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode) + purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode + , invStorageCode, invWarehouseCode) values (#{code}, #{productIdFk}, #{orderIdFk}, #{customerId}, #{mainAction}, #{action}, #{count}, #{updateTime}, - #{purchaseType}, #{batchNo}, #{productionDate}, #{expireDate}, #{unitFk}, #{stockIdFk}, #{supId},#{originCode}) + #{purchaseType}, #{batchNo}, #{productionDate}, #{expireDate}, #{unitFk}, #{stockIdFk} + , #{supId}, #{originCode}, #{invStorageCode}, #{invWarehouseCode}) @@ -106,7 +108,8 @@ parameterType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity"> insert INTO inv_pre_product_detail (code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime, - purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode) + purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode + , invStorageCode, invWarehouseCode) values @@ -148,7 +152,7 @@ UPDATE inv_pre_product_detail - + code=#{code}, productIdFk=#{productIdFk}, customerId=#{customerId}, @@ -163,8 +167,9 @@ stockIdFk=#{stockIdFk}, supId=#{supId}, originCode=#{originCode}, - - + invStorageCode=#{invStorageCode}, + invWarehouseCode=#{invWarehouseCode}, + WHERE id = #{id} + + + + + + + + + + + + insert INTO inv_warehouse + (pid, code, name, advanceType, isDefault, + status, updateTime, remark) + values (#{pid}, #{code}, + #{name}, #{advanceType}, #{isDefault}, + #{status}, #{updateTime}, + #{remark}) + + + + + DELETE + FROM inv_warehouse + WHERE id = #{id} + + + + UPDATE inv_warehouse + + pid=#{pid}, + name=#{name}, + code=#{code}, + advanceType=#{advanceType}, + isDefault=#{isDefault}, + status=#{status}, + updateTime=#{updateTime}, + remark=#{remark}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateRelevanceDao.xml index 328f45e..4caff6c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateRelevanceDao.xml @@ -4,11 +4,35 @@ + + + SELECT customerId FROM system_pdf_template_relevance - where template_id = #{templateId} + where templateId = #{templateId} INSERT INTO system_pdf_template_relevance - (template_id, customerId) + (templateId, customerId) VALUES - - (#{item.template_id}, #{item.customerId}) + + (#{item.templateId}, #{item.customerId}) - INSERT INTO system_pdf_template_relevance - (template_id,customerId,admin_id) - values - ( - #{template_id}, - #{customerId}, - #{admin_id} + insert + ignore + INTO system_pdf_template_relevance + (templateId, customerId, adminId, moduleId, localAction) + values ( + #{templateId}, + #{customerId}, + #{adminId}, + #{moduleId}, + #{localAction} ) - - - delete from system_pdf_template_relevance where customerId = #{customerId} + + UPDATE system_pdf_template_relevance + + templateId = #{templateId}, + customerId = #{customerId}, + adminId = #{adminId}, + moduleId = #{moduleId}, + localAction=#{localAction}, + + WHERE id = #{id} + + + delete + from system_pdf_template_relevance + where id = #{id} \ No newline at end of file