2023年9月14日17:31:45

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -1366,7 +1366,7 @@ public class ExportOrderController extends BladeController {
 		}
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getCorpId()), OrderItems::getCorpId, orderItems.getCorpId());//供应商
 		//0代表不显示全部
-		lambdaQueryWrapper.and(i -> i.ne(OrderItems::getFudaPurchaseStatus, "").isNotNull(OrderItems::getFudaPurchaseStatus));
+//		lambdaQueryWrapper.and(i -> i.ne(OrderItems::getFudaPurchaseStatus, "").isNotNull(OrderItems::getFudaPurchaseStatus));
 		if (ObjectUtils.isNotEmpty(orderItems.getShowAll()) && orderItems.getShowAll() == 0) {
 			//采购状态
 //			lambdaQueryWrapper.eq(OrderItems::getFudaPurchaseStatus, "待采购");

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -1252,7 +1252,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 						// 判断比较大小
 						if (orderQuantity.compareTo(surplusRouteQuantity) > 0) {
-							throw new SecurityException("锁定库存失败:原单据的" + oneStock.getCode() + "订货数量大于可用库存,无法锁定");
+							throw new SecurityException("锁定库存失败:原单据的" + item.getCode() + "订货数量大于可用库存,无法锁定");
 						}
 						if (surplusRouteQuantity == null) {
 							throw new SecurityException("锁定库存失败:可用库存为空,禁止操作");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -736,7 +736,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 				corpsAddr1.setCreateUser(AuthUtil.getUserId());
 				corpsAddr1.setSalesCompanyId(deptId);
 				corpsAddr1.setSalesCompanyName(deptName);
-				corpsAddr.setDefaultAddres("1");
+				corpsAddr1.setDefaultAddres("1");
 				corpsAddrService.save(corpsAddr1);
 			}
 		} else {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java

@@ -267,6 +267,8 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 	 * @return
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R importGoodsNew(List<GoodsExcel> data, Boolean isCovered) {
 		if (CollectionUtils.isEmpty(data)) {
 			throw new SecurityException("导入数据不能为空");
@@ -277,7 +279,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 			String type = goodsExcel.getGoodsTypeName();
 			PjGoodsType goodsType = goodsTypeMapper.selectGoodsTypeCname(type, AuthUtil.getTenantId());
 			if (goodsType == null) {
-				throw new SecurityException("第" + (i + 1) + "行未添加分类或者分类不存在");
+				throw new SecurityException("第" + (i + 2) + "行未添加分类或者分类不存在");
 			}
 		}
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -1055,13 +1055,13 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			//判断必填项是否为空
 			ShipItemImportExcel itemExcel = excelList.get(i);
 			if (ObjectUtil.isEmpty(itemExcel.getGoodsName())) {
-				throw new SecurityException("第" + (i + 1) + "行,商品名称为空");
+				throw new SecurityException("第" + (i + 2) + "行,商品名称为空");
 			}
 			if (ObjectUtil.isEmpty(itemExcel.getPrice())) {
-				throw new SecurityException("第" + (i + 1) + "行,价格为空");
+				throw new SecurityException("第" + (i + 2) + "行,价格为空");
 			}
 			if (ObjectUtil.isEmpty(itemExcel.getGoodsNum())) {
-				throw new SecurityException("第" + (i + 1) + "行,数量为空");
+				throw new SecurityException("第" + (i + 2) + "行,数量为空");
 			}
 
 			PjOrderItems item = new PjOrderItems();
@@ -1091,14 +1091,14 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					}
 				} else {//已开启批次号管理
 					if (ObjectUtil.isEmpty(itemExcel.getDot())) {
-						throw new RuntimeException("第" + (i + 1) + "行,商品已开启管理批次号,请填写批次号");
+						throw new RuntimeException("第" + (i + 2) + "行,商品已开启管理批次号,请填写批次号");
 					}
 				}
 
 				item.setUnits(goodsDesc.getUnit());
 				item.setSendNum(new BigDecimal("0"));
 			} else {
-				throw new RuntimeException("第" + (i + 1) + "行,商品名称不存在");
+				throw new RuntimeException("第" + (i + 2) + "行,商品名称不存在");
 			}
 
 			list.add(item);