From 1df7f305381184664b10e3fb55c5c4a579c56eaf Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 8 Nov 2022 18:24:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=97=AE=E9=A2=98,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/OrderDetailController.java | 4 +- .../inventory/InvSubWarehouseController.java | 41 ++++++++++--------- .../basic/impl/UdiRelevanceServiceImpl.java | 5 +++ 3 files changed, 29 insertions(+), 21 deletions(-) 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 bb29172..416001d 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 @@ -273,6 +273,7 @@ public class OrderDetailController { stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + ""); stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + ""); stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId()); + stockOrderDetailEntity.setRelId(udiRelevanceEntity.getId()); stockOrderDetailEntity.setSweepCount(0 + ""); stockOrderDetailEntityList.add(stockOrderDetailEntity); } @@ -337,7 +338,7 @@ public class OrderDetailController { List stockOrderDetailEntityList = new ArrayList<>(); for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk()); + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(thrOrderDetailEntity.getProductId()); if (udiRelevanceEntity == null) { return ResultVOUtils.error(500, "单据里含有未维护的产品信息，选入失败！"); @@ -348,6 +349,7 @@ public class OrderDetailController { stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + ""); stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + ""); stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId()); + stockOrderDetailEntity.setRelId(udiRelevanceEntity.getId()); stockOrderDetailEntity.setSweepCount(0 + ""); stockOrderDetailEntityList.add(stockOrderDetailEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java index a5c8d65..85bb4ed 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java @@ -71,34 +71,35 @@ public class InvSubWarehouseController { // return ResultVOUtils.error(500, "用户或仓库不能未空！"); // } - - AuthAdmin authAdmin = customerService.getUserBean(); - if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { - if (authAdmin.getCustomerId().equals("110")) - filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); - else{ - filterInvWarehouseRequest.setSpUse(true); + if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { + AuthAdmin authAdmin = customerService.getUserBean(); + if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) { + if (authAdmin.getCustomerId().equals("110")) + filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); + else { + filterInvWarehouseRequest.setSpUse(true); + } } - }else{ + } else { //走这边表示单据选择的是往来单位里面调出调入的库 //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); - if(systemParamConfigEntity.getParamValue().equals("0")){ - //不允许调拨 - // 查询总库信息 - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - //查询仓库信息 - InvWarehouseEntity invWarehouseEntity=invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); + if (systemParamConfigEntity.getParamValue().equals("0")) { + //不允许调拨 + // 查询总库信息 + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + //查询仓库信息 + InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode()); filterInvWarehouseRequest.setCode(null); - }else { - //允许调拨 + } else { + //允许调拨 //查询总库信息 - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setCode(null); + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId()); + filterInvWarehouseRequest.setCode(null); } } @@ -114,7 +115,7 @@ public class InvSubWarehouseController { // return ResultVOUtils.error(500, "用户或仓库不能未空！"); // } AuthAdmin authAdmin = customerService.getUserBean(); - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); filterInvWarehouseRequest.setSubordinateCode(invSubWarehouseEntity.getParentId()); filterInvWarehouseRequest.setCode(null); List invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSubDown(filterInvWarehouseRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java index 6027ae3..512e465 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.service.basic.impl; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.dao.basic.UdiRelevanceDao; @@ -236,6 +237,10 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { @Override public UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys) { + + if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) { + return null; + } FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); if ("thirdId".equals(thirdSys)) { filterUdiInfoRequest.setThirdId(thirdId);