出清确认单

src/main/java/com/chinaitop/depot/storage/controller/ClearanceConfirmationController.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.controller;
 
 
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.github.pagehelper.PageHelper;
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
 import com.chinaitop.depot.storage.service.ClearanceConfirmationService;
@@ -161,6 +162,44 @@ public class ClearanceConfirmationController {
     }
 
 
+    /**
+     * 查询当前库区库存实物为空仓的仓房
+     *
+     * @param orgId
+     * @return
+     */
+    @RequestMapping(value = "/findStorehouse",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    public List<StorageStorehouseBusiness> findStorehouse(Integer orgId) {
+        List<StorageStorehouseBusiness> storageStorehouseBusinessList = null;
+        try {
+
+            storageStorehouseBusinessList = clearanceConfirmationService.findStorehouse(orgId);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return storageStorehouseBusinessList;
+    }
+
+    /**
+     * 查询当前库区库存实物为空仓的仓房
+     *
+     * @param storehouseId
+     * @return
+     */
+    @RequestMapping(value = "/findByWarehouse",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    public List<StorageStorehouseBusiness> findByWarehouse(Integer storehouseId) {
+        List<StorageStorehouseBusiness> storageStorehouseBusinessList = null;
+        try {
+
+            storageStorehouseBusinessList = clearanceConfirmationService.findByWarehouse(storehouseId);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return storageStorehouseBusinessList;
+    }
+
     
 
 }

src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.mapper;
 
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
@@ -29,4 +30,9 @@ public interface ClearanceConfirmationMapper {
     Map<String, BigDecimal> getexcessLossQuantity(Integer warehouseId);
 
     Map<String, Object> getStoreHouse(Integer warehouseId);
+
+
+    List<StorageStorehouseBusiness> findStorehouseList(Integer orgId);
+
+    List<StorageStorehouseBusiness> findByWarehouseList(Integer storehouseId);
 }

src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.xml

@@ -231,4 +231,22 @@ cc.updatename updatename,cc.updatedate updatedate,cc.warehouse_id
     warehouse_id = #{warehouseId,jdbcType=INTEGER}
   where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="findStorehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
+    select DISTINCT bs.storehouse_id,bs.storehouse_name
+    from
+      depot_qh.basic_storehouse bs
+        left join data_kcgl_kcsw_default dkkd on bs.storehouse_id =dkkd.ch
+
+    where bs.org_id=#{orgId} and dkkd.ch is null
+  </select>
+  <select id="findByWarehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
+
+    select DISTINCT bw.warehouse_id,bw.warehouse_name
+    from
+      depot_qh.basic_warehouse bw
+        left join depot_qh.data_kcgl_kcsw_default dkkd on bw.warehouse_id =dkkd.hwh
+
+    where bw.storehouse_id=#{storehouseId} and dkkd.hwh is null
+
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/storage/service/ClearanceConfirmationService.java

@@ -2,6 +2,7 @@ package com.chinaitop.depot.storage.service;
 
 
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -35,4 +36,7 @@ public interface ClearanceConfirmationService {
     public void updateBasicStorehouse(ClearanceConfirmation ClearanceConfirmation);
 
 
+    List<StorageStorehouseBusiness> findStorehouse(Integer orgId);
+
+    List<StorageStorehouseBusiness> findByWarehouse(Integer storehouseId);
 }

src/main/java/com/chinaitop/depot/storage/service/impl/ClearanceConfirmationServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 
 import com.chinaitop.depot.storage.mapper.ClearanceConfirmationMapper;
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.service.ClearanceConfirmationService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
@@ -100,4 +101,14 @@ public class ClearanceConfirmationServiceImpl implements ClearanceConfirmationSe
     public void updateBasicStorehouse(ClearanceConfirmation ClearanceConfirmation){
         ClearanceConfirmationMapper.updateByPrimaryKey(ClearanceConfirmation);
     }
+
+    @Override
+    public List<StorageStorehouseBusiness> findStorehouse(Integer orgId) {
+        return ClearanceConfirmationMapper.findStorehouseList(orgId);
+    }
+
+    @Override
+    public List<StorageStorehouseBusiness> findByWarehouse(Integer storehouseId) {
+        return ClearanceConfirmationMapper.findfindByWarehouseList(storehouseId);
+    }
 }