库存校验问题

api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java

@@ -49,4 +49,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private String corpId;
     private String billType;
     private Boolean groupBuy;
+    private Boolean dispatch;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java

@@ -63,5 +63,6 @@ public class FilterUdiInfoRequest extends ListPageRequest {
 
     private String supId;
     private Boolean groupBuy;
+    private Boolean dispatch;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductDetailServiceImpl.java

@@ -3,12 +3,17 @@ package com.glxp.sale.admin.service.inventory.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
+import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.constant.ConstantType;
 import com.glxp.sale.admin.dao.inventory.InvProductDetailDao;
+import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.sale.admin.entity.udid.UdiEntity;
 import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest;
+import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.res.inventory.InvProductDetailJoinResponse;
+import com.glxp.sale.admin.service.basic.UdiInfoService;
+import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.inventory.InvProductDetailService;
 import com.glxp.sale.admin.util.FilterUdiUtils;
 import org.springframework.stereotype.Service;
@@ -131,25 +136,58 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
         return null;
     }
 
+    @Resource
+    UdiRelevanceService udiRelevanceService;
+    @Resource
+    UdiInfoService udiInfoService;
+
+    public UdiInfoEntity getMinDi(String code) {
+        UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
+        UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
+        List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoBean.getUuid());
+        if (udiInfoBean != null) {
+            for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
+                if (udiInfoBean.getIsUseDy() == 1) {
+                    if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY) {
+                        return udiInfoEntity;
+                    }
+                } else {
+                    if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_MAIN) {
+                        return udiInfoEntity;
+                    }
+                }
+                udiInfoEntity.setRelId(udiInfoBean.getId() + "");
+            }
+        }
+        return null;
+    }
+
     @Override
     public int vailStockCount(String code) {
         if (StrUtil.isEmpty(code)) {
             return 0;
         }
         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
-        filterInvProductDetailRequest.setOriginCode(code);
-        List<InvProductDetailEntity> datas = invProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
-        if (CollUtil.isEmpty(datas)) {
-            filterInvProductDetailRequest.setOriginCode(null);
-            UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
-            if (StrUtil.isNotEmpty(udiEntity.getBatchNo()))
-                filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
-            else
-                filterInvProductDetailRequest.setBatchNo("empty");
-            filterInvProductDetailRequest.setProductionDate(udiEntity.getProduceDate());
-            filterInvProductDetailRequest.setExpireDate(udiEntity.getExpireDate());
-            datas = invProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
+        UdiInfoEntity udiInfoEntity = getMinDi(code);
+        UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
+        if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_PACK || udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY
+                || (udiInfoEntity.getSjcpbm() != null && !"".equals(udiInfoEntity.getSjcpbm()))) {
+
+            udiEntity.setUdi(udiInfoEntity.getNameCode());
+            code = FilterUdiUtils.transGlxpNoSerStr(udiEntity);
         }
+
+        filterInvProductDetailRequest.setOriginCode(null);
+        filterInvProductDetailRequest.setCode(code);
+        if (StrUtil.isNotEmpty(udiEntity.getBatchNo()))
+            filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
+        else
+            filterInvProductDetailRequest.setBatchNo("empty");
+        filterInvProductDetailRequest.setProductionDate(udiEntity.getProduceDate());
+        filterInvProductDetailRequest.setExpireDate(udiEntity.getExpireDate());
+        List<InvProductDetailEntity>
+                datas = invProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
+//        }
         int count = 0;
         if (CollUtil.isNotEmpty(datas)) {
 

api-admin/src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9996
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_yxz?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000

api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -460,6 +460,12 @@
             <if test="supId != null and supId != ''">
                 AND company_product_relevance.customerId = #{supId}
             </if>
+            <if test="groupBuy != null">
+                and basic_udirel.groupBuy = #{groupBuy}
+            </if>
+            <if test="dispatch != null">
+                and basic_udirel.dispatch = #{dispatch}
+            </if>
         </where>
         ORDER BY modifyTime DESC
     </select>

api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml

@@ -212,6 +212,9 @@
             <if test="groupBuy != null">
                 and basic_udirel.groupBuy = #{groupBuy}
             </if>
+            <if test="dispatch != null">
+                and basic_udirel.dispatch = #{dispatch}
+            </if>
         </where>
         ORDER BY updateTime DESC
     </select>