2022年12月21日17:14:47

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -172,8 +172,17 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public TradingBox add(TradingBox tradingBox) {
+		LambdaQueryWrapper<TradingBox> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(TradingBox::getIsDeleted, 0)
+			.eq(TradingBox::getTenantId, AuthUtil.getTenantId())
+			.eq(TradingBox::getType, tradingBox.getType())
+			.eq(TradingBox::getContractNo, tradingBox.getContractNo());
+		List<TradingBox> tradingBoxList = baseMapper.selectList(lambdaQueryWrapper);
 		//判断id是否为空
 		if (tradingBox.getId() == null) {
+			if (tradingBoxList.size() > 0) {
+				throw new Error("合同号已存在，请勿重复添加");
+			}
 			//获取系统编号
 			R billNo = serialClient.getBillNo(tradingBox.getType(), "BOX", tradingBox.getType());
 			if (!billNo.isSuccess()) {
@@ -189,6 +198,9 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBox.setStatus(0);
 			baseMapper.insert(tradingBox);
 		} else {
+			if (tradingBoxList.size() > 1) {
+				throw new Error("合同号已存在，请勿重复添加");
+			}
 			tradingBox.setUpdateTime(new Date());
 			tradingBox.setUpdateUser(AuthUtil.getUserId());
 			tradingBox.setUpdateUserName(AuthUtil.getUserName());
@@ -395,8 +407,17 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 
 	@Override
 	public TradingBox addRent(TradingBox tradingBox) {
+		LambdaQueryWrapper<TradingBox> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(TradingBox::getIsDeleted, 0)
+			.eq(TradingBox::getTenantId, AuthUtil.getTenantId())
+			.eq(TradingBox::getType, tradingBox.getType())
+			.eq(TradingBox::getContractNo, tradingBox.getContractNo());
+		List<TradingBox> tradingBoxList = baseMapper.selectList(lambdaQueryWrapper);
 		//判断id是否为空
 		if (tradingBox.getId() == null) {
+			if (tradingBoxList.size() > 0) {
+				throw new Error("合同号已存在，请勿重复添加");
+			}
 			//获取系统编号
 			R billNo = serialClient.getBillNo(tradingBox.getType(), "BOX", tradingBox.getType());
 			if (!billNo.isSuccess()) {
@@ -412,6 +433,9 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBox.setStatus(0);
 			baseMapper.insert(tradingBox);
 		} else {
+			if (tradingBoxList.size() > 1) {
+				throw new Error("合同号已存在，请勿重复添加");
+			}
 			tradingBox.setUpdateTime(new Date());
 			tradingBox.setUpdateUser(AuthUtil.getUserId());
 			tradingBox.setUpdateUserName(AuthUtil.getUserName());
@@ -1033,9 +1057,11 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				if ("ZR".equals(tradingBox.getType())) {
 					tradingBoxFees.setFeesType(2);
 					tradingBoxFees.setBillType("租入");
+					tradingBoxItem.setStatus("退租");
 				} else {
 					tradingBoxFees.setFeesType(1);
 					tradingBoxFees.setBillType("租出");
+					tradingBoxItem.setStatus("待使用");
 				}
 				tradingBoxFees.setPid(tradingBox.getId());
 				tradingBoxFees.setSrcOrderNo(tradingBox.getContractNo());
@@ -1085,8 +1111,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				itemsList.add(items);
 				applyDTO.setItemsList(itemsList);
 
-
-				tradingBoxItem.setStatus("退租");
 				tradingBoxItem.setRentEndDate(tradingBox.getRentDate());
 				tradingBoxItem.setRentingOutDate(tradingBox.getRentDate());
 				tradingBoxItem.setAddress(tradingBox.getAddress());

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -188,7 +188,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			transport.setStatus(0);
 			baseMapper.insert(transport);
 		} else {
-			if (transportList.size() >= 1) {
+			if (transportList.size() > 1) {
 				throw new Error("提单号已存在，请勿重复添加");
 			}
 			transport.setUpdateTime(new Date());

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

@@ -1008,11 +1008,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	public List<CMYWarehousingExcel> warehousing(List<CMYWarehousingExcel> excelList) {
 		//商品
 		List<GoodsDesc> goodsList = new ArrayList<>();
-		goodsList = castToList(redisTemplate.opsForValue().get("goods"), GoodsDesc.class);
+		/*goodsList = castToList(redisTemplate.opsForValue().get("goods"), GoodsDesc.class);
 		System.out.println("商品数据：" + goodsList);
 		if (goodsList.size() == 0) {
 			redisClient.basicData("all");
-		}
+		}*/
 		goodsList = goodsDescClient.selectGoodsDescAll();
 		//库区
 		List<StorageDesc> storageDescList = castToList(redisTemplate.opsForValue().get("storageDesc"), StorageDesc.class);