From 3500800a63ca99288e3051e7f63c673beb683c72 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 22 Feb 2023 15:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=9F=E4=BA=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=202023=E5=B9=B42=E6=9C=8822=E6=97=A5=20=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shopOrder/service/Impl/ShopOrderServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
index e45452e..024c6bf 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
@@ -188,8 +188,9 @@ public class ShopOrderServiceImpl implements ShopOrderService {
 
     @Override
     public ResponseData deleteShopOrderData(ShopOrderData inData) {
+        // 已下达或者 已计划的生产订单 都可以进行删除
         ResponseData responseData = new ResponseData();
-        if (!inData.getStatus().equals("已计划")) {
+        if (!inData.getStatus().equals("已下达") && !inData.getStatus().equals("已计划")) {
             responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200197));
             responseData.setCode("500");
             return responseData;