From 6edb8b29c0b4ab9dd81f824eb5f24fa17cf6fe13 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 02 七月 2025 14:07:18 +0800
Subject: [PATCH] 可编辑标签打印添加订单总数字段
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 b146a3d..c877628 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
@@ -3,10 +3,7 @@
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.DeliveryDetail;
-import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.Product;
+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;
@@ -39,10 +36,15 @@
FinishedGoodsInventory findOrderNumberd(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber);
+ OrderDetail findOrderDetailNumberd(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber);
+
Integer finishedGoodsInventorybycount(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber);
Integer findOrderQuantity(String orderId);
+
+ Delivery findOrderDelivery(String orderId);
Integer findOrderNumberdsum(String orderId);
@@ -54,7 +56,7 @@
Boolean updateInventory(@Param("flowCard") FlowCard flowCard,
@Param("storageRegion") String storageRegion,
- @Param("remark") String remark);
+ @Param("remark") String remark, @Param("container") String container);
Boolean updateInventoryOut(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
@@ -87,13 +89,15 @@
Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
@Param("storageRegion") String storageRegion,
- @Param("remark") String remark);
+ @Param("remark") String remark, @Param("container") String container);
List<OrderDetail> getSelectDeliveryDetail(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
@Param("orderDetail") OrderDetail orderDetail);
+ List<OrderDetail> getSelectDeliveryDetailDeliveryId(@Param("deliveryId") String deliveryId);
+
Map<String,Integer> getSelectDeliveryDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
List<OrderDetail> getSelectAllocate(@Param("offset") Integer offset,
--
Gitblit v1.8.0