From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
index 2010c30..bf1a53c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
@@ -1,20 +1,20 @@
package com.example.erp.mapper.mm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.dto.otherSystem.GlassDetailList;
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.*;
-import com.example.erp.entity.userInfo.User;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;
-import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@Mapper
-public interface FinishedGoodsInventoryMapper extends CrudRepository<FinishedGoodsInventory,Long> {
+public interface FinishedGoodsInventoryMapper extends BaseMapper<FinishedGoodsInventory> {
@@ -22,7 +22,9 @@
@Param("pageSize") Integer pageSize,
@Param("finishedGoodsInventory") FinishedGoodsInventory finishedGoodsInventory);
- Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, FinishedGoodsInventory finishedGoodsInventory);
+ Map<String,Integer> getPageTotal(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,
+ @Param("finishedGoodsInventory") FinishedGoodsInventory finishedGoodsInventory);
FlowCard getSelectWarehousingByProcessId(@Param("order_id") String order_id,
@Param("order_number") Integer order_number,
@@ -34,7 +36,7 @@
Map<String,Integer> getSelectWarehousingPageTotal(Integer offset, Integer pageSize,FlowCard flowCard);
Integer findOrderNumberdcount(@Param("orderId") String orderId,
- @Param("orderNumber") Integer orderNumber);
+ @Param("orderNumber") Integer orderNumber, String boxNo);
FinishedGoodsInventory findOrderNumberd(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber);
@@ -88,7 +90,7 @@
Boolean updateDeliveryDeliveryState(String deliveryId,Integer state);
Boolean updateDeliveryDetailState(@Param("orderId") String orderId,
- @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId,Integer state);
+ @Param("orderNumber") Integer orderNumber, @Param("deliveryId") String deliveryId, Integer state, String remarks);
Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
@Param("storageRegion") String storageRegion,
@@ -117,18 +119,22 @@
@Param("quantity") Integer quantity);
Boolean updateInventoryquantityOut(@Param("orderId") String orderId,
- @Param("orderNumber") Integer orderNumber,
- @Param("quantity") Integer quantity);
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Integer quantity,
+ @Param("boxNo") String boxNo);
Boolean updateInventoryquantityInt(@Param("orderId") String orderId,
- @Param("orderNumber") Integer orderNumber,
- @Param("quantity") Integer quantity);
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Integer quantity);
+ Boolean updateInventoryquantityIntBybox(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Integer quantity, String boxNo);
Boolean updateInventoryInventoryOut(@Param("orderId") String orderId,
- @Param("orderNumber") Integer orderNumber,
- @Param("quantity") Integer quantity);
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Integer quantity, String boxNo);
Boolean updateInventoryInventoryInt(@Param("orderId") String orderId,
- @Param("orderNumber") Integer orderNumber,
- @Param("quantity") Integer quantity);
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Integer quantity, String remarks);
List<OrderDetail> getSelectOrderDetail(String orderId);
@@ -139,10 +145,16 @@
FlowCard findFlowCard(FlowCard flowCard);
DeliveryDetail findDeliverydetail(@Param("orderId") String orderId,
- @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId);
+ @Param("orderNumber") Integer orderNumber, @Param("deliveryId") String deliveryId, String boxNo);
Integer findOrderNumberdContainercount(String orderId, Integer orderNumber, String container);
+
+ List<Map<String, String>> getPrintTitleByBox(Integer customerId, String project, String boxNo,String orderId);
+
+ List<Map<String, Object>> getorderProductByBoxNo(String orderId, String boxNo);
+
+ List<Map<String, Object>> getPrintDetail(String orderId, String boxNo, Integer productId, String thickness);
}
--
Gitblit v1.8.0