From 430ab98c6225a276bab44c5eebb304fc6206cb73 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 25 九月 2024 16:03:48 +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/FinishedGoodsInventoryMapper.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 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 79e68a3..b146a3d 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,7 +1,9 @@
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.DeliveryDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.Product;
@@ -10,7 +12,9 @@
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,15 +25,18 @@
@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,
+ 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);
Integer finishedGoodsInventorybycount(@Param("orderId") String orderId,
@@ -39,6 +46,8 @@
Integer findOrderNumberdsum(String orderId);
+ Integer findOrderDeliveryQuantitySum(String orderId);
+
Integer findDeliveryQuantity(String deliveryId);
Integer findDeliverydetailsum(String deliveryId,Integer deliveryDetailState);
@@ -47,16 +56,24 @@
@Param("storageRegion") String storageRegion,
@Param("remark") String remark);
+ 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);
@@ -65,24 +82,25 @@
Boolean updateDeliveryDeliveryState(String deliveryId,Integer state);
- Boolean updateDeliveryDetailState(OrderDetail orderDetail,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);
- 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);
+ 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,
@@ -104,6 +122,19 @@
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