From 70909ef529fb89861672306222f7491d236ad5d2 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期四, 06 十月 2022 20:14:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/TestMast.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index b0bd69f..5307bd0 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -27,7 +27,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "閫氶亾")
private Integer channel;
/**
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 ec50d9c..3896c18 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -629,7 +629,10 @@
log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
throw new CoolException("娴嬭瘯鐢宠澶辫触");
}
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", testMast.getLocNo())
+ .eq("channel",testMast.getChannel())
+ );
if (Cools.isEmpty(locMast)) {
throw new CoolException(BaseRes.PARAM);
}
--
Gitblit v1.9.1