From d3eb9f86c5b223c2bb587043a7b76492383151b1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 18 十二月 2024 14:47:42 +0800
Subject: [PATCH] #订单出库匹配供应商
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 8 ++++----
src/main/java/com/zy/asrs/service/LocDetlService.java | 8 ++++----
src/main/resources/mapper/LocDetlMapper.xml | 12 ++++++++++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 16 ++++++++--------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/controller/OutController.java | 4 ++--
6 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 8efeeb8..23717f8 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -81,7 +81,7 @@
if (issued <= 0.0D) { continue; }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+ locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp());
for (LocDetl locDetl : locDetls) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
List<LocMast> locMasts = new ArrayList<>();
@@ -162,7 +162,7 @@
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+ locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp());
for (LocDetl locDetl : locDetls) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
List<LocMast> locMasts = new ArrayList<>();
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 41f39ea..2c002a8 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -56,9 +56,9 @@
// -------------------------------------------------
- List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
- List<LocDetl> queryStockCrn(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
- List<LocDetl> queryStockFour(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+ List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp);
+ List<LocDetl> queryStockCrn(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp);
+ List<LocDetl> queryStockFour(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp);
Double queryStockAnfme(String matnr, String batch);
@@ -81,5 +81,5 @@
List<LocDetl> selectLocDetlUnilateralMoveShuttleY(@Param("matnr")String matnr,@Param("batch")String batch,@Param("grade")String grade);
List<LocDetl> selectLocDetlUnilateralMoveShuttleN(@Param("matnr")String matnr,@Param("batch")String batch,@Param("grade")String grade);
- List<LocDetl> queryStockMinAnfme(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+ List<LocDetl> queryStockMinAnfme(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 0befc4d..830053d 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -51,10 +51,10 @@
// --------------------------------------------------
- List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
- List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos);
- List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos);
- List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos);
+ List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp);
+ List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp);
+ List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp);
+ List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 2576b97..941de5a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -83,23 +83,23 @@
}
@Override
- public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+ public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
+ return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp);
}
@Override
- public List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStockCrn(matnr, batch, orderNo, locNos);
+ public List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
+ return this.baseMapper.queryStockCrn(matnr, batch, orderNo, locNos,supp);
}
@Override
- public List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStockFour(matnr, batch, orderNo, locNos);
+ public List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
+ return this.baseMapper.queryStockFour(matnr, batch, orderNo, locNos,supp);
}
@Override
- public List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStockMinAnfme(matnr, batch, orderNo, locNos);
+ public List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
+ return this.baseMapper.queryStockMinAnfme(matnr, batch, orderNo, locNos,supp);
}
@Override
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index fda0cdf..effd7d5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -791,7 +791,7 @@
Date now = new Date();
for(OrderDetl orderDetl : orderDetls){
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null,null);
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index b04bb94..d7c3aed 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -217,6 +217,9 @@
<!-- and (a.batch IS NULL OR a.batch = '')-->
<!-- </otherwise>-->
<!-- </choose>-->
+ <if test="supp != null and supp != ''">
+ and a.supp = #{supp}
+ </if>
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
@@ -410,6 +413,9 @@
and b.loc_sts = 'F'
and a.matnr = #{matnr}
and b.crn_no in (8,9)
+ <if test="supp != null and supp != ''">
+ and a.supp = #{supp}
+ </if>
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
@@ -499,6 +505,9 @@
<!-- and (a.batch IS NULL OR a.batch = '')-->
<!-- </otherwise>-->
<!-- </choose>-->
+ <if test="supp != null and supp != ''">
+ and a.supp = #{supp}
+ </if>
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
@@ -587,6 +596,9 @@
<!-- and (a.batch IS NULL OR a.batch = '')-->
<!-- </otherwise>-->
<!-- </choose>-->
+ <if test="supp != null and supp != ''">
+ and a.supp = #{supp}
+ </if>
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
--
Gitblit v1.9.1