瀏覽代碼

天津bug更新

lvzhikai 5 年之前
父節點
當前提交
84e063a484

+ 1 - 1
src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentBgmxzMapper.xml

@@ -567,7 +567,7 @@
567
     	c.bgmxz_tbsj modifydate
567
     	c.bgmxz_tbsj modifydate
568
     FROM business_agent_depot a
568
     FROM business_agent_depot a
569
 	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
569
 	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
570
-	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id 
570
+	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id AND c.del_flag=1
571
 	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
571
 	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
572
 	<if test="orgId != null">
572
 	<if test="orgId != null">
573
 	and c.org_id=#{orgId,jdbcType=INTEGER}
573
 	and c.org_id=#{orgId,jdbcType=INTEGER}

+ 1 - 1
src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentHcMapper.xml

@@ -467,7 +467,7 @@
467
     	c.hccrk_tbsj modifydate
467
     	c.hccrk_tbsj modifydate
468
     FROM business_agent_depot a
468
     FROM business_agent_depot a
469
 	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
469
 	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
470
-	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id 
470
+	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id AND c.del_flag=1
471
 	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
471
 	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
472
 	<if test="orgId != null">
472
 	<if test="orgId != null">
473
 	and c.org_id=#{orgId,jdbcType=INTEGER}
473
 	and c.org_id=#{orgId,jdbcType=INTEGER}

+ 1 - 1
src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentQcMapper.xml

@@ -468,7 +468,7 @@
468
     	c.qccrk_tbsj modifydate
468
     	c.qccrk_tbsj modifydate
469
     FROM business_agent_depot a
469
     FROM business_agent_depot a
470
 	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
470
 	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
471
-	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id 
471
+	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id AND c.del_flag=1
472
 	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
472
 	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
473
 	<if test="orgId != null">
473
 	<if test="orgId != null">
474
 	and c.org_id=#{orgId,jdbcType=INTEGER}
474
 	and c.org_id=#{orgId,jdbcType=INTEGER}