From 8f9f4c1779614c5321b3fc6f3b41ad3b529bec17 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 21 十二月 2024 09:12:27 +0800
Subject: [PATCH] #订单出库增加自由项
---
src/main/java/com/zy/asrs/controller/OrderController.java | 2
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 10 ++--
src/main/java/com/zy/asrs/service/LocDetlService.java | 8 ++--
src/main/resources/mapper/LocDetlMapper.xml | 24 ++++++++++++
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 +-
7 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index d4ff998..e21e0ad 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -284,7 +284,7 @@
endQty = endQty + orderDetl.getQty();
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued > 0.0) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null,null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null,null,null,null);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
issued = issued - locDetl.getAnfme();
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 23717f8..dd68a10 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,orderDetl.getSupp());
+ locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
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,orderDetl.getSupp());
+ locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
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 2b6cc26..96ce396 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -56,10 +56,10 @@
// -------------------------------------------------
- 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);
-
+ List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp, @Param("temp1")String temp1, @Param("temp2")String temp2);
+ List<LocDetl> queryStockCrn(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp, @Param("temp1")String temp1, @Param("temp2")String temp2);
+ List<LocDetl> queryStockFour(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp, @Param("temp1")String temp1, @Param("temp2")String temp2);
+ List<LocDetl> queryStockMinAnfme(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp, @Param("temp1")String temp1, @Param("temp2")String temp2);
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, @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 47cdf55..a874270 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,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);
+ List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
+ List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
+ List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
+ List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
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 f1d3231..735f7e6 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,String supp) {
- return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp);
+ public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
+ return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp,temp1,temp2);
}
@Override
- public List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
- return this.baseMapper.queryStockCrn(matnr, batch, orderNo, locNos,supp);
+ public List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
+ return this.baseMapper.queryStockCrn(matnr, batch, orderNo, locNos,supp,temp1,temp2);
}
@Override
- public List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
- return this.baseMapper.queryStockFour(matnr, batch, orderNo, locNos,supp);
+ public List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
+ return this.baseMapper.queryStockFour(matnr, batch, orderNo, locNos,supp,temp1,temp2);
}
@Override
- public List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
- return this.baseMapper.queryStockMinAnfme(matnr, batch, orderNo, locNos,supp);
+ public List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
+ return this.baseMapper.queryStockMinAnfme(matnr, batch, orderNo, locNos,supp,temp1,temp2);
}
@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 29f863d..e2f5bc5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -798,7 +798,7 @@
Date now = new Date();
for(OrderDetl orderDetl : orderDetls){
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null,null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 7eb27ab..42dec5e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -224,6 +224,12 @@
<if test="supp != null and supp != ''">
and a.supp = #{supp}
</if>
+ <if test="temp1 != null and temp1 != ''">
+ and a.temp1 = #{temp1}
+ </if>
+ <if test="temp2 != null and temp2 != ''">
+ and a.temp2 = #{temp2}
+ </if>
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
@@ -420,6 +426,12 @@
<if test="supp != null and supp != ''">
and a.supp = #{supp}
</if>
+ <if test="temp1 != null and temp1 != ''">
+ and a.temp1 = #{temp1}
+ </if>
+ <if test="temp2 != null and temp2 != ''">
+ and a.temp2 = #{temp2}
+ </if>
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
@@ -512,6 +524,12 @@
<if test="supp != null and supp != ''">
and a.supp = #{supp}
</if>
+ <if test="temp1 != null and temp1 != ''">
+ and a.temp1 = #{temp1}
+ </if>
+ <if test="temp2 != null and temp2 != ''">
+ and a.temp2 = #{temp2}
+ </if>
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
@@ -603,6 +621,12 @@
<if test="supp != null and supp != ''">
and a.supp = #{supp}
</if>
+ <if test="temp1 != null and temp1 != ''">
+ and a.temp1 = #{temp1}
+ </if>
+ <if test="temp2 != null and temp2 != ''">
+ and a.temp2 = #{temp2}
+ </if>
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
--
Gitblit v1.9.1