From deb6a6b0c367cafb786d037992ab1df43d3934a9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 04 九月 2023 10:30:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 +-
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 23 ++++++++---------------
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 21 +++++++++++++++++++++
src/main/java/com/zy/asrs/controller/OutController.java | 2 +-
6 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 1134cc2..c5acac2 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -76,7 +76,7 @@
Double c1 = a1.subtract(b1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
double issued = Optional.of( c1 ).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
+ List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
boolean sign = false;
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 57e39a8..bbe6d10 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -85,7 +85,7 @@
//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯＄硦鎼滅储
List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);
- List<LocDetl> queryStock2(String matnr, String batch, int owner);
+ List<LocDetl> queryStock2(String matnr, String batch);
List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO);
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index c62ff89..3c6e64b 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -54,7 +54,7 @@
// --------------------------------------------------
List<LocDetl> queryStock(String matnr, String batch,int owner);
- List<LocDetl> queryStock2(String matnr, String batch,int owner);
+ List<LocDetl> queryStock2(String matnr, String batch);
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 02220a5..bf461d8 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -107,8 +107,8 @@
}
@Override
- public List<LocDetl> queryStock2(String matnr, String batch, int owner) {
- return this.baseMapper.queryStock2(matnr, batch, owner);
+ public List<LocDetl> queryStock2(String matnr, String batch) {
+ return this.baseMapper.queryStock2(matnr, batch);
}
@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 4750391..a7b95e6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -530,8 +530,29 @@
public R manDetlIn(JSONObject json, User user) {
Date date = new Date();
String jsonLocNo = (String) json.get("locNo");
+
+ List<ManLocDetl> locDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo));
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
+
+ if (node.getParentName().equals("A") || node.getParentName().equals("B")){
+ if (node.getRow1() == 1 && locDetls.size() >=11){
+ return R.error("璇ュ簱浣嶆帓宸叉弧");
+ }
+ if (node.getRow1() == 6 && locDetls.size() >=4){
+ return R.error("璇ュ簱浣嶆帓宸叉弧");
+ }
+ if (node.getRow1() == 12 && locDetls.size() >=4){
+ return R.error("璇ュ簱浣嶆帓宸叉弧");
+ }
+
+ }
+ if (locDetls.size() >=12){
+ return R.error("璇ュ簱浣嶆帓宸叉弧");
+ }
+
+
+
JSONArray combMats = json.getJSONArray("combMats");
for (int i = 0; i < combMats.size(); i++) {
OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 834f105..10eb31e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -439,7 +439,6 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- and a.payment = 1
<!-- <choose>-->
<!-- <when test="batch != null and batch != ''">-->
<!-- and a.batch = #{batch}-->
@@ -449,14 +448,14 @@
<!-- </otherwise>-->
<!-- </choose>-->
- <choose>
- <when test="owner != null and owner !=0">
- and a.owner = #{owner}
- </when>
- <otherwise>
- and 1!=1
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner !=0">-->
+<!-- and a.owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
order by
a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
@@ -521,12 +520,6 @@
</if>
<if test="matnr != null and matnr !='' ">
and t.matnr like '%' + #{matnr} + '%'
- </if>
- <if test="owner != null and owner !='' ">
- and t.owner like '%' + #{owner} + '%'
- </if>
- <if test="payment != null and payment !='' ">
- and t.payment = #{payment}
</if>
</sql>
--
Gitblit v1.9.1