修改

adm/pom.xml

@@ -438,6 +438,42 @@
 		    <artifactId>jedis</artifactId>
 		    <version>2.7.2</version>
 		</dependency>
+
+		<dependency>
+			<groupId>gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/gson-2.8.0.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>min</groupId>
+			<artifactId>min</artifactId>
+			<version>1.0.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/min-1.0.0.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>minencrypt</groupId>
+			<artifactId>minencrypt</artifactId>
+			<version>1.0.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/minencrypt-1.0.0.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>cache</groupId>
+			<artifactId>cache</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/cache-1.0.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>ueditor</groupId>
+			<artifactId>ueditor</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/ueditor.jar</systemPath>
+		</dependency>
 </dependencies>
 
 	<build>

adm/src/main/resources/com/minpay/db/table/own/mapper/WarehouseInventoryMapper.xml

@@ -302,7 +302,9 @@
 		 SELECT 	
 		 			CAST(ROUND(IFNULL(SUM(ad.AWST_DETAIL_WEIGHT),0),4) AS CHAR) 'totalRealWeight'
 		 FROM  		ap_warehouse_stock   ad
+		 left join ap_contract_inf aci on aci.ACI_ID= ad.AWST_CONTRACT_ID
 		WHERE  ad.AWST_START ="00"
+		and aci.ACI_TYPE = '00'
  	   	<if test="branchId != null and branchId != ''">
 			and ad.AWST_BRANCH_ID  = #{branchId,jdbcType=VARCHAR}
 		</if>