From 5d027c7a3425724fd7101bde2d1dd8d5c4fb8f1b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 09 九月 2023 08:48:18 +0800
Subject: [PATCH] #订单出库
---
src/main/resources/mapper/ManLocDetlMapper.xml | 13 ++++---------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
index b0278df..acf3447 100644
--- a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
@@ -86,7 +86,7 @@
long selectAllPageSize(Map<String, Object> condition);
- ManLocDetl selectInventory(String LocNo, String Matnr, String batch);
+ ManLocDetl selectInventory(@Param("LocNo") String LocNo,@Param("matnr") String Matnr,@Param("batch") String batch);
int deleteDatailed (String locNo, String matnr,String batch);
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 00888c8..09053f9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -788,6 +788,11 @@
String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
String jsonBarNo = (String) json.get("barcode"); //鑾峰彇鎵樼洏鐮�
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //鑾峰彇瀵瑰簲缁勬墭淇℃伅
if (Cools.isEmpty(waitPakins)){
return R.error("鏈煡璇㈠埌缁勬墭");
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index 4715759..9b11930 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -349,15 +349,10 @@
select top 1 * from man_loc_detl
where loc_no=#{LocNo}
and 1=1
- and matnr=#{Matnr}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
+ and matnr=#{matnr}
+ <if test="batch != null and batch !='' ">
+ and batch like '%' + #{batch} + '%'
+ </if>
</select>
<sql id="selectAllWarningSql">
<if test="locNo!=null and locNo!='' ">
--
Gitblit v1.9.1