Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -687,5 +687,7 @@ public class Order implements Serializable {
 
 	@ApiModelProperty(value = "本次赠送积分")
 	private BigDecimal presenterIntegral;
+	@ApiModelProperty(value = "本次溢付款")
+	private BigDecimal caseOverPayment;
 
 }

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

@@ -47,7 +47,8 @@ public interface IStockGoodsClient {
 								@RequestParam(value = "lotNo",required = false)String lotNo,
 								@RequestParam(value = "cntrNo",required = false)String cntrNo,
 								@RequestParam(value = "billNo",required = false)String billNo,
-								@RequestParam(value = "contractNumber",required = false)String contractNumber);
+								@RequestParam(value = "contractNumber",required = false)String contractNumber,
+								@RequestParam(value = "tradeType",required = false)String tradeType);
 
 	/**
 	 * 新增库存总账

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -610,5 +610,7 @@ public class Order extends OrderBase {
 
 	@ApiModelProperty(value = "本次赠送积分")
 	private BigDecimal presenterIntegral;
+	@ApiModelProperty(value = "本次溢付款")
+	private BigDecimal caseOverPayment;
 
 }

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

@@ -200,7 +200,7 @@ public class ImportDeliveryController extends BladeController {
 									  @ApiParam(value = "订单号", required = true) @RequestParam String billNo,
 									  @ApiParam(value = "合同号", required = true) @RequestParam String contractNumber) {
 
-		R<StockGoodsVO> stockGoodsVOR = stockGoodsClient.selectStock(corpId, storageId, goodId, null, null, cntrNo, billNo, contractNumber);
+		R<StockGoodsVO> stockGoodsVOR = stockGoodsClient.selectStock(corpId, storageId, goodId, null, null, cntrNo, billNo, contractNumber,"JK");
 		if(stockGoodsVOR.isSuccess())
 		{
 			StockGoodsVO data = stockGoodsVOR.getData();

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -274,7 +274,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			storageId = null;
 			corpId = null;
 		}
-		R<StockGoodsVO> goodsVOR = stockGoodsClient.selectStock(corpId, storageId, deliveryItems.getItemId(), itemType, lotNo, cntrNo, billNo, contractNumber);
+		R<StockGoodsVO> goodsVOR = stockGoodsClient.selectStock(corpId, storageId, deliveryItems.getItemId(), itemType, lotNo, cntrNo, billNo, contractNumber,tradeType);
 		if (goodsVOR.isSuccess()){
 			return goodsVOR.getData();
 		}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -103,6 +103,7 @@
         <result column="single_ticket_margin" property="singleTicketMargin"/>
         <result column="convert_integral" property="convertIntegral"/>
         <result column="presenter_integral" property="presenterIntegral"/>
+        <result column="case_over_payment" property="caseOverPayment"/>
     </resultMap>
 
 

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

@@ -54,8 +54,8 @@ public class StockGoodsClient implements IStockGoodsClient{
 	 */
 	@Override
 	@GetMapping(SELECT_STOKE)
-	public R<StockGoodsVO> selectStock(Long corpId, Long storageId, Long goodId, String itemType, String lotNo,String cntrNo,String billNo,String contractNumber) {
-		return R.data(stockGoodsService.selectStock(corpId,storageId,goodId,itemType,lotNo,cntrNo,billNo,contractNumber));
+	public R<StockGoodsVO> selectStock(Long corpId, Long storageId, Long goodId, String itemType, String lotNo,String cntrNo,String billNo,String contractNumber,String tradeType) {
+		return R.data(stockGoodsService.selectStock(corpId,storageId,goodId,itemType,lotNo,cntrNo,billNo,contractNumber,tradeType));
 	}
 
 	/**

blade-service/blade-stock/src/main/java/org/springblade/stock/service/IStockGoodsService.java

@@ -55,7 +55,7 @@ public interface IStockGoodsService extends IService<StockGoods> {
 	 * @param contractNumber 合同号
 	 * @return
 	 */
-	StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo,String cntrNo,String billNo,String contractNumber);
+	StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo,String cntrNo,String billNo,String contractNumber,String tradeType);
 	/**
 	 * 新增库存总账
 	 */

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -80,7 +80,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 	 * @return
 	 */
 	@Override
-	public StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo,String cntrNo,String billNo,String contractNumber) {
+	public StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo,String cntrNo,String billNo,String contractNumber,String tradeType) {
 		LambdaQueryWrapper<StockGoods> lambdaQueryWrapper = new LambdaQueryWrapper();
 		lambdaQueryWrapper.eq(Func.isNotEmpty(corpId),StockGoods::getCorpId,corpId);//客户id
 		lambdaQueryWrapper.eq(Func.isNotEmpty(storageId),StockGoods::getStorageId,storageId);//仓库id
@@ -91,7 +91,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 		lambdaQueryWrapper.eq(Func.isNotEmpty(lotNo),StockGoods::getLotNo,lotNo);//批次号
 		lambdaQueryWrapper.isNull(Func.isEmpty(lotNo),StockGoods::getLotNo);//批次号
 		lambdaQueryWrapper.eq(StockGoods::getTenantId,SecureUtil.getTenantId());//租户
-
+		lambdaQueryWrapper.eq(Func.isNotEmpty(tradeType),StockGoods::getTradeType,tradeType);
 		lambdaQueryWrapper.eq(Func.isNotEmpty(cntrNo),StockGoods::getCntrNo,cntrNo);//收货单 箱号
 		lambdaQueryWrapper.eq(Func.isNotEmpty(billNo),StockGoods::getBillNo,billNo);//收货单 提单号
 		lambdaQueryWrapper.eq(Func.isNotEmpty(contractNumber),StockGoods::getContractNumber,contractNumber);//收货单 合同号
@@ -125,6 +125,10 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 			stockGoods.setLockingQuantity(datum.getLockingQuantity());
 			stockGoods.setBalanceQuantity(datum.getBalanceQuantity());
 			stockGoods.setSurplusRouteQuantity(datum.getSurplusRouteQuantity());
+			if (stockGoods.getInQuantity() == null){
+				stockGoods.setInQuantity(datum.getBalanceQuantity());
+			}
+			stockGoods.setTradeType("CN");
 			stockGoods.setTenantId(SecureUtil.getTenantId());
 			//获取商品id
 			R<GoodsDesc> goodsDesc = goodsDescClient.GoodsByCode(datum.getCode());

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/component/impl/DefaultOrderSaveImpl.java

@@ -129,13 +129,15 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 			}
 			order.setSysNo((String) billNo.getData());
 			R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
-		/*	//生成订单号
-			R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
+			if (StringUtils.isBlank(order.getOrderNo())){
+			//生成订单号
+			R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType(),order.getTradeType());
 			if (!clientBillNo.isSuccess()){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				throw new SecurityException("生成订单号失败");
 			}
-			order.setOrderNo((String) clientBillNo.getData());*/
+			order.setOrderNo((String) clientBillNo.getData());
+			}
 			//判断贸易类型
 			if(order.getTradeType().equals("JK"))
 			{
@@ -174,16 +176,20 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 		}
 		if (CollectionUtils.isNotEmpty(itemsVOList)) {
 			itemsVOList.forEach(li -> {
+				String billNo = null;
+				if (StringUtils.isNotBlank(li.getBillNo())){
+					billNo = li.getBillNo().toUpperCase();
+				}
 				li.setPid(id);
 				if (Objects.isNull(li.getId())) {
 					li.setCreateTime(new Date());
 					li.setCreateUser(AuthUtil.getUserId());
-					li.setBillNo(li.getBillNo().toUpperCase());
+					li.setBillNo(billNo);
 					orderItemsMapper.insert(li);
 				} else {
 					li.setUpdateTime(new Date());
 					li.setUpdateUser(AuthUtil.getUserId());
-					li.setBillNo(li.getBillNo().toUpperCase());
+					li.setBillNo(billNo);
 					orderItemsMapper.updateById(li);
 				}
 			});

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -101,6 +101,7 @@
         <result column="single_ticket_margin" property="singleTicketMargin"/>
         <result column="convert_integral" property="convertIntegral"/>
         <result column="presenter_integral" property="presenterIntegral"/>
+        <result column="case_over_payment" property="caseOverPayment"/>
     </resultMap>