From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +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/mm/FinishedOperateLogMapper.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
index 4c0babc..5081ca8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
@@ -1,25 +1,30 @@
package com.example.erp.mapper.mm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.dto.mm.FinishedOperateLogDTO;
-import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import org.springframework.data.repository.CrudRepository;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@Mapper
-public interface FinishedOperateLogMapper extends CrudRepository<FinishedOperateLog,Long> {
+public interface FinishedOperateLogMapper extends BaseMapper<FinishedOperateLog> {
FinishedOperateLog getselectFinishedOperateLog();
- Boolean insertIntFinishedOperateLog(@Param("flowCard") FlowCard flowCard ,@Param("userName") String userName,@Param("oddNumber") String oddNumber,@Param("container") String container);
+ Boolean insertIntFinishedOperateLog(@Param("flowCard") FlowCard flowCard , @Param("userName") String userName,
+ @Param("oddNumber") String oddNumber, @Param("container") String container,
+ @Param("deliveryDetailMoney") Double deliveryDetailMoney,
+ @Param("deliveryDetailArea") Double deliveryDetailArea,
+ String createTime,
+ @Param("getComputeArea") Double getComputeArea);
- Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
+ Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail, @Param("userName") String userName, @Param("oddNumber") String oddNumber, String boxNo);
Boolean insertFinishedOperateLogAllocate(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
@@ -57,12 +62,17 @@
@Param("userName") String userName,
@Param("type") String type);
+ Boolean updateFinishedOperateLogQuantity(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog
+ ,@Param("deliveryDetailMoney") Double deliveryDetailMoney,@Param("deliveryDetailArea") Double deliveryDetailArea);
+
Boolean updateFinishedOperateLogState(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog,@Param("type") String type);
List<OrderDetail> getSelectStorageRecord(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,String type,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
+ List<FinishedOperateLog> getSelectStorageRecordDeliveryId(@Param("deliveryId") String deliveryId,String type);
Map<String,Integer> getSelectStorageRecordLogPageTotal(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,String type,
@@ -78,7 +88,8 @@
List<FinishedOperateLogDTO> exportFinishedOperateLogReport(List<LocalDate> dates,String type);
- Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
+ Boolean insertOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,
+ @Param("oddNumber") String oddNumber,@Param("processId") String processId);
Boolean updateOrderFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
@@ -88,4 +99,14 @@
Map<String,Integer> getSelectStorageRecordPintPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+ List<Map<String, String>> getPrimaryListLimt(String orderId, String processId, String remarks);
+
+ List<Map<String, String>> getPrimaryListLimts(Integer customerId, String project, String remarks);
+
+ List<Map<String, Object>> getDetailList(String orderId, String processId, String remarks);
+
+ List<Map<String, Object>> getDetailLists(String orderId, String remarks, Integer productId,String thickness);
+
+ List<Map<String, Object>> getDetailList2(String orderId, String processId, String remarks);
+
}
--
Gitblit v1.8.0