From b6bf5c99a551f042616c184313a9abb9cab1008a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 15:04:18 +0800
Subject: [PATCH] 导入聚乳酸明细时 牌号为161,171,181并且物资类别为改性树脂时指定主体为海正生物，生产车间为一车间
---
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index cad5da0..e63a45d 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.OrderDetlExcelVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -23,13 +24,25 @@
Integer getPakoutPageCount(Map<String, Object> map);
- int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
- int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
int addToLogTable(OrderDetl orderDetl);
- int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double workQty);
+ int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+
+ int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
+
+ Integer checkAllDetlFinish(@Param("orderNo") String orderNo);
+
+ Integer sameOrderComb(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
+
+ /**
+ * 鏌ヨ瀵煎嚭鎵�鏈夊崟鎹埌excel鎵�闇�瑕佺殑鏁版嵁
+ * @param userId 鏍规嵁鏉冮檺鍙兘鏌ヨ褰撳墠鐢ㄦ埛鍒涘缓鐨勫崟瀛�
+ */
+ List<OrderDetlExcelVo> selectExportExcelAllDataList(@Param("userId") Long userId);
}
--
Gitblit v1.9.1