From 608fa275864c7cb4353e5e030e4a1304e56529ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 九月 2023 13:12:05 +0800
Subject: [PATCH] 修改4.0   9.20

---
 production-server/src/main/java/com/yuanchu/mom/service/ManufactureOrderService.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/production-server/src/main/java/com/yuanchu/mom/service/ManufactureOrderService.java b/production-server/src/main/java/com/yuanchu/mom/service/ManufactureOrderService.java
index 7207ffa..d8ccf01 100644
--- a/production-server/src/main/java/com/yuanchu/mom/service/ManufactureOrderService.java
+++ b/production-server/src/main/java/com/yuanchu/mom/service/ManufactureOrderService.java
@@ -4,7 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yuanchu.mom.pojo.ManufactureOrder;
-import com.yuanchu.mom.pojo.dto.ManufactureOrderDto;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -30,15 +30,36 @@
 
     /**
      * 鏌ョ湅鎺掍骇璇︽儏
-     * @param manOrdId
+     * @param schedulingId
      * @return
      */
-    ManufactureOrderDto sePros(Integer manOrdId);
+    Map<String, Object> sePros(Integer schedulingId);
 
     /**
      * 涓嬭揪
+     * @param manufactureOrderId 璁㈠崟Id
+     * @param schedulingId 鎺掍骇Id
+     */
+    void down(Integer manufactureOrderId, Integer schedulingId);
+
+    /**
+     * 鎵归噺鍒犻櫎
      * @param manOrdId
      */
-    void down(Integer manOrdId);
+    @Transactional(rollbackFor = Exception.class)
+    void deleteManufacture(List<String> manOrdId);
+
+    /**
+     * 鐢熶骇璁″垝浜岀骇鏍�
+     * @return
+     */
+    List<Map<String, Object>> towTree();
+
+    /**
+     * 鍒ゆ柇杈撳叆鏁伴噺鏄惁瓒呭嚭
+     * @param manOrdId 璁㈠崟Id
+     * @param schedulingNumber 鐢ㄦ埛杈撳叆鏁伴噺
+     */
+    Integer checkScheduled(Integer manOrdId, Integer schedulingNumber);
 }
 

--
Gitblit v1.9.3