md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java

@@ -70,6 +70,27 @@ public class EmisCommonController extends BaseController
     @Autowired
     RedissonService redissonService;
 
+    /**
+     * 获取网点总可用面单数
+     */
+    @RequestMapping(value = "/getTotalAvailablePag")
+    public AjaxResult getTotalAvailablePag(String useSiteCode,String prefix)
+    {
+        try {
+            if(StringUtils.isEmpty(useSiteCode)){
+                try {
+                    useSiteCode= SecurityUtils.getLoginUser().getUser().getOwnerSiteCode();
+                }catch (Exception ex){
+                    ex.printStackTrace();
+                }
+            }
+            Map dataMap = emisElectronicSitePagService.getTotalAvailablePag(useSiteCode,"T7080");
+            return AjaxResult.success("获取成功",dataMap);
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return AjaxResult.error(ex.getMessage());
+        }
+    }
 
     /**
      * 获取电子面单单号

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisElectronicSitePagMapper.java

@@ -29,6 +29,15 @@ public interface EmisElectronicSitePagMapper extends BaseMapper<EmisElectronicSi
 {
 
 
+    /**
+     * 获取总可用面单数
+     * @return
+     */
+    @Select("select material_code,sum(has_bill_count) as has_bill_count from emis_electronic_site_pag where use_site_code='${useSiteCode}' and prefix='${prefix}' and has_bill_count>0 GROUP BY material_code")
+    @ResultMap("EmisElectronicSitePagResult")
+    public List<EmisElectronicSitePag> getTotalAvailablePagList(@Param("useSiteCode")String useSiteCode,@Param("prefix")String prefix);
+
+
     /**
      * 获取单个面单是否可用
      * @return

emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicSitePagService.java

@@ -10,6 +10,8 @@
 package com.xdadan.erp.emis.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.xdadan.erp.emis.domain.EmisElectronicSitePag;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 
@@ -24,7 +26,15 @@ public interface IEmisElectronicSitePagService
 
 
  /**
-  *
+  * 获取总可用面单数
+  * @param useSiteCode
+  * @param prefix
+  * @return
+  */
+ public Map getTotalAvailablePag(String useSiteCode, String prefix);
+
+ /**
+  * 获取电子面单数量
   * @param useSiteCode
   * @param prefix
   * @return

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicSitePagServiceImpl.java

@@ -10,7 +10,9 @@
 
 package com.xdadan.erp.emis.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.xdadan.erp.common.core.redis.RedissonService;
 import com.xdadan.erp.emis.domain.EmisElectronicPag;
@@ -23,8 +25,9 @@ import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisElectronicSitePag;
 import com.xdadan.erp.emis.mapper.EmisElectronicSitePagMapper;
 import com.xdadan.erp.emis.service.IEmisElectronicSitePagService;
+import org.springframework.util.CollectionUtils;
 
-/**
+ /**
  * 电子面单Service业务层处理
  * 
  * @author linfso
@@ -39,11 +42,33 @@ public class EmisElectronicSitePagServiceImpl extends EmisBaseService implements
     @Autowired
     RedissonService redissonService;
 
+
     /**
-     * 分配电子面单 1 个
+     * 获取站点可用面单数
+     * @param useSiteCode
+     * @param prefix
      * @return
+     * @throws EmisBizError
      */
     @Override
+    public Map getTotalAvailablePag(String useSiteCode, String prefix) {
+       Map<String,Object> availablePagMap = new HashMap();
+        availablePagMap.put("materialCode",0);
+        availablePagMap.put("hasBillCount",0);
+        List<EmisElectronicSitePag> emisElectronicSitePagList=emisElectronicSitePagMapper.getTotalAvailablePagList(useSiteCode,prefix);
+        if(!CollectionUtils.isEmpty(emisElectronicSitePagList)){
+            for (EmisElectronicSitePag item:emisElectronicSitePagList) {
+                availablePagMap.put(item.getMaterialCode(),item.getHasBillCount());
+            }
+        }
+
+        return availablePagMap;
+    }
+        /**
+         * 分配电子面单 1 个
+         * @return
+         */
+    @Override
     public String realMatchWaybill(String useSiteCode,String prefix) throws EmisBizError {
         // 获取电子面单号
         // 获取分段电子面单数量

emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml

@@ -153,13 +153,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and prod_code = #{prodCode}
            and
              (
-               ( begin_weight <![CDATA[<= ]]> #{beginWeight} and #{beginWeight} <![CDATA[<= ]]> end_weight )
-               or ( begin_weight <![CDATA[<= ]]> #{endWeight} and #{endWeight} <![CDATA[<= ]]> end_weight )
+               ( begin_weight <![CDATA[< ]]> #{beginWeight} and #{beginWeight} <![CDATA[<= ]]> end_weight )
+               or ( begin_weight <![CDATA[< ]]> #{endWeight} and #{endWeight} <![CDATA[<= ]]> end_weight )
             )
             and
             (
-               ( begin_date <![CDATA[<= ]]> #{beginDate} and #{beginDate} <![CDATA[<= ]]> end_date )
-               or ( begin_date <![CDATA[<= ]]> #{endDate} and #{endDate} <![CDATA[<= ]]> end_date )
+               ( begin_date <![CDATA[< ]]> #{beginDate} and #{beginDate} <![CDATA[<= ]]> end_date )
+               or ( begin_date <![CDATA[< ]]> #{endDate} and #{endDate} <![CDATA[<= ]]> end_date )
             )
 		limit 1
 	</select>