修改库存查询接口

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/entity/StationDinasTypeRelation.java

 package com.xyst.dinas.sales.entity;
 
+import java.math.BigDecimal;
 import java.util.UUID;
 
 public class StationDinasTypeRelation {
@@ -9,17 +10,35 @@ public class StationDinasTypeRelation {
 	 */
 	private UUID stationId;
 	
+	/**
+	 * 场站名称
+	 */
+	private String stationName;
+	
 	/*
 	 * 砂石类型id
 	 */
 	private UUID dinasTypeId;
 	
+	/**
+	 * 砂石类型名称
+	 */
+	private String dinasTypeName;
+	
 	/*
 	 * 砂石单价
 	 */
-	private double price;
+	private BigDecimal price;
+	
+	/**
+	 * 库存量
+	 */
+	private BigDecimal amount;
+	
+	public StationDinasTypeRelation() {
+	}
 	
-	public StationDinasTypeRelation(UUID stationId, UUID dinasTypeId, double price) {
+	public StationDinasTypeRelation(UUID stationId, UUID dinasTypeId, BigDecimal price) {
 		this.stationId = stationId;
 		this.dinasTypeId = dinasTypeId;
 		this.price = price;
@@ -29,11 +48,47 @@ public class StationDinasTypeRelation {
 		return stationId;
 	}
 
+	public void setStationId(UUID stationId) {
+		this.stationId = stationId;
+	}
+
 	public UUID getDinasTypeId() {
 		return dinasTypeId;
 	}
 
-	public double getPrice() {
+	public void setDinasTypeId(UUID dinasTypeId) {
+		this.dinasTypeId = dinasTypeId;
+	}
+
+	public BigDecimal getPrice() {
 		return price;
 	}
+
+	public void setPrice(BigDecimal price) {
+		this.price = price;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	public String getStationName() {
+		return stationName;
+	}
+
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+
+	public String getDinasTypeName() {
+		return dinasTypeName;
+	}
+
+	public void setDinasTypeName(String dinasTypeName) {
+		this.dinasTypeName = dinasTypeName;
+	}
 }

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

 package com.xyst.dinas.sales.internal.service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -37,10 +38,21 @@ public class InventoryServiceImpl implements InventoryService {
 
 	@Override
 	@Transactional
-	public List<KObject> getInventoryByRegionalCompany(UUID regionalCompany) {
+	public List<StationDinasTypeRelation> getInventoryByRegionalCompany(UUID regionalCompany) {
 		updateInventoryBaseInfo(regionalCompany);
 		List<KObject> inventory = inventoryDao.listAllByRegionalCompany(regionalCompany, false);
-		return inventory;
+		List<StationDinasTypeRelation> result = new ArrayList<StationDinasTypeRelation>();
+		for(KObject item : inventory) {
+			StationDinasTypeRelation r = new StationDinasTypeRelation();
+			r.setStationId(item.get("station").getUuid("id"));
+			r.setStationName(item.get("station").getString("stationName"));
+			r.setDinasTypeId(item.get("dinasType").getUuid("id"));
+			r.setDinasTypeName(item.get("dinasType").getString("dinasTypeName"));
+			r.setAmount(item.getBigDecimal("amount"));
+			r.setPrice(item.getBigDecimal("price"));
+			result.add(r);
+		}
+		return result;
 	}
 
 	@SuppressWarnings("unchecked")
@@ -65,7 +77,7 @@ public class InventoryServiceImpl implements InventoryService {
 		for(StationDinasTypeRelation r : relation) {
 			UUID stationId = r.getStationId();
 			UUID dinasTypeId = r.getDinasTypeId();
-			double price = r.getPrice();
+			BigDecimal price = r.getPrice();
 			boolean findFlag = false;
 			for(KObject i : inventory) {
 				if(i.get("station").getUuid("id").equals(stationId) && i.get("dinasType").getUuid("id").equals(dinasTypeId)) {
@@ -118,7 +130,7 @@ public class InventoryServiceImpl implements InventoryService {
 				List<KObject> dinasTypeList = dinasTypeService.getByStation(station.getUuid("id"));
 				//TODO：带出今日砂价
 				for(KObject dinasType : dinasTypeList) {
-					StationDinasTypeRelation item = new StationDinasTypeRelation(station.getUuid("id"), dinasType.getUuid("id"), 0);
+					StationDinasTypeRelation item = new StationDinasTypeRelation(station.getUuid("id"), dinasType.getUuid("id"), new BigDecimal(0));
 					relation.add(item);
 				}
 			}

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/InventoryService.java

@@ -3,12 +3,12 @@ package com.xyst.dinas.sales.service;
 import java.util.List;
 import java.util.UUID;
 
-import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
+import com.xyst.dinas.sales.entity.StationDinasTypeRelation;
 
 public interface InventoryService {
 
-	public List<KObject> getInventoryByRegionalCompany(UUID regionalCompany);
+	public List<StationDinasTypeRelation> getInventoryByRegionalCompany(UUID regionalCompany);
 	public ResponseObj<String> modifyInventory(String body);
 	
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/InventoryController.java

@@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
 import com.beecode.xlib.runtime.Assert;
+import com.xyst.dinas.sales.entity.StationDinasTypeRelation;
 import com.xyst.dinas.sales.service.InventoryService;
 
 @RestController
@@ -27,7 +27,7 @@ public class InventoryController {
 	@RequestMapping(value = "/inventory/query", method = RequestMethod.GET)
 	public Object query(@RequestParam("regionalCompany") String regionalCompany) {
 		Assert.notNull(regionalCompany, "The regionalCompany must not be null");
-		List<KObject> data = inventoryService.getInventoryByRegionalCompany(UUID.fromString(regionalCompany));
+		List<StationDinasTypeRelation> data = inventoryService.getInventoryByRegionalCompany(UUID.fromString(regionalCompany));
 		return ResponseObj.success("库存查询成功", data);
 	}