From b78f7d9b87ec8d2247852cb8083dcec94e6a3d37 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 19 Apr 2023 20:57:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/auth/AuthAdminController.java | 2 +- .../glxp/api/controller/basic/UdiRlSupController.java | 4 +++- .../api/controller/inv/InvPreinOrderController.java | 6 ++++++ .../com/glxp/api/entity/inout/IoCodeLostEntity.java | 3 ++- .../glxp/api/req/inv/FilterInvPreinDetailRequest.java | 1 + .../com/glxp/api/service/auth/AuthRoleService.java | 4 ++++ .../api/service/auth/impl/AuthRoleServiceImpl.java | 10 ++++++++++ .../api/service/inout/impl/IoCodeLostServiceImpl.java | 9 +++++++++ src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml | 2 +- .../resources/mybatis/mapper/inv/InvPreinDetailDao.xml | 3 +++ 10 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java b/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java index 63924439..af4be2a2 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java @@ -174,7 +174,7 @@ public class AuthAdminController { public BaseResponse customerRolesList(@RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "limit", defaultValue = "100") Integer limit) { - List authRoleList = authRoleService.listCustomerRoles(page, limit, 1); + List authRoleList = authRoleService.getlistCustomerRoles(page, limit, 1); // List authRoleList = authRoleService.listAuthRoles2(page, limit); PageInfo pageInfo = new PageInfo<>(authRoleList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index d87b6c43..9e17c743 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -212,11 +212,13 @@ public class UdiRlSupController extends BaseController { @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { CompanyEntity companyEntity = companyService.findCompany(udiInfoExportRequest.getCustomerId() + ""); - if (companyEntity.getUnitIdFk().equals("110")) { + if(companyEntity != null){ + if("110".equals(companyEntity.getUnitIdFk())) { udiInfoExportRequest.setUnitFk(null); } else { udiInfoExportRequest.setUnitFk(companyEntity.getUnitIdFk()); } + } //查询本企业有没有选择该产品有选择不能选择 CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId() + ""); diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java index 77e0e270..28f9454e 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java @@ -8,6 +8,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inv.InvPreinDetailEntity; @@ -18,6 +19,7 @@ import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.inv.InvPreinDetailResponse; import com.glxp.api.res.inv.InvPreinOrderResponse; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inv.InvPreProductDetailService; import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinOrderService; @@ -42,6 +44,8 @@ public class InvPreinOrderController extends BaseController { @Resource InvPreinDetailService invPreinDetailService; + @Resource + CustomerService customerService; @GetMapping("/udiwms/inv/prein/filter") public BaseResponse filterOrder(FilterInvPreinRequest filterInvPreinRequest) { @@ -57,6 +61,8 @@ public class InvPreinOrderController extends BaseController { @GetMapping("/udiwms/inv/prein/detail") public BaseResponse filterDetail(FilterInvPreinDetailRequest filterInvPreinDetailRequest) { + AuthAdmin authAdmin = customerService.getUserBean(); + filterInvPreinDetailRequest.setErpId(authAdmin.getCustomerId()); List list = invPreinDetailService.filterList(filterInvPreinDetailRequest); PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java index e00c201b..13a28793 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; /** @@ -14,7 +15,7 @@ import lombok.Data; */ @Data @TableName(value = "io_code_lost") -public class IoCodeLostEntity { +public class IoCodeLostEntity extends ListPageRequest { @TableId(value = "id", type = IdType.AUTO) private Integer id; diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreinDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreinDetailRequest.java index c0779276..bb23a26f 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvPreinDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreinDetailRequest.java @@ -23,4 +23,5 @@ public class FilterInvPreinDetailRequest extends ListPageRequest { private String nameCode; private String ylqxzcrbarmc; private Integer status; + private String erpId; } diff --git a/src/main/java/com/glxp/api/service/auth/AuthRoleService.java b/src/main/java/com/glxp/api/service/auth/AuthRoleService.java index 10db6347..ec122a7f 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthRoleService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthRoleService.java @@ -21,6 +21,10 @@ public interface AuthRoleService { List listCustomerRoles(Integer page, Integer limit, Integer isCustomer); + List getlistCustomerRoles(Integer page, Integer limit, Integer isCustomer); + + + List listAuthRoles2(Integer page, Integer limit); boolean deleteById(Long id); diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java index 251b0fb4..5fb2a185 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java @@ -103,6 +103,16 @@ public class AuthRoleServiceImpl implements AuthRoleService { return list; } + @Override + public List getlistCustomerRoles(Integer page, Integer limit, Integer isCustomer) { + page = page != null && page > 0 ? page : 1; + limit = limit != null && limit > 0 && limit < 100 ? limit : 100; + int offset = (page - 1) * limit; + PageHelper.offsetPage(offset, limit); + List list = authRoleDao.getCustomerRoles(isCustomer); + return list; + } + @Override public List listAuthRoles2(Integer page, Integer limit) { page = page != null && page > 0 ? page : 1; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java index 507a42c9..8807ba0f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.inout.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.glxp.api.res.inout.IoCodeLostResponse; import org.springframework.stereotype.Service; @@ -12,6 +13,7 @@ import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.service.inout.IoCodeLostService; import org.springframework.transaction.annotation.Transactional; +import java.util.Collections; import java.util.List; @Service @@ -24,6 +26,13 @@ public class IoCodeLostServiceImpl extends ServiceImpl selectLost(IoCodeLostEntity ioCodeLostEntity) { + if (ioCodeLostEntity == null) { + return Collections.emptyList(); + } + if (ioCodeLostEntity.getPage() != null) { + int offset = (ioCodeLostEntity.getPage() - 1) * ioCodeLostEntity.getLimit(); + PageHelper.offsetPage(offset, ioCodeLostEntity.getLimit()); + } return codeLostEntityMapper.selectLost(ioCodeLostEntity); } diff --git a/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml b/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml index e4231c56..7ac87159 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml @@ -48,7 +48,7 @@ resultType="com.glxp.api.entity.auth.AuthRole"> SELECT role_id, role_name FROM auth_role - where `isCustomer` = #{isCustomer} and status =1 + where `isCustomer` = #{isCustomer} and status =0 diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinDetailDao.xml index 0db3ad04..70c126a7 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreinDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreinDetailDao.xml @@ -53,6 +53,9 @@ AND bp.zczbhhzbapzbh = #{zczbhhzbapzbh} + + AND bc.erpId = #{erpId} + AND date_format(inv_prein_order.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d') From 18978adb950a31d32d1cc6eb96cc078b107e64ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 19 Apr 2023 22:51:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 2 +- .../controller/inv/InnerOrderController.java | 33 ++++++++++++++++++- .../inv/InvInnerOrderPrintController.java | 15 +++++++++ .../glxp/api/entity/inout/IoOrderEntity.java | 4 +-- .../api/req/inv/InnerOrderDetailRequest.java | 1 + 5 files changed, 51 insertions(+), 4 deletions(-) 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 97e1f15f..6f013bfb 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -415,7 +415,7 @@ public class IoOrderController extends BaseController { } else if (stockOrderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { //1.校验是否为委托验收人 - if (!stockOrderEntity.isEntrustEnd()) { + if (!stockOrderEntity.getEntrustEnd()==true) { BasicEntrustRecRequest basicEntrustRecRequest = new BasicEntrustRecRequest(); basicEntrustRecRequest.setAction(stockOrderEntity.getAction()); basicEntrustRecRequest.setEntrustUser(userId); diff --git a/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java b/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java index 95191d6a..5365dbb4 100644 --- a/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java @@ -11,12 +11,15 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.entity.inv.InnerOrderDetailEntity; import com.glxp.api.entity.inv.InnerOrderEntity; +import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inv.InnerOrderDetailRequest; import com.glxp.api.req.inv.InnerOrderRequest; import com.glxp.api.req.inv.PostInnerOrderRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inv.innerOrderDetailResponse; import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inv.InnerOrderDetailService; import com.glxp.api.service.inv.InnerOrderService; import com.glxp.api.util.GennerOrderUtils; @@ -52,6 +55,8 @@ public class InnerOrderController { CustomerService customerService; @Resource GennerOrderUtils gennerOrderUtils; + @Resource + IoOrderDetailBizService ioOrderDetailBizService; /** * 新增内部码打印单 @@ -77,7 +82,7 @@ public class InnerOrderController { } else { innerOrderService.update(innerOrderEntity); } - return ResultVOUtils.success(innerOrderEntity.getId()); + return ResultVOUtils.success(innerOrderEntity); } @@ -171,6 +176,32 @@ public class InnerOrderController { return ResultVOUtils.success(""); } + /** + * 新增内部码打印单 + */ + @RepeatSubmit() + @PostMapping("/orderDetailAdd") + @Log(title = "内部码", businessType = BusinessType.INSERT) + public BaseResponse orderDetailAdd(@RequestBody InnerOrderDetailRequest innerOrderDetailRequest) { + InnerOrderDetailEntity innerOrderDetailEntity=new InnerOrderDetailEntity(); + + //查询业务单 + FilterOrderDetailBizRequest filterOrderDetailBizRequest=new FilterOrderDetailBizRequest(); + filterOrderDetailBizRequest.setOrderIdFk(innerOrderDetailRequest.getBillNo()); + List ioOrderDetailBizResponseList = ioOrderDetailBizService.filterList(filterOrderDetailBizRequest); + for (IoOrderDetailBizResponse ioOrderDetailBizResponse : ioOrderDetailBizResponseList) { + innerOrderDetailEntity.setOrderIdFk(innerOrderDetailRequest.getOrderIdFk()); + innerOrderDetailEntity.setProductId(ioOrderDetailBizResponse.getBindRlFk()+""); + innerOrderDetailEntity.setProductName(ioOrderDetailBizResponse.getCoName()); + innerOrderDetailEntity.setProductDate(ioOrderDetailBizResponse.getProductDate()); + innerOrderDetailEntity.setExpireDate(ioOrderDetailBizResponse.getExpireDate()); + innerOrderDetailEntity.setBatchNo(ioOrderDetailBizResponse.getBatchNo()); + innerOrderDetailEntity.setCount(ioOrderDetailBizResponse.getCount()); + innerOrderDetailService.insert(innerOrderDetailEntity); + } + return ResultVOUtils.success(""); + } + /** * 修改内部码打印单 */ diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index cb1252cd..49a2cc13 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -8,6 +8,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.entity.inv.InnerOrderEntity; import com.glxp.api.entity.inv.InvInnerOrderPrintEntity; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; @@ -18,6 +19,7 @@ import com.glxp.api.req.inv.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inv.InnerOrderPrintResponse; import com.glxp.api.service.inout.IoOrderService; +import com.glxp.api.service.inv.InnerOrderService; import com.glxp.api.service.inv.InvInnerOrderPdfTempService; import com.glxp.api.service.inv.InvInnerOrderPrintService; import com.glxp.api.service.inv.JaspaperService; @@ -58,6 +60,8 @@ public class InvInnerOrderPrintController { private InvInnerOrderPdfTempService innerOrderPdfTempService; @Resource private IoOrderService ioOrderService; + @Resource + private InnerOrderService innerOrderService; @GetMapping("/udiwms/innerOrderPrint/filter") @@ -194,6 +198,17 @@ public class InvInnerOrderPrintController { //查询订单id InvInnerOrderPrintEntity innerOrderPrintEntity=invInnerOrderPrintService.selectById(orderId); + + //更新内部码状态 + + InnerOrderEntity innerOrderEntity=innerOrderService.findByRecordKey(innerOrderPrintEntity.getOrderIdFk()); + if(innerOrderEntity!=null){ + innerOrderEntity.setGenStatus(2); + innerOrderEntity.setId(innerOrderEntity.getId()); + innerOrderService.update(innerOrderEntity); + } + + IoOrderEntity ioOrderEntity=new IoOrderEntity(); ioOrderEntity.setInCodeStatus(1); ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk()); diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index e92852e7..5c733377 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -194,7 +194,7 @@ public class IoOrderEntity { private String preInBillNo; @TableField(value = "entrustEnd") - private boolean entrustEnd; + private Boolean entrustEnd; /** @@ -231,7 +231,7 @@ public class IoOrderEntity { @TableField(value = "processStatus") private Integer processStatus; //退货单据处理状态 @TableField(value = "inCodeStatus") - private int inCodeStatus; //内部码生成状态 + private Integer inCodeStatus; //内部码生成状态 @TableField(value = "relKey") private String relKey; //关联单据唯一键 diff --git a/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java index 03092dbe..bc8197b4 100644 --- a/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java @@ -8,5 +8,6 @@ public class InnerOrderDetailRequest extends ListPageRequest { private String orderIdFk; private String productId; + private String billNo; }