From bfb9746a97026b4f499acc49332da8fd4f61825f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 11 Jul 2023 10:40:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=91=E7=A5=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderController.java | 5 +++++ .../inout/IoOrderInvoiceController.java | 17 +++++++++++++++++ .../inout/impl/IoOrderInvoiceService.java | 3 +++ 3 files changed, 25 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 9d7d475b..dec6b676 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -43,6 +43,7 @@ import com.glxp.api.util.OrderNoTypeBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; @@ -798,6 +799,10 @@ public class IoOrderController extends BaseController { List ioOrderInvoiceEntity = orderInvoiceService.list(ew); List orderIds = ioOrderInvoiceEntity.stream().map(IoOrderInvoiceEntity::getOrderIdFk).collect(Collectors.toList()); filterOrderRequest.setOrderIds(orderIds); + if(CollectionUtils.isEmpty(orderIds)){ + PageInfo pageInfo = new PageInfo<>(); + return ResultVOUtils.page(pageInfo); + } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index 421176df..ca27b726 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -27,6 +27,7 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -193,4 +194,20 @@ public class IoOrderInvoiceController { else return ResultVOUtils.error(500, "删除失败！"); } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/inout/invoice/checkInvoiceCode") + public BaseResponse checkInvoiceCode(@RequestBody DeleteRequest deleteRequest) { + if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode())) + return ResultVOUtils.error(500, "发票编码不能为空"); + + List ioOrderInvoiceEntityList = ioOrderInvoiceService.list(new QueryWrapper().eq("invoiceEncode", deleteRequest.getInvoiceEncode())); + if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList) && ioOrderInvoiceEntityList.size()>0){ + return ResultVOUtils.error(999,"发票编码已存在！"); + } + return ResultVOUtils.success(); + + } + + } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java index 1f0cbcd5..d8e66fec 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java @@ -87,6 +87,9 @@ public class IoOrderInvoiceService extends ServiceImpl Date: Tue, 11 Jul 2023 14:30:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index eababa0a..b969f311 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -411,7 +411,8 @@ auth_warehouse.name, auth_warehouse.parentId, auth_warehouse.parentCode, - auth_dept.name warehouseName, + auth_dept.name deptName, + auth_dept.code deptCode, auth_warehouse.advanceType from auth_warehouse inner join auth_dept on auth_warehouse.parentId = auth_dept.code From 5e9d0922640b0eae1a708e88ea32885d76f29247 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 11 Jul 2023 15:08:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9ms=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/auth/LoginController.java | 5 ++--- .../glxp/api/entity/basic/BasicBussinessTypeEntity.java | 2 +- .../mybatis/mapper/auth/WarehouseBussinessTypeDao.xml | 9 +++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index e10cf8c1..5ed72907 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -318,7 +318,6 @@ public class LoginController extends BaseController { } - @Autowired private InvWarehouseDao invWarehouseDao; @@ -369,7 +368,7 @@ public class LoginController extends BaseController { @GetMapping("/spms/inv/warehouse/filterInv/forUdims") public BaseResponse forUdims() { - FilterInvWarehouseRequest filterInvWarehouseRequest=new FilterInvWarehouseRequest(); + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); filterInvWarehouseRequest.setSpUse(true); List data = deptService.filterInvDept(filterInvWarehouseRequest); return ResultVOUtils.success(data); @@ -407,8 +406,8 @@ public class LoginController extends BaseController { } - //------------------------------------------UDIMS接口----------------------------------------------------------- + /** * 平台验证 * diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index b4d1ccb3..5a595853 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -304,7 +304,7 @@ public class BasicBussinessTypeEntity { private boolean changeEnable; /** - * 是否供应商使用 + * 是否供应商使用 0:无权限；1：可查看；2：可修改 */ @TableField(value = "spUse") private int spUse; diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml index 37c557c3..15220eab 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml @@ -165,7 +165,11 @@ basic_bussiness_type.name from auth_warehouse_bustype inner join basic_bussiness_type on auth_warehouse_bustype.action = basic_bussiness_type.action - where code = #{code} + where spUse = 2 + and mainAction = 'WareHouseIn' + and enable = true + and corpType = 2 + and code = #{code} @@ -189,7 +193,8 @@ b1.`name` FROM auth_warehouse_bustype a1 INNER JOIN basic_bussiness_type b1 ON a1.action = b1.action - where b1.spUse=1 and a1.code = #{code} + where b1.spUse = 1 + and a1.code = #{code} group by b1.id From 013a9a3178c3ee4c45c8675ec0906b84fe3af79d Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Tue, 11 Jul 2023 15:46:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inout/IoOrderUtilsService.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java index 5fd24c54..a9886529 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -70,11 +70,11 @@ public class IoOrderUtilsService { //扫码明细表生成 FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest(); List ioCodeTempEntities = new ArrayList<>(); - for (IoCodeEntity ioCodeTempEntity : ioCodeEntityList) { + for (IoCodeEntity ioCodeEntity : ioCodeEntityList) { IoCodeTempEntity ioCodeTempEntity1 = new IoCodeTempEntity(); //查询物资信息 filterCompanyProductRelevanceRequest.setCustomerId(Long.valueOf(platformLinkRespons.getCustomerId())); - filterCompanyProductRelevanceRequest.setNameCode(ioCodeTempEntity.getNameCode()); + filterCompanyProductRelevanceRequest.setNameCode(ioCodeEntity.getNameCode()); List udiRlSupEntityList = udiRlSupDao.filterCompanyProduct(filterCompanyProductRelevanceRequest); if (CollectionUtil.isNotEmpty(udiRlSupEntityList) && udiRlSupEntityList.size() > 1) { ioCodeTempEntity1.setRelId(null); @@ -82,23 +82,23 @@ public class IoOrderUtilsService { } else { if (CollectionUtil.isNotEmpty(udiRlSupEntityList)) { ioCodeTempEntity1.setRelId(udiRlSupEntityList.get(0).getId()); - map.put(ioCodeTempEntity.getRelId(), udiRlSupEntityList.get(0)); + map.put(ioCodeEntity.getRelId(), udiRlSupEntityList.get(0)); } ioCodeTempEntity1.setOrderId(billNO); - String code = URLDecoder.decode(ioCodeTempEntity.getCode(), StandardCharsets.UTF_8); + String code = URLDecoder.decode(ioCodeEntity.getCode(), StandardCharsets.UTF_8); ioCodeTempEntity1.setCode(code); - ioCodeTempEntity1.setMainAction(ioCodeTempEntity.getMainAction()); + ioCodeTempEntity1.setMainAction(ioCodeEntity.getMainAction()); ioCodeTempEntity1.setAction(platformLinkRespons.getTargetAction()); - ioCodeTempEntity1.setNameCode(ioCodeTempEntity.getNameCode()); - ioCodeTempEntity1.setBatchNo(ioCodeTempEntity.getBatchNo()); - ioCodeTempEntity1.setProduceDate(ioCodeTempEntity.getProduceDate()); - ioCodeTempEntity1.setExpireDate(ioCodeTempEntity.getExpireDate()); - ioCodeTempEntity1.setSerialNo(ioCodeTempEntity.getSerialNo()); - ioCodeTempEntity1.setPackageLevel(ioCodeTempEntity.getPackageLevel()); - ioCodeTempEntity1.setSupId(ioCodeTempEntity.getSupId()); - ioCodeTempEntity1.setCount(ioCodeTempEntity.getCount()); - ioCodeTempEntity1.setReCount(ioCodeTempEntity.getReCount()); + ioCodeTempEntity1.setNameCode(ioCodeEntity.getNameCode()); + ioCodeTempEntity1.setBatchNo(ioCodeEntity.getBatchNo()); + ioCodeTempEntity1.setProduceDate(ioCodeEntity.getProduceDate()); + ioCodeTempEntity1.setExpireDate(ioCodeEntity.getExpireDate()); + ioCodeTempEntity1.setSerialNo(ioCodeEntity.getSerialNo()); + ioCodeTempEntity1.setPackageLevel(ioCodeEntity.getPackageLevel()); + ioCodeTempEntity1.setSupId(ioCodeEntity.getSupId()); + ioCodeTempEntity1.setCount(ioCodeEntity.getCount()); + ioCodeTempEntity1.setReCount(ioCodeEntity.getReCount()); ioCodeTempEntity1.setDeptCode(platformLinkRespons.getInvCode()); ioCodeTempEntity1.setInvCode(platformLinkRespons.getInvSubCode()); ioCodeTempEntity1.setUpdateTime(new Date());