From e4fe69941b2dd4582ec0bd82c32b8dfbc30d85b5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 二月 2024 08:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java
index 83f19f6..61e9137 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/WorkOrderMapper.java
@@ -2,6 +2,7 @@
import com.example.erp.entity.sd.Product;
import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -10,7 +11,20 @@
@Mapper
public interface WorkOrderMapper {
- List<OrderGlassDetail> selectWordOrder(Date selectTime1, Date selectTime2, Integer state,OrderGlassDetail orderGlassDetail);
+ List<OrderGlassDetail> selectWordOrder(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
- // Integer getPageTotal(Integer offset, Integer pageSize, String glassTypeId, Product product);
+ List<OrderGlassDetail> selectWordOrderNo(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
+ List<OrderDetail> addWordOrder(String orderId, OrderDetail orderDetail);
+
+
+ Boolean AddOrderWorkMp(String productIdVl,
+ @Param("orderId") String orderId,
+ @Param("productId") Integer productId,
+ @Param("productName") String productName,
+ String userName);
+
+ Integer SelectOrderNumber(String productIdVl);
+
+
+ Boolean DeleteOrderWorkMp(String orderId, String productName);
}
--
Gitblit v1.8.0