From b0c60452329a61c32db74a1c7d7753d383d6310a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 九月 2025 08:20:53 +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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 345e419..27454b4 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
@@ -1,21 +1,19 @@
package com.example.erp.mapper.pp;
-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;
-import java.sql.Date;
import java.util.List;
@Mapper
public interface WorkOrderMapper {
//宸ュ崟绠＄悊鏌ヨ鏈浆宸ュ崟鏁版嵁
- List<OrderGlassDetail> selectWordOrder(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
+ List<OrderGlassDetail> selectWordOrder(String selectTime1, String selectTime2, OrderGlassDetail orderGlassDetail);
//鏌ヨ宸茶浆宸ュ崟鏁版嵁
- List<OrderGlassDetail> selectWordOrderNo(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
+ List<OrderGlassDetail> selectWordOrderNo(String selectTime1, String selectTime2, OrderGlassDetail orderGlassDetail);
//鏌ヨ闇�瑕佽浆宸ュ崟鏄庣粏
List<OrderDetail> addWordOrder(String orderId, OrderDetail orderDetail);
@@ -25,7 +23,7 @@
@Param("orderId") String orderId,
@Param("productId") Integer productId,
@Param("productName") String productName,
- String userName);
+ String userName,String process);
//鏌ヨ瀵瑰簲璁㈠崟鍙疯搴�
Integer selectOrderNumber(String productIdVl);
@@ -37,4 +35,8 @@
Boolean updateWorkType(String orderId, Integer state);
Integer selectYesWorkCount(String orderId);
+
+ Integer selectProcessCard(String orderId);
+
+ Boolean updateWorkIdMp(String orderId, String userName);
}
--
Gitblit v1.8.0