ZeroLiYi il y a 1 an
Parent
commit
27bb349dae

+ 4 - 3
src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.storage.mapper;
3
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
3
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
4
 import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
4
 import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
5
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
5
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
6
+import org.apache.ibatis.annotations.Param;
6
 import org.springframework.stereotype.Repository;
7
 import org.springframework.stereotype.Repository;
7
 
8
 
8
 import java.math.BigDecimal;
9
 import java.math.BigDecimal;
@@ -30,12 +31,12 @@ public interface ClearanceConfirmationMapper {
30
 
31
 
31
     Map<String, BigDecimal> getexcessLossQuantity(Integer warehouseId);
32
     Map<String, BigDecimal> getexcessLossQuantity(Integer warehouseId);
32
 
33
 
33
-    Map<String, Object> getStoreHouse(Integer warehouseId);
34
+    Map<String, Object> getStoreHouse(@Param("warehouseId")Integer warehouseId);
34
 
35
 
35
 
36
 
36
-    List<StorageStorehouseBusiness> findStorehouseList(Integer orgId);
37
+    List<StorageStorehouseBusiness> findStorehouseList(@Param("orgId") Integer orgId);
37
 
38
 
38
-    List<StorageStorehouseBusiness> findByWarehouseList(Integer storehouseId);
39
+    List<StorageStorehouseBusiness> findByWarehouseList(@Param("storehouseId")Integer storehouseId);
39
 
40
 
40
     ClearanceConfirmation selectByCqqrd(String warehouseId);
41
     ClearanceConfirmation selectByCqqrd(String warehouseId);
41
 }
42
 }

+ 9 - 7
src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.xml

@@ -232,21 +232,23 @@ cc.updatename updatename,cc.updatedate updatedate,cc.warehouse_id
232
   where id = #{id,jdbcType=INTEGER}
232
   where id = #{id,jdbcType=INTEGER}
233
   </update>
233
   </update>
234
   <select id="findStorehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
234
   <select id="findStorehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
235
-    select DISTINCT bs.storehouse_id,bs.storehouse_name
236
-    from
235
+    SELECT DISTINCT
236
+      bs.storehouse_id storehouseId,
237
+      bs.storehouse_name storehouseName
238
+    FROM
237
       depot_qh.basic_storehouse bs
239
       depot_qh.basic_storehouse bs
238
-        left join data_kcgl_kcsw_default dkkd on bs.storehouse_id =dkkd.ch
240
+        LEFT JOIN data_kcgl_kcsw_default dkkd ON bs.storehouse_id = dkkd.ch
241
+        LEFT JOIN 	depot_qh.basic_warehouse bw on bw.storehouse_id =bs.storehouse_id
239
 
242
 
240
-    where bs.org_id=#{orgId} and dkkd.ch is null
243
+    where bs.org_id=#{orgId} and dkkd.ch is null and bw.storehouse_id is not null
241
   </select>
244
   </select>
242
   <select id="findByWarehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
245
   <select id="findByWarehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
243
 
246
 
244
-    select DISTINCT bw.warehouse_id,bw.warehouse_name
247
+    select DISTINCT bw.warehouse_id warehouseId,bw.warehouse_name warehouseName
245
     from
248
     from
246
       depot_qh.basic_warehouse bw
249
       depot_qh.basic_warehouse bw
247
-        left join depot_qh.data_kcgl_kcsw_default dkkd on bw.warehouse_id =dkkd.hwh
248
 
250
 
249
-    where bw.storehouse_id=#{storehouseId} and dkkd.hwh is null
251
+    where bw.storehouse_id=#{storehouseId}
250
 
252
 
251
   </select>
253
   </select>
252
 
254
 

+ 1 - 0
src/main/java/com/chinaitop/depot/storage/service/impl/ClearanceConfirmationServiceImpl.java

@@ -172,6 +172,7 @@ public class ClearanceConfirmationServiceImpl implements ClearanceConfirmationSe
172
 
172
 
173
     @Override
173
     @Override
174
     public List<StorageStorehouseBusiness> findStorehouse(Integer orgId) {
174
     public List<StorageStorehouseBusiness> findStorehouse(Integer orgId) {
175
+        System.out.print(ClearanceConfirmationMapper.findStorehouseList(orgId));
175
         return ClearanceConfirmationMapper.findStorehouseList(orgId);
176
         return ClearanceConfirmationMapper.findStorehouseList(orgId);
176
     }
177
     }
177
 
178
 

+ 3 - 0
src/main/resources/bootstrap-dev.yml

@@ -39,6 +39,9 @@ spring:
39
 #  jackson:
39
 #  jackson:
40
 #    date-format: yyyy-MM-dd
40
 #    date-format: yyyy-MM-dd
41
 #    time-zone: GMT+8
41
 #    time-zone: GMT+8
42
+logging:
43
+  level:
44
+    org.hibernate.SQL: DEBUG
42
 web:
45
 web:
43
   upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
46
   upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
44
 cxf:
47
 cxf: