From b7c1c6d0375c5fb8e45badeefa818531caccb9ac Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 7 Apr 2023 15:47:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E5=85=A5?=
 =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8=E6=97=A0=E6=B3=95=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E4=B8=80=E7=A4=BE=E4=BC=9A=E4=BF=A1=E7=94=A8?=
 =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java | 1 +
 src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
index 6e9690b0..c33038a6 100644
--- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
@@ -65,4 +65,5 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String bindType;
     private String certIdFk;
     private String manufactory;
+    private String tyshxydm;
 }
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 1f6c4aa7..8aa1a199 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -573,6 +573,9 @@
             <if test="customerId != '' and customerId != null">
                 AND company_product_relevance.unitFk = #{customerId}
             </if>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND basic_products.tyshxydm = #{tyshxydm}
+            </if>
 
 
         </where>

From ace0907a6e5a4cec446c8c52a5347cbb846893da Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 7 Apr 2023 15:50:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/inout/IoCodeTempController.java    | 3 ++-
 1 file changed, 2 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 ba2319ce..9b53a7da 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -11,6 +11,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.constant.ConstantType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
@@ -836,7 +837,7 @@ public class IoCodeTempController extends BaseController {
     }
 
     public BaseResponse checkInv(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeTempEntity) {
-        if (bussinessTypeEntity.isVailInv()) {
+        if (bussinessTypeEntity.isVailInv() && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
             if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
 //                    int count = invPreProductDetailService.vailStockCount(code);  //todo 寄售
 //                    if (count < 0) {