提交库存

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/DeliveryItems.java

@@ -282,8 +282,9 @@ public class DeliveryItems implements Serializable {
 		private BigDecimal inWeight;
 		@ApiModelProperty(value = "币别")
     	private String currency;
+
 		@ApiModelProperty(value = "汇率")
-    	private String exRate;
+    	private BigDecimal exRate;
 
 
 }

blade-service-api/blade-stock-api/src/main/java/org/springblade/stock/entity/StockGoods.java

@@ -304,6 +304,10 @@ public class StockGoods implements Serializable {
 	@ApiModelProperty(value = "箱号")
 		private String cntrNo;
 
+	@ApiModelProperty(value = "仓库名称")
+	@TableField(exist = false)
+	private String stockName;
+
 
 
 }

blade-service-api/blade-stock-api/src/main/java/org/springblade/stock/feign/IStockGoodsClient.java

@@ -92,6 +92,6 @@ public interface IStockGoodsClient {
 	StockGoods getOneStock(@RequestBody StockGoods stockGoods);
 
 	@GetMapping(LIST_STOCK_BY_CONDITIONS)
-    List<StockGoods> listStockByCondition(@RequestBody StockGoods stockGoods);
+    List<StockGoods> listStockByCondition( StockGoods stockGoods);
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ExportDeliveryController.java

@@ -209,7 +209,7 @@ public class ExportDeliveryController extends BladeController {
 		return deliveryService.submit(delivery);
 	}
 
-	@PostMapping("comfire")
+	@PostMapping("")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "确认收货", notes = "确认收货")
 	public R comfire(@RequestBody Delivery delivery)

blade-service/blade-stock/src/main/java/org/springblade/stock/controller/StockGoodsController.java

@@ -29,8 +29,10 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
+import org.springblade.client.feign.IStorageClient;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -52,6 +54,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 库存账 控制器
@@ -69,6 +72,7 @@ public class StockGoodsController extends BladeController {
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	private IGoodsDescClient goodsDescClient;//商品信息
 	private IUserClient userClient;//用户信息
+	private IStorageClient iStorageClient;//库区信息
 
 	/**
 	 * 详情
@@ -137,6 +141,16 @@ public class StockGoodsController extends BladeController {
 						item.setCreateUserName(createUser.getData().getName());
 					}
 				}
+				//获取仓库信息
+				if (item.getStorageId() != null){
+					//仓库信息
+					StorageDesc storageDesc = iStorageClient.findById(item.getStorageId());
+					if(storageDesc!=null)
+					{
+						item.setStockName(storageDesc.getCname());
+					}
+
+				}
 				if (item.getUpdateUser() != null){
 					R<User> updateUser = userClient.userInfoById(item.getUpdateUser());
 					if (updateUser.isSuccess() && updateUser.getData() != null){