From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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..01c6bd6 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,32 @@
@Mapper
public interface WorkOrderMapper {
- List<OrderGlassDetail> selectWordOrder(Date selectTime1, Date selectTime2, Integer state,OrderGlassDetail orderGlassDetail);
+ //宸ュ崟绠＄悊鏌ヨ鏈浆宸ュ崟鏁版嵁
+ List<OrderGlassDetail> selectWordOrder(String selectTime1, String selectTime2, OrderGlassDetail orderGlassDetail);
- // Integer getPageTotal(Integer offset, Integer pageSize, String glassTypeId, Product product);
+ //鏌ヨ宸茶浆宸ュ崟鏁版嵁
+ List<OrderGlassDetail> selectWordOrderNo(String selectTime1, String 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);
+
+ //鍒犻櫎宸ュ崟,灏嗗搴斾骇鍝佺敓浜ц鍗曞彿鏀逛负null
+ Boolean deleteOrderWorkMp(String orderId, String productionId);
+
+ Integer selectWorkCount(String orderId);
+
+ Boolean updateWorkType(String orderId, Integer state);
+
+ Integer selectYesWorkCount(String orderId);
+
+ Integer selectProcessCard(String orderId);
}
--
Gitblit v1.8.0