From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 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 a6a8560..3b10fee 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,5 +1,7 @@
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;
@@ -12,7 +14,7 @@
import java.util.Map;
@Mapper
-public interface FinishedGoodsInventoryMapper extends CrudRepository<FinishedGoodsInventory,Long> {
+public interface FinishedGoodsInventoryMapper extends BaseMapper<FinishedGoodsInventory> {
@@ -20,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,
@@ -55,6 +59,8 @@
Integer findDeliverydetailsum(String deliveryId,Integer deliveryDetailState);
+ Integer findFinishedOperateLogQuantity(String orderId);
+
Boolean updateInventory(@Param("flowCard") FlowCard flowCard,
@Param("storageRegion") String storageRegion,
@Param("remark") String remark, @Param("container") String container);
@@ -86,11 +92,12 @@
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,
- @Param("remark") String remark, @Param("container") String container);
+ @Param("remark") String remark, @Param("container") String container,
+ @Param("getComputeArea") Double getComputeArea);
List<OrderDetail> getSelectDeliveryDetail(@Param("offset") Integer offset,
@@ -115,18 +122,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);
@@ -137,10 +148,18 @@
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);
+
+ Boolean deleteFinishedGoodsInventoryDate();
}
--
Gitblit v1.8.0