From 6661232f32135d943c76197afba2baac81e171f4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 12:00:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java | 84 +++++++++++++++++++++++++++++++++++------
1 files changed, 71 insertions(+), 13 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 adace47..99ba49d 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,16 +1,17 @@
package com.example.erp.mapper.mm;
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.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;
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> {
@@ -21,62 +22,92 @@
@Param("pageSize") Integer pageSize,
@Param("finishedGoodsInventory") FinishedGoodsInventory finishedGoodsInventory);
- Integer getPageTotal(Integer offset, Integer pageSize,FinishedGoodsInventory finishedGoodsInventory);
+ Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, FinishedGoodsInventory finishedGoodsInventory);
- List<FlowCard> getseletwarehousing(@Param("offset") Integer offset,
+ FlowCard getSelectWarehousingByProcessId(@Param("order_id") String order_id,
+ @Param("order_number") Integer order_number,
+ @Param("process_id") String process_id);
+ List<FlowCard> getSelectWarehousing(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
@Param("flowCard") FlowCard flowCard);
- Integer getseletwarehousingPageTotal(Integer offset, Integer pageSize,FlowCard flowCard);
+ Map<String,Integer> getSelectWarehousingPageTotal(Integer offset, Integer pageSize,FlowCard flowCard);
Integer findOrderNumberdcount(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber);
+
+ 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);
+
+ Integer findOrderDeliveryQuantitySum(String orderId);
+
+ Integer findDeliveryQuantity(String deliveryId);
+
+ Integer findDeliverydetailsum(String deliveryId,Integer deliveryDetailState);
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);
Boolean updateInventoryquantityavailable(@Param("orderDetail") OrderDetail orderDetail);
Boolean updateflowcard(FlowCard flowCard);
+ Boolean updateflowcardOut(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);
+
Boolean updateIntOrderNumberConut( @Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber,
- @Param("quantity") Integer quantity);
+ @Param("quantity") Long quantity);
Boolean updateOutOrderNumberConut( @Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber,
@Param("quantity") Integer quantity);
+
+ Boolean updateOrderNumberConut( @Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Long quantity);
Boolean updateOrderWarehousingState(String orderId,Integer state);
Boolean updateOrderDeliveryState(String orderId,Integer state);
- Boolean updateDeliveryDetailState(OrderDetail orderDetail,Integer state);
+ Boolean updateDeliveryDeliveryState(String deliveryId,Integer state);
+
+ Boolean updateDeliveryDetailState(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId,Integer state);
Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
@Param("storageRegion") String storageRegion,
- @Param("remark") String remark);
+ @Param("remark") String remark, @Param("container") String container);
- List<OrderDetail> getseletdeliveryDetail(@Param("offset") Integer offset,
+ List<OrderDetail> getSelectDeliveryDetail(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
@Param("orderDetail") OrderDetail orderDetail);
- Integer getseletdeliveryDetailPageTotal(Integer offset, Integer pageSize,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,
@Param("pageSize") Integer pageSize,
@Param("orderDetail") OrderDetail orderDetail);
- Integer getSelectAllocatePageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
+ Map<String,Integer> getSelectAllocatePageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);
Boolean updateInventoryquantityAllocateOut(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber,
@@ -84,6 +115,33 @@
Boolean updateInventoryquantityAllocateInt(@Param("orderId") String orderId,
@Param("orderNumber") Integer orderNumber,
@Param("quantity") Integer quantity);
+
+ Boolean updateInventoryquantityOut(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Integer quantity);
+ Boolean updateInventoryquantityInt(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Integer quantity);
+
+ Boolean updateInventoryInventoryOut(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Integer quantity);
+ Boolean updateInventoryInventoryInt(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber,
+ @Param("quantity") Integer quantity);
+
+ List<OrderDetail> getSelectOrderDetail(String orderId);
+
+ Boolean insertOrderFinishedGoodsInventory(@Param("orderDetail") OrderDetail orderDetail);
+
+ Boolean updateOrderInventory(@Param("orderDetail") OrderDetail orderDetail);
+
+ FlowCard findFlowCard(FlowCard flowCard);
+
+ DeliveryDetail findDeliverydetail(@Param("orderId") String orderId,
+ @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId);
+
+
}
--
Gitblit v1.8.0