From 9fb1f7472c6357b5d6236c9b70b7f08cb343a3f4 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Tue, 7 Jun 2022 08:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/ProduceshiftorderServiceImpl.java  | 8 ++++----
 .../service/impl/ProduceshiftorderdetailServiceImpl.java  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
index 9b9bd04..d0e0e5a 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
@@ -63,13 +63,13 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
     }
 
     public synchronized void reload() {
-        this.order = this.queryAllOrder("(order_status !='07' or order_status !='08' ) and is_deleted =0");
+        this.order = this.queryAllOrder("(order_status !='07' and order_status !='08' and order_status !='09') and is_deleted =0");
     }
 
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder");
-        String where = "1=1 and is_deleted= '0' and (order_status !='07' or order_status !='08' or order_status !='09' )";
+        String where = "1=1 and is_deleted= '0' and (order_status !='07' and order_status !='08' and order_status !='09' )";
         ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where, "order_id desc");
         final JSONObject json = rb.pageResult();
         JSONArray newja = new JSONArray();
@@ -460,12 +460,12 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
     public void cancel(String id) {
         ProduceshiftorderDto entity = this.findById(id);
         if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
-        entity.setIs_deleted("1");
+        entity.setOrder_status("09");
         WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder");
         JSONObject json= (JSONObject) JSONObject.toJSON(entity);
         wo.update(json);
         HashMap<String, String> map = new HashMap<>();
-        map.put("order_status","09");
+        map.put("order_detail_status","07");
         WQLObject.getWQLObject("acs_produceshiftorderdetail").update(map,"order_id = '"+ id + "'");
 
     }
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java
index 639c33b..d0db619 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java
@@ -206,7 +206,7 @@ public class ProduceshiftorderdetailServiceImpl implements Produceshiftorderdeta
     }
 
     public synchronized void reload() {
-        this.detail = this.queryAllOrderDteail(" (order_detail_status != '04' or order_detail_status != '05') and is_deleted =0");
+        this.detail = this.queryAllOrderDteail(" (order_detail_status != '05' and order_detail_status != '06' and order_detail_status != '07') and is_deleted =0");
     }
 
     @Override