From c4349f44a9f6a824965a68b4966ef387cfbc5564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 15 Aug 2024 22:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=201=E3=80=81=E3=80=90=E7=89=A9=E6=96=99=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E3=80=91=E7=94=B3=E8=AF=B7=E9=83=A8=E9=97=A8=E6=98=AF=E8=90=A5?=
 =?UTF-8?q?=E9=94=80=E4=B8=AD=E5=BF=83=EF=BC=8C11,21=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=EF=BC=8C=E7=94=B1=E5=86=BB=E7=BB=93=E6=94=B9=E6=88=90=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E7=8A=B6=E6=80=81=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E6=BF=80=E6=B4=BB=202=E3=80=81=E3=80=90?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=94=B3=E8=AF=B7=E3=80=91=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?61=E5=A4=A7=E7=B1=BB=E7=89=A9=E6=96=99=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/material/MaterialMainExcelApi.java   |  2 ++
 .../service/MaterialUpdateBillService.java    | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainExcelApi.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainExcelApi.java
index 7382d4f8..cda8cc98 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainExcelApi.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainExcelApi.java
@@ -59,6 +59,8 @@ public class MaterialMainExcelApi extends BaseApi {
         EecExcelUtil.setResponseExcelHeader(response, categoryCode);
         if (categoryCode.startsWith("30")) {
             throw new NflgBusinessException(STATE.ParamErr, "整机物料不可批量导入");
+        } else if (categoryCode.startsWith("60")) {
+            throw new NflgBusinessException(STATE.ParamErr, "服务物料不可批量导入");
         }
         if (categoryCode.startsWith("20") || categoryCode.startsWith("22")) {
             new Workbook("物料导入", "").addSheet(new ListSheet<>(categoryCode, ImmutableList.of(new MaterialSelfExcelDTO()))).writeTo(response.getOutputStream());
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java
index f5790539..26565695 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java
@@ -474,6 +474,7 @@ public class MaterialUpdateBillService extends ServiceImpl<MaterialUpdateBillMap
                     notFreezeSet.add(data.getMaterialNo());
                 }
             }
+            this.validateFreezeStateChangeOther(ents, deptEnt.getDptCode());
             this.saveBatch(ents);
             //同步OA
             materialUpdateToOAService.sysncToOaOnleState(ents);
@@ -642,6 +643,7 @@ public class MaterialUpdateBillService extends ServiceImpl<MaterialUpdateBillMap
                     return ResultVO.error(checkMaterialDesc.getMsg());
                 }
             }
+            this.validateFreezeStateChangeOther(ents, deptEnt.getDptCode());
             this.saveBatch(ents);
             //同步OA
             materialUpdateToOAService.sysnToOa(ents);
@@ -649,6 +651,23 @@ public class MaterialUpdateBillService extends ServiceImpl<MaterialUpdateBillMap
         return ResultVO.success(Boolean.TRUE);
     }
 
+    // 申请部门是 营销中心，11,21变更，由冻结改成其他状态，不允许改成激活
+    private void validateFreezeStateChangeOther(List<MaterialUpdateBillEntity> updateList, String applyDeptCode) {
+        if (CollectionUtil.isEmpty(updateList)) {
+            return;
+        }
+        if (!applyDeptCode.contains("营销中心")) {
+            return;
+        }
+        List<MaterialUpdateBillEntity> filterList = updateList.stream().filter(update -> (update.getOldCategoryCode().startsWith("10") || update.getOldCategoryCode().startsWith("20"))
+            && update.getOldMaterialState().equals(MaterialStateEnum.FROZEN.getValue())
+            && (ObjectUtil.isNotEmpty(update.getNewMaterialState()) && update.getNewMaterialState().equals(MaterialStateEnum.ACTIVATE.getValue()))).collect(Collectors.toList());
+        if (CollectionUtil.isNotEmpty(filterList)) {
+            List<String> materialNos = filterList.stream().map(MaterialUpdateBillEntity::getMaterialNo).collect(Collectors.toList());
+            throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", materialNos).concat("物料解冻时，禁止改成激活"));
+        }
+    }
+
     /**
      * 获取物料分类tree
      *