Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-12-10 1750abd11320f8d09ffe1580b7467dba87c86c89

 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,6 +62,9 @@
                                           @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);


@@ -80,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);

@@ -92,5 +101,12 @@

    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);

}