From 0617359bca3ebc0f4207b8a4a07827b9c2da87d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 12 Jul 2023 10:45:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93?=
=?UTF-8?q?=E5=8D=B0bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mybatis/mapper/inv/InnerOrderDetailDao.xml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml
index 49b2490c1..2f783ecc2 100644
--- a/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml
@@ -12,8 +12,8 @@
basic_products.measname,
basic_products.manufactory
FROM inv_inner_order_detail
- INNER JOIN basic_udirel on inv_inner_order_detail.productId = basic_udirel.id
- INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
+ left JOIN basic_udirel on inv_inner_order_detail.productId = basic_udirel.id
+ left JOIN basic_products on basic_udirel.uuid = basic_products.uuid
AND orderIdFk = #{orderIdFk}
@@ -22,7 +22,7 @@
AND productId = #{productId}
- GROUP BY basic_products.uuid
+ group by inv_inner_order_detail.id
AND batchNo = #{batchNo}
+
+ AND (batchNo is null or batchNo = '')
+
From 98c0d2c69f7ca3c2dc82af547118aafafd831aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 12 Jul 2023 15:34:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=B4=E6=97=B6?=
=?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=B2=A1=E6=9C=89=E7=94=A8=E7=9A=84=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java
index 46403344b..43bebc09b 100644
--- a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java
@@ -50,8 +50,7 @@ public class IoCodeTempEntity {
*/
@TableField(value = "nameCode")
private String nameCode;
- private String fromCorpName;
- private String fromName;
+
/**
* 批次号
From 096f7cd13b96cbb796a75041084382108aaa660d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 12 Jul 2023 16:03:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E5=8D=95=E4=B8=89=E6=9C=9F=E6=A0=A1=E9=AA=8C=E9=87=8D?=
=?UTF-8?q?=E5=A4=8D=E6=89=AB=E7=A0=81=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/glxp/api/controller/inout/IoCodeTempController.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 98d2ee7b0..2e7915bc1 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -1027,7 +1027,9 @@ public class IoCodeTempController extends BaseController {
for (int i = 0; i < codeEnttityList.size(); i++) {
IoCodeTempEntity drugCodeSelectEntity = codeEnttityList.get(i);
if (codeEnttityList.get(i).getCode().equals(code)) {
- return drugCodeSelectEntity;
+ if (StrUtil.emptyIfNull(drugCodeSelectEntity.getSerialNo()).equals(StrUtil.emptyIfNull(udiEntity.getSerialNo()))) {
+ return drugCodeSelectEntity;
+ }
}
// UdiEntity originUdiEntity = FilterUdiUtils.getUdi(drugCodeSelectEntity.getCode());
if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getNameCode()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) {