From 040bc6701ce30e8f52b46993613af63b507895f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 5 Dec 2023 00:23:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E7=9A=84=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=92=8C=E6=9F=A5=E8=AF=A2=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=85=B6=E5=AE=83=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=92=8C=E5=85=B6=E5=AE=83=E5=87=BA=E5=BA=93=E7=9A=84=E5=85=B3?= =?UTF-8?q?=E8=81=94=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/service/depotHead/DepotHeadService.java | 10 ++++++---- .../jsh/erp/service/depotItem/DepotItemService.java | 13 +++++++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index f9bcc0d1..b2b959e1 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -470,14 +470,18 @@ public class DepotHeadService { depotItemMapperEx.batchDeleteDepotItemByDepotHeadIds(new Long[]{depotHead.getId()}); //删除单据主表信息 batchDeleteDepotHeadByIds(depotHead.getId().toString()); - //将关联的单据置为审核状态-针对采购入库、销售出库和盘点复盘 + //将关联的单据置为审核状态-针对采购入库、销售出库、盘点复盘、其它入库、其它出库 if(StringUtil.isNotEmpty(depotHead.getLinkNumber())){ if((BusinessConstants.DEPOTHEAD_TYPE_IN.equals(depotHead.getType()) && BusinessConstants.SUB_TYPE_PURCHASE.equals(depotHead.getSubType())) || (BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType()) && BusinessConstants.SUB_TYPE_SALES.equals(depotHead.getSubType())) || (BusinessConstants.DEPOTHEAD_TYPE_OTHER.equals(depotHead.getType()) && - BusinessConstants.SUB_TYPE_REPLAY.equals(depotHead.getSubType()))) { + BusinessConstants.SUB_TYPE_REPLAY.equals(depotHead.getSubType())) + || (BusinessConstants.DEPOTHEAD_TYPE_IN.equals(depotHead.getType()) && + BusinessConstants.SUB_TYPE_OTHER.equals(depotHead.getSubType())) + || (BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType()) && + BusinessConstants.SUB_TYPE_OTHER.equals(depotHead.getSubType()))) { String status = BusinessConstants.BILLS_STATUS_AUDIT; //查询除当前单据之外的关联单据列表 List exceptCurrentList = getListByLinkNumberExceptCurrent(depotHead.getLinkNumber(), depotHead.getNumber(), depotHead.getType()); @@ -1500,10 +1504,8 @@ public class DepotHeadService { materialParam, depotArray, offset, rows); if (null != list) { List idList = new ArrayList<>(); - List numberList = new ArrayList<>(); for (DepotHeadVo4List dh : list) { idList.add(dh.getId()); - numberList.add(dh.getNumber()); } //通过批量查询去构造map Map materialsListMap = findMaterialsListMapByHeaderIdList(idList); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 3015b9b3..bc20709c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -641,10 +641,11 @@ public class DepotItemService { //更新商品的价格 updateMaterialExtendPrice(materialExtend.getId(), depotHead.getSubType(), rowObj); } - //如果关联单据号非空则更新订单的状态,单据类型：采购入库单或销售出库单或盘点复盘单 + //如果关联单据号非空则更新订单的状态,单据类型：采购入库单、销售出库单、盘点复盘单、其它入库单、其它出库单 if(BusinessConstants.SUB_TYPE_PURCHASE.equals(depotHead.getSubType()) || BusinessConstants.SUB_TYPE_SALES.equals(depotHead.getSubType()) - || BusinessConstants.SUB_TYPE_REPLAY.equals(depotHead.getSubType())) { + || BusinessConstants.SUB_TYPE_REPLAY.equals(depotHead.getSubType()) + || BusinessConstants.SUB_TYPE_OTHER.equals(depotHead.getSubType())) { if(StringUtil.isNotEmpty(depotHead.getLinkNumber())) { //单据状态:是否全部完成 2-全部完成 3-部分完成（针对订单的分批出入库） String billStatus = getBillStatusByParam(depotHead); @@ -1037,6 +1038,14 @@ public class DepotItemService { if(BusinessConstants.SUB_TYPE_SALES_ORDER.equals(depotHead.getSubType())) { goToType = BusinessConstants.SUB_TYPE_PURCHASE_ORDER; } + } else if("other".equals(linkType)) { + //采购入库、采购退货、销售出库、销售退货都转其它入库 + if(BusinessConstants.SUB_TYPE_PURCHASE.equals(depotHead.getSubType()) + || BusinessConstants.SUB_TYPE_PURCHASE_RETURN.equals(depotHead.getSubType()) + || BusinessConstants.SUB_TYPE_SALES.equals(depotHead.getSubType()) + || BusinessConstants.SUB_TYPE_SALES_RETURN.equals(depotHead.getSubType())) { + goToType = BusinessConstants.SUB_TYPE_OTHER; + } } else { //采购订单转采购入库 if(BusinessConstants.SUB_TYPE_PURCHASE_ORDER.equals(depotHead.getSubType())) {