From a49cdaa669f18d92e8fef5d84da536c0465670db Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 21:21:07 +0800
Subject: [PATCH] 1.新增组托入库生成AGV搬运任务，执行AGV搬运任务时判断堆垛机接驳站点是否有空料架，有的话需要进行搬离（没有出库任务的情况下） 2.完善配盘出库单agv目标地点，可能是区域也可能是站点 Q为区域；Z为站点 3.完善立库入库找规则方法
---
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 083dd39..2325909 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -1,27 +1,65 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.OrderDetl;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderDetl;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
+import java.util.Map;
@Mapper
@Repository
public interface OrderDetlMapper extends BaseMapper<OrderDetl> {
- OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
+ OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand,
+ @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
+ , @Param("boxType1")String boxType1,
+ @Param("boxType2")String boxType2,
+ @Param("boxType3")String boxType3);
- OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
+ OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand,
+ @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
+ , @Param("boxType1")String boxType1,
+ @Param("boxType2")String boxType2,
+ @Param("boxType3")String boxType3);
List<OrderDetl> selectWorkingDetls(Long orderId);
- int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ List<OrderDetl> getPakoutPage(Map<String, Object> map);
- int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ Integer getPakoutPageCount(Map<String, Object> map);
+
+ int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
+ @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
+ , @Param("boxType1")String boxType1,
+ @Param("boxType2")String boxType2,
+ @Param("boxType3")String boxType3, @Param("qty")Double qty);
+
+ int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
+ @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
+ , @Param("boxType1")String boxType1,
+ @Param("boxType2")String boxType2,
+ @Param("boxType3")String boxType3, @Param("qty")Double qty);
int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
+ int addToLogTable(OrderDetl orderDetl);
+
+ int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch,
+ @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
+ , @Param("boxType1")String boxType1,
+ @Param("boxType2")String boxType2,
+ @Param("boxType3")String boxType3, @Param("qty")Double qty);
+
+ int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
+ @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
+ , @Param("boxType1")String boxType1,
+ @Param("boxType2")String boxType2,
+ @Param("boxType3")String boxType3, @Param("workQty")Double workQty);
+ int increaseWorkQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty);
+
+ int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("workQty")Double workQty);
+
}
--
Gitblit v1.9.1