合同改状态生成销售加判断

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");
                     }
                 }
 

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("当前状态不能生成销售订单");
         }
     }