合同统计数据bug修复

SC-boot/linkage-scm/src/main/java/jnpf/warehouse/controller/WareHouseController.java

@@ -83,8 +83,6 @@ public class WareHouseController {
             entity.setSublibrary(generaterSwapUtil.getPopupSelectValue("394818245032483845","id","inventory_org_detail_name",entity.getSublibrary(),sublibraryMap));
             entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
             entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
-//            entity.setOrgId(generaterSwapUtil.comSelectValue(entity.getOrgId(), "all"));
-//            entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId()));
     }
 	List<WareHouseListVO> listVO=JsonUtil.getJsonToList(list,WareHouseListVO.class);
     for(WareHouseListVO wareHouseVO:listVO){

SC-boot/linkage-scm/src/main/resources/mapper/contractMobile/ContractMobileMapper.xml

@@ -712,8 +712,8 @@
 		FROM
 			(
 				SELECT
-					( SELECT ROUND( SUM( IFNULL( aa.num, 0 )), 6 ) FROM jg_purchaseorder aa WHERE aa.id = a.id ) totalQuantity,
-					( SELECT ROUND( SUM( IFNULL( aa.amount, 0 )), 6 ) FROM jg_purchaseorder aa WHERE aa.id = a.id ) grossAmount,
+					( SELECT ROUND( SUM( IFNULL( aa.num, 0 )), 6 ) FROM jg_purchaseorder aa WHERE aa.contract_code = a.contract_code ) totalQuantity,
+					( SELECT ROUND( SUM( IFNULL( aa.amount, 0 )), 6 ) FROM jg_purchaseorder aa WHERE aa.contract_code = a.contract_code ) grossAmount,
 					ROUND( IFNULL( b.settlement, 0 ), 6 ) materialNum,
 					ROUND( IFNULL( b.price, 0 ), 6 ) materialPrice,
 					ROUND( IFNULL( b.amount, 0 ), 6 ) materialAmount,