Merge remote-tracking branch 'origin/master'

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) {

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;
 }

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>