From 8ca385d65454fb8e993970a768ed3ad5c3a095ab Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期六, 18 一月 2025 13:44:44 +0800 Subject: [PATCH] 优化库位检索逻辑,修复代码并添加新功能 --- src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 40 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..5a6798a 100644 --- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java +++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java @@ -1,27 +1,62 @@ 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); + /* + 濡傛灉batch銆乧socode銆乮socode涓虹┖锛屽垯鏌ヨ缁撴灉涓璪atch銆乧socode銆乮socode鐨勫�间负绌� + */ + List<OrderDetl> selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("csocode")String csocode, @Param("isocode")String isocode); - OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch); + /* + 濡傛灉batch銆乧socode銆乮socode涓虹┖锛屽垯鏌ヨ缁撴灉涓笉鑰冭檻batch銆乧socode銆乮socode鐨勫�� + */ + List<OrderDetl> selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("csocode")String csocode, @Param("isocode")String isocode); + + List<OrderDetl> selectItemByOrderNo2(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("threeCode") String threeCode); + + List<OrderDetl> selectItemNoneOfBatch(@Param("orderNo")String orderNo, @Param("matnr")String matnr); + + List<OrderDetl> selectItemOfBatch(@Param("matnr")String matnr, @Param("batch")String batch); 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 increaseAnfme(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty, @Param("csocode")String csocode, @Param("isocode")String isocode); + + int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty, @Param("csocode")String csocode, @Param("isocode")String isocode); + + int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty, @Param("csocode")String csocode, @Param("isocode")String isocode); int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status); + List<OrderDetl> selectRemainder(@Param("orderId") Long orderId); + + List<OrderDetl> selectByMatnr(@Param("matnr") String matnr); + + List<OrderDetl> getPakoutDetlPage(Map<String, Object> map); + + List<OrderDetl> getOrderDetlByDoctype(Map<String, Object> map); + + Integer getOrderDetlByDoctypeCount(Map<String, Object> map); + + List<String> getReportDetl(@Param("docType") Long docType); + + List<String> listAutoDetl(@Param("devNo") String devno); + + + } -- Gitblit v1.9.1