From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
production-server/src/main/java/com/yuanchu/mom/mapper/ManufactureOrderMapper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/production-server/src/main/java/com/yuanchu/mom/mapper/ManufactureOrderMapper.java b/production-server/src/main/java/com/yuanchu/mom/mapper/ManufactureOrderMapper.java
index 701d27b..d87eaed 100644
--- a/production-server/src/main/java/com/yuanchu/mom/mapper/ManufactureOrderMapper.java
+++ b/production-server/src/main/java/com/yuanchu/mom/mapper/ManufactureOrderMapper.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.ManufactureOrder;
-import com.yuanchu.mom.pojo.dto.ManufactureOrderDto;
import java.util.List;
import java.util.Map;
@@ -20,8 +19,10 @@
//鏌ヨ鐢熶骇璁㈠崟鍒楄〃
IPage<Map<String, Object>> selectAllManord(Page<Object> page, String downTime, String delTime, String customerCode, Integer type);
+ void deleteManufacture(List<String> manOrdId);
- //鏌ョ湅鐢熶骇璁″垝
- List<Map<String, Object>> selectAllPlan(Integer deviceId, String orderCode, String name, String startTime, String endTime);
+ List<Map<String, Object>> towTree();
+
+ void updateManufacture(Integer manufactureOrderId, Integer schedulingNumber);
}
--
Gitblit v1.9.3