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

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/BusinessPointsServiceImpl.java

@@ -163,6 +163,16 @@ public class BusinessPointsServiceImpl extends ServiceImpl<BusinessPointsMapper,
 
 	@Override
 	public BusinessPoints savePoints(BusinessPoints businessPoints) {
+		if (businessPoints.getCorpId() == null){
+			throw new RuntimeException("客户不能为空");
+		}
+		BusinessPoints points = baseMapper.selectOne(new QueryWrapper<BusinessPoints>().eq("corp_id", businessPoints.getCorpId()).eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0));
+		if (points != null && businessPoints.getId() == null){
+			throw new RuntimeException(businessPoints.getCorpName()+"客户已存在,请在原单据修改");
+		}
+		if (points != null && businessPoints.getId() != null && businessPoints.getId().longValue() != points.getId().longValue()){
+			throw new RuntimeException(businessPoints.getCorpName()+"客户已存在,请在原单据修改");
+		}
 		if (businessPoints.getId() == null){
 			businessPoints.setTenantId(SecureUtil.getTenantId());
 			businessPoints.setCreateUser(SecureUtil.getUserId());
@@ -171,7 +181,7 @@ public class BusinessPointsServiceImpl extends ServiceImpl<BusinessPointsMapper,
 		}else {
 			businessPoints.setUpdateUser(SecureUtil.getUserId());
 			businessPoints.setUpdateTime(new Date());
-			baseMapper.insert(businessPoints);
+			baseMapper.updateById(businessPoints);
 		}
 		return businessPoints;
 	}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -663,14 +663,22 @@ public class OrderController extends BladeController {
 	}
 
 	/**
-	 * 国内销售或采购订单表
+	 * 库存账查询锁定库存订单信息
 	 */
 	@GetMapping("/ListMessage")
 	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "分页", notes = "传入order")
+	@ApiOperation(value = "库存账查询锁定库存订单信息", notes = "传入order")
 	public R<IPage<OrderVO>> ListMessage(Query query,@RequestParam("itemId") Long itemId,
 									   @RequestParam("corpId") Long corpId) {
 		IPage<OrderVO> pages = orderService.orderInventory(Condition.getPage(query),SecureUtil.getTenantId(),OrderTypeEnum.DOMESTIC.getType(),OrderTypeEnum.SALES.getType(),itemId,corpId);
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+				if (corpMessage.isSuccess() && corpMessage.getData() != null){
+					item.setCorpsName(corpMessage.getData().getCname());
+				}
+			});
+		}
 		return R.data(pages);
 	}
 

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

@@ -442,9 +442,11 @@
     </select>
     <select id="orderInventory"  resultType="org.springblade.purchase.sales.vo.OrderVO">
         SELECT
+        DISTINCT
 	bo.id,
 	bo.order_no,
-	bo.busines_date
+	bo.busines_date,
+	item.corp_id
 FROM
 	business_order bo
 	LEFT JOIN business_order_items item ON bo.id = item.pid