From 52373a40ac0118c4fc8203d747160b3d2972a3dd Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 28 Jul 2022 18:23:20 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BussinessChangeTypeController.java | 11 +------- .../basic/BussinessLocalTypeController.java | 2 +- .../inout/OrderDetailController.java | 26 ------------------- .../controller/inout/WareHouseController.java | 3 +++ .../param/SystemPDFTemplateController.java | 2 +- .../thrsys/ThrProductsAddController.java | 2 ++ .../basic/BussinessLocalTypeService.java | 4 +++ .../impl/BussinessLocalTypeServiceImpl.java | 4 +++ .../admin/service/thrsys/ThrDataService.java | 6 ++--- .../main/resources/application-dev.properties | 2 +- .../mapper/basic/BussinessLocalTypeDao.xml | 9 ++++--- .../mybatis/mapper/basic/BussinessTypeDao.xml | 3 ++- .../mapper/param/SystemPDFModuleDao.xml | 2 +- .../mapper/param/SystemPDFTemplateDao.xml | 2 +- 14 files changed, 30 insertions(+), 48 deletions(-) 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 2323368..e46d755 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 @@ -55,15 +55,6 @@ public class BussinessChangeTypeController { if (bussinessTypeFilterRequest.getType() != null && "changeEnable".equals(bussinessTypeFilterRequest.getType()) ) { -// if (ConstantType.TYPE_PUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { -// BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity(); -// bussinessChangeTypeEntity1.setIntro("入库自动补\"寄售出库单\""); -// bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_OUT); -// bussinessChangeTypeEntity1.setIndex(1); -// bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction()); -// bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1); -// bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); -// } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity(); bussinessChangeTypeEntity1.setIntro("出库自动补\"供应商入库单\""); @@ -133,7 +124,7 @@ public class BussinessChangeTypeController { } if (bussinessTypeEntity != null) { bussinessChangeTypeService.updateBusChangeType(bussinessTypeEntity); - BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getAction()); + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(bussinessTypeEntity.getAction()); bussinessLocalTypeEntity.setUpdateTime(new Date()); bussinessLocalTypeService.updateBusLocalType(bussinessLocalTypeEntity); } else { 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 9d7fe93..bedc4d0 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 @@ -230,7 +230,7 @@ public class BussinessLocalTypeController { } if (bussinessTypeEntity != null) { bussinessTypeEntity.setAction("ST" + CustomUtil.getId()); - BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getAction()); + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(bussinessTypeEntity.getAction()); if (bussinessLocalTypeEntity != null) { ResultVOUtils.error(999, "业务类型已存在！"); } else { 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 ff9666e..3bee39a 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 @@ -585,32 +585,6 @@ public class OrderDetailController { } } -// if (!bussinessTypeEntity.getCheckEnable() -// || (orderEntity.getFromType().intValue() == ConstantStatus.FROM_CHANGE && !bussinessTypeEntity.isCheckChange())) { //不需要校验，则直接生成库存 -// orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); -// orderService.updateOrder(orderEntity); -// transInoutService.checkMutiDi(orderEntity.getId()); -// if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) { -// orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS); -// if (orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) { -// invProductsTrService.genInvProducts(orderEntity.getId()); -// } -// transInoutService.printOrder(orderEntity.getId()); -// } -// } else { -// -// List erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); -// if (erpIds != null && erpIds.size() > 0) { //已经绑定ERPID，则自动校验 -// List erpOrderEntities = thrDataService.getStockOrders(erpIds); -// checkOrderUtils.check(orderEntity.getId(), erpOrderEntities); -// } else { -// //未绑定Id,则更改状态，等待校验 -// orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); -// orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); -// orderService.updateOrder(orderEntity); -// } -// -// } return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！"); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index aea6fc3..2cc20c0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -219,6 +219,9 @@ public class WareHouseController { @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/findErrorByOrderId") public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + if (StrUtil.isEmpty(warehouseQueryRequest.getOrderId())) { + return ResultVOUtils.error(500, "单据号不能为空!"); + } List warehousetempList = codesTempService.findByOrderId(warehouseQueryRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(warehousetempList); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFTemplateController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFTemplateController.java index 2a1b4b2..d8cd640 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFTemplateController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFTemplateController.java @@ -78,7 +78,7 @@ public class SystemPDFTemplateController { } - @AuthRuleAnnotation("system/pdf/template/list") + @AuthRuleAnnotation("system/pdf/template/pdfTemplates") @GetMapping("/system/pdf/template/pdfTemplates") public BaseResponse pdfTemplates(@RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "limit", defaultValue = "100") Integer limit) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java index 0ba05eb..fe841b7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java @@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @RestController @@ -82,6 +83,7 @@ public class ThrProductsAddController { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); thrProductsAddEntity = thrProductsAddService.selectById(thrProductsAddEntity.getId() + ""); BeanUtils.copyProperties(thrProductsAddEntity, thrProductsEntity); + thrProductsEntity.setUpdateTime(new Date()); thrProductsService.insertThrProducts(thrProductsEntity); } else if (thrProductsAddEntity.getCheckStatus().equals(3)) { //不通过，删除第三方产品信息表中此产品数据 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 b7e4dbf..e0aa034 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 @@ -19,10 +19,14 @@ public interface BussinessLocalTypeService { List filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + //单独查询 BussinessLocalTypeEntity findByAction(String action); + + //关联查询 BussinessLocalTypeEntity findBTByAction(String action); + BussinessLocalTypeEntity findBTByName(String name); boolean insertBussinessType(BussinessLocalTypeEntity bussinessLocalTypeEntity); 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 8382f0f..772d9ed 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 @@ -1,6 +1,7 @@ package com.glxp.sale.admin.service.basic.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.basic.BussinessLocalTypeDao; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; @@ -78,6 +79,9 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService @Override public BussinessLocalTypeEntity findByAction(String action) { + if (StrUtil.isEmpty(action)) { + return null; + } BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); bussinessLocalTypeFilterRequest.setAction(action); List data = bussinessLocalTypeDao.filterAllList(bussinessLocalTypeFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java index 35ec969..877e8af 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java @@ -85,11 +85,12 @@ public class ThrDataService { public List getStockOrders(List billCodes) { if (billCodes != null && billCodes.size() > 0) { + List erpOrderEntities = new ArrayList<>(); for (String billCode : billCodes) { StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); stockOrderFilterRequest.setBillNo(billCode); List data = stockOrderService.findAllOrders(stockOrderFilterRequest); - List erpOrderEntities = new ArrayList<>(); + if (data != null && data.size() > 0) { for (StockOrderEntity thrOrderEntity : data) { StockOrderDetailFilterRequest filterThrOrderDetailRequest = new StockOrderDetailFilterRequest(); @@ -127,10 +128,9 @@ public class ThrDataService { } } } - return erpOrderEntities; } - + return erpOrderEntities; } return null; } diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 47695ab..533943a 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,7 +1,7 @@ # \u751F\u4EA7\u73AF\u5883 server.port=9906 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph2?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=123456 #spring.datasource.password=123456 diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index 3d89b86..fb294ed 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -21,7 +21,7 @@ AND spUse =#{spUse} - + order by basic_bustype_local.updateTime desc @@ -200,8 +201,10 @@ 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 543b87e..8144ecf 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -44,6 +44,7 @@ GROUP BY basic_bussiness_type.id + order by basic_bussiness_type.updateTime desc @@ -115,7 +116,7 @@ - order by basic_bussiness_type.`index` + diff --git a/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateDao.xml b/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateDao.xml index dbadb2e..4befcee 100644 --- a/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateDao.xml @@ -9,7 +9,7 @@ FROM system_pdf_template - AND `name` LIKE CONCAT(#{name},'%') + AND `name` LIKE CONCAT('%',#{name},'%') AND `module` = #{module}