From a536ee0b227f2e9d7ec00eba6b0b0ba2fb8ecad8 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Mon, 13 Mar 2023 08:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=94=B9=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=94=80=E5=94=AE=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ContractFileServiceImpl.java            | 6 +++---
 .../jnpf/poundlist/controller/PoundlistController.java   | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
index 7fe3a285..bb4dbcbe 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
@@ -413,11 +413,11 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                     if (model.getStatus().equals("合同进行中")) {
                         model.setStatus("1");
                     } else if (model.getStatus().equals("合同审批中")) {
-                        model.setStatus("2");
+                        model.setStatus("1");
                     } else if (model.getStatus().equals("合同审批结束")) {
-                        model.setStatus("3");
+                        model.setStatus("1");
                     }else if (model.getStatus().equals("合同待审批")) {
-                        model.setStatus("0");
+                        model.setStatus("1");
                     }
                 }
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
index 3e3c095f..95ff0eec 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
@@ -107,6 +107,12 @@ public class PoundlistController {
                 list.add(poundlistEntity);
             }
         }
+        for (PoundlistEntity list1: list){
+            String sts = list1.getPurchaseStatus();
+            if (sts.equals("0")||sts.equals("1")||sts.equals("99")){
+                return ActionResult.fail("当前状态不能生成销售订单");
+            }
+        }
         if (list.size() > 0) {
             long count = list.stream().map(PoundlistEntity::getSalesId).distinct().count();
             if (count != 1) {
@@ -114,7 +120,8 @@ public class PoundlistController {
             }else{
                 return ActionResult.success(list);
             }
-        }else{
+        }
+        else {
             return ActionResult.fail("当前状态不能生成销售订单");
         }
     }