Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/xyst.dinas.sales/build.gradle

@@ -21,6 +21,7 @@ dependencies {
 	compile project(":inz.basis")
 	compile project(":xyst.dinas.biz")
 	compile project(":xyst.dinas.contract")
+	compile project(":xyst.dinas.price")
 	
 	
 	testCompile lib.amino_boot_web

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/InventoryServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import javax.transaction.Transactional;
 
@@ -25,6 +26,8 @@ import com.beecode.inz.basis.team.pojo.ResponseObj;
 import com.xyst.dinas.biz.service.DinasOrganizationService;
 import com.xyst.dinas.biz.service.DinasTypeService;
 import com.xyst.dinas.biz.service.StationService;
+import com.xyst.dinas.price.entity.StationDinasTypePriceDetail;
+import com.xyst.dinas.price.service.PriceAdjustmentService;
 import com.xyst.dinas.sales.constant.InventoryConstant;
 import com.xyst.dinas.sales.dao.InventoryDao;
 import com.xyst.dinas.sales.entity.InventoryLog;
@@ -43,6 +46,9 @@ public class InventoryServiceImpl implements InventoryService {
 	public DinasOrganizationService dinasOrganizationService;
 	
 	@Autowired
+	public PriceAdjustmentService priceAdjustmentService;
+	
+	@Autowired
 	public LogService logService;
 	
 	@Autowired
@@ -195,9 +201,20 @@ public class InventoryServiceImpl implements InventoryService {
 			//根据场站查砂石类型改成根据区域公司查砂石类型，默认每个场站都会卖这些砂石类型，把对应关系全部维护起来。
 			List<KObject> dinasTypeList = dinasTypeService.getByRegionalCompanyId(regionalCompany);
 			for(KObject station : stationList) {
-				//TODO：带出今日砂价
+				List<StationDinasTypePriceDetail> priceList = priceAdjustmentService.getNewDetailListByStation(station.getUuid("id"));
 				for(KObject dinasType : dinasTypeList) {
-					StationDinasTypeRelation item = new StationDinasTypeRelation(station.getUuid("id"), dinasType.getUuid("id"), new BigDecimal(0));
+					List<StationDinasTypePriceDetail> price = null;
+					StationDinasTypeRelation item = null;
+					if(priceList != null) {
+						price = priceList.stream().filter(StationDinasTypePriceDetail -> StationDinasTypePriceDetail.getDinasTypeId().equals(dinasType.getUuid("id")) && StationDinasTypePriceDetail.getStationId().equals(station.getUuid("id")) ).collect(Collectors.toList());
+						if(price.size() > 0) {
+							item = new StationDinasTypeRelation(station.getUuid("id"), dinasType.getUuid("id"), price.get(0).getDinasPrice());
+						} else {
+							item = new StationDinasTypeRelation(station.getUuid("id"), dinasType.getUuid("id"), new BigDecimal(0));
+						}
+					} else {
+						item = new StationDinasTypeRelation(station.getUuid("id"), dinasType.getUuid("id"), new BigDecimal(0));
+					}
 					relation.add(item);
 				}
 			}