Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehousePositionInfoController.java

@@ -38,6 +38,13 @@ public class WarehousePositionInfoController {
     public List<WarehousePositionInfo> selectPositionList(@RequestParam String baseId,String flag){
         return warehousePositionInfoService.selectPositionList(baseId,flag);
     }
+    /**
+     * 打印仓位类型下拉
+     */
+    @GetMapping("/selectBinNumberList")
+    public List<WarehousePositionInfo> selectBinNumberList(@RequestParam String baseId){
+        return warehousePositionInfoService.selectBinNumberList(baseId);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWarehousePositionInfoService.java

@@ -26,4 +26,8 @@ public interface IWarehousePositionInfoService extends IService<WarehousePositio
      * 查看仓库下的仓位
      */
     List<WarehousePositionInfo> selectPositionList(String baseId,String flag);
+    /**
+     * 打印仓位类型下拉
+     */
+    List<WarehousePositionInfo> selectBinNumberList(String baseId);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -2398,6 +2398,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         pageView.put("printEndDate", warehouseInOutInfo.getPrintEndDate());
         pageView.put("pcFlag", warehouseInOutInfo.getPcFlag());
         pageView.put("warehouseName", warehouseInOutInfo.getWarehouseName());
+        pageView.put("binNumber", warehouseInOutInfo.getBinNumber());
         pageView.put("statusFlag", warehouseInOutInfo.getStatusFlag());
         pageView.put("searchType", warehouseInOutInfo.getSearchType());
         pageView.put("pageSize", warehouseInOutInfo.getPageSize());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousePositionInfoServiceImpl.java

@@ -15,7 +15,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -85,4 +87,31 @@ public class WarehousePositionInfoServiceImpl extends ServiceImpl<WarehousePosit
         return warehousePositionInfoList;
     }
 
+    @Override
+    public List<WarehousePositionInfo> selectBinNumberList(String baseId) {
+        List<WarehousePositionInfo> warehousePositionInfoList=new ArrayList<>();
+        WarehousePositionInfo warehousePositionInfo1=new WarehousePositionInfo();
+        warehousePositionInfo1.setBinNumber("全部仓位");
+        warehousePositionInfoList.add(warehousePositionInfo1);
+        List<WarehousePositionInfo> warehousePositionInfoList1 = this.selectList(new EntityWrapper<WarehousePositionInfo>()
+                .eq("base_id", baseId)
+                .like("bin_number","托盘")
+                .eq("delete_flag", "0"));
+        if (warehousePositionInfoList1.size()>0){
+            WarehousePositionInfo warehousePositionInfo2=new WarehousePositionInfo();
+            warehousePositionInfo2.setBinNumber("托盘");
+            warehousePositionInfoList.add(warehousePositionInfo2);
+        }
+        List<WarehousePositionInfo> warehousePositionInfoList2 = this.selectList(new EntityWrapper<WarehousePositionInfo>()
+                .eq("base_id", baseId)
+                .like("bin_number","合营")
+                .eq("delete_flag", "0"));
+        if (warehousePositionInfoList2.size()>0){
+            WarehousePositionInfo warehousePositionInfo2=new WarehousePositionInfo();
+            warehousePositionInfo2.setBinNumber("合营");
+            warehousePositionInfoList.add(warehousePositionInfo2);
+        }
+        return warehousePositionInfoList;
+    }
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -40,6 +40,9 @@
         <if test="baseId != null and baseId != ''">
             AND w.base_id = #{baseId}
         </if>
+        <if test="binNumber != null and binNumber != ''">
+            AND (lower(w.bin_number) like lower(CONCAT('%',#{binNumber},'%')))
+        </if>
         <if test="compId != null and compId != ''">
             AND wbi.comp_id = #{compId}
         </if>
@@ -165,6 +168,9 @@
         <if test="baseId != null and baseId != ''">
             AND w.base_id = #{baseId}
         </if>
+        <if test="binNumber != null and binNumber != ''">
+            AND (lower(w.bin_number) like lower(CONCAT('%',#{binNumber},'%')))
+        </if>
         <if test="compId != null and compId != ''">
             AND wbi.comp_id = #{compId}
         </if>