Explorar o código

代储点下库存数量管理油罐业务添加

fanxw %!s(int64=5) %!d(string=hai) anos
pai
achega
ce2959e564

+ 2 - 0
src/main/java/com/chinaitop/depot/agent/number/mapper/BusinessAgentNumberMapper.xml

@@ -364,6 +364,7 @@
364
 	    LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id
364
 	    LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id
365
 	    LEFT JOIN basic_storehouse store ON store.storehouse_id = num.storehouse_id
365
 	    LEFT JOIN basic_storehouse store ON store.storehouse_id = num.storehouse_id
366
 	    LEFT JOIN basic_warehouse ware ON ware.warehouse_id = num.warehouse_id
366
 	    LEFT JOIN basic_warehouse ware ON ware.warehouse_id = num.warehouse_id
367
+	    WHERE 1=1 AND SUBSTR(num.storehouse_id,1,2)!='YG'
367
 	UNION
368
 	UNION
368
 	    SELECT
369
 	    SELECT
369
 	    num.id,num.agent_id agentId,num.agent_depot_id agentDepotId,num.lspz,num.nature,num.level,
370
 	    num.id,num.agent_id agentId,num.agent_depot_id agentDepotId,num.lspz,num.nature,num.level,
@@ -378,6 +379,7 @@
378
 	    LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id
379
 	    LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id
379
 	    LEFT JOIN basic_storehouse store ON store.storehouse_id = aStore.storehouse_id
380
 	    LEFT JOIN basic_storehouse store ON store.storehouse_id = aStore.storehouse_id
380
 	    LEFT JOIN basic_warehouse ware ON ware.warehouse_id = aWare.warehouse_id
381
 	    LEFT JOIN basic_warehouse ware ON ware.warehouse_id = aWare.warehouse_id
382
+	    WHERE 1=1 AND SUBSTR(num.storehouse_id,1,2)!='YG'
381
 	UNION
383
 	UNION
382
 	    SELECT
384
 	    SELECT
383
 	    num.id,num.agent_id agentId,num.agent_depot_id agentDepotId,num.lspz,num.nature,num.level,
385
 	    num.id,num.agent_id agentId,num.agent_depot_id agentDepotId,num.lspz,num.nature,num.level,

+ 1 - 0
src/main/java/com/chinaitop/depot/agent/number/service/impl/AgentNumberServiceImpl.java

@@ -20,6 +20,7 @@ public class AgentNumberServiceImpl implements agentNumberService {
20
     @Resource
20
     @Resource
21
     private BusinessAgentMapper BusinessAgentMapper;
21
     private BusinessAgentMapper BusinessAgentMapper;
22
 
22
 
23
+    @Resource
23
     private BusinessAgentNumberMapper businessAgentNumberMapper;
24
     private BusinessAgentNumberMapper businessAgentNumberMapper;
24
 
25
 
25
     /**
26
     /**