From 38077dffe413187eac24e4a525bd08d9c5e385da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 11 Oct 2021 00:11:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=98=E7=82=B9=E5=A4=8D?=
 =?UTF-8?q?=E7=9B=98=E7=9A=84=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/constants/BusinessConstants.java  | 6 ++++--
 .../com/jsh/erp/service/depotHead/DepotHeadService.java     | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/jshERP-boot/src/main/java/com/jsh/erp/constants/BusinessConstants.java
index a0b1a759..c092a453 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/constants/BusinessConstants.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/constants/BusinessConstants.java
@@ -34,11 +34,12 @@ public class BusinessConstants {
      */
     public static final Integer DEFAULT_PAGINATION_PAGE_SIZE = 10;
     /**
-     * 单据主表出入库类型 type 入库 出库
+     * 单据主表出入库类型 type 入库 出库 其它
      * depothead
      * */
     public static final String DEPOTHEAD_TYPE_IN = "入库";
     public static final String DEPOTHEAD_TYPE_OUT = "出库";
+    public static final String DEPOTHEAD_TYPE_OTHER = "其它";
     /**
      * 付款类型 payType //现付/预付款
      * */
@@ -68,7 +69,7 @@ public class BusinessConstants {
     public static final String BILLS_STATUS_SKIPING = "3";
     /**
      * 出入库分类
-     *采购、采购退货、其它、零售、销售、调拨等
+     *采购、采购退货、其它、零售、销售、调拨、盘点复盘等
      * */
     public static final String SUB_TYPE_PURCHASE_ORDER = "采购订单";
     public static final String SUB_TYPE_PURCHASE = "采购";
@@ -79,6 +80,7 @@ public class BusinessConstants {
     public static final String SUB_TYPE_SALES = "销售";
     public static final String SUB_TYPE_SALES_RETURN = "销售退货";
     public static final String SUB_TYPE_TRANSFER = "调拨";
+    public static final String SUB_TYPE_REPLAY = "盘点复盘";
     /**
      * 批量插入sql时最大的数据条数
      * */
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 b5859eca..8357ecc0 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
@@ -303,12 +303,14 @@ 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.SUB_TYPE_SALES.equals(depotHead.getSubType()))
+                    || (BusinessConstants.DEPOTHEAD_TYPE_OTHER.equals(depotHead.getType()) &&
+                        BusinessConstants.SUB_TYPE_REPLAY.equals(depotHead.getSubType()))) {
                         DepotHead dh = new DepotHead();
                         dh.setStatus(BusinessConstants.BILLS_STATUS_AUDIT);
                         DepotHeadExample example = new DepotHeadExample();