2023年6月16日21:52:51

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -102,7 +102,8 @@ public class OrderController extends BladeController {
 			.like(ObjectUtils.isNotEmpty(order.getSrcOrdNo()), PjOrder::getSrcOrdNo, order.getSrcOrdNo())//来源单号
 			.like(ObjectUtils.isNotEmpty(order.getOrdNo()), PjOrder::getOrdNo, order.getOrdNo())//来源单号
 			.like(ObjectUtils.isNotEmpty(order.getBusinessSource()), PjOrder::getBusinessSource, order.getBusinessSource())//来源
-			.eq(ObjectUtils.isNotEmpty(order.getStatus()), PjOrder::getStatus, order.getStatus());//状态
+			.eq(ObjectUtils.isNotEmpty(order.getStatus()), PjOrder::getStatus, order.getStatus())//状态
+			.eq(PjOrder::getActualPaymentStatus, 2);//状态
 
 		if (order.getCreateTimeList() != null && order.getCreateTimeList().size() > 1) {//创建日期
 			lambdaQueryWrapper.ge(PjOrder::getCreateTime, order.getCreateTimeList().get(0));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -225,14 +225,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					//计算小计
 					item.setSubTotalMoney(item.getGoodsNum().multiply(item.getPrice()));
 
+					//获得商品
+					PjGoodsDesc goodsDesc = goodsDescMapper.selectById(item.getGoodsId());
+					if (ObjectUtil.isEmpty(goodsDesc)) {
+						throw new RuntimeException("商品数据异常");
+					}
+					item.setBrandName(goodsDesc.getBrandName());
 					//计算成本
 					if (order.getSharedCompanyId().equals(Long.valueOf(AuthUtil.getDeptId()))) {//本地取库存账成本价
 
-						//获得商品
-						PjGoodsDesc goodsDesc = goodsDescMapper.selectById(item.getGoodsId());
-						if (ObjectUtil.isEmpty(goodsDesc)) {
-							throw new RuntimeException("商品数据异常");
-						}
 						goodsName = goodsName.append(goodsDesc.getCname()).append(",");
 						retrieval = retrieval.append(goodsDesc.getCnameInt()).append(",");
 						LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -384,6 +385,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		}
 		BeanUtil.copyProperties(pjOrder, pjShip);
 		pjShip.setId(null);
+//		pjShip.setStockClerkName();
 		pjShip.setBillno((String) billNo.getData());
 		pjShip.setOrdNo(pjOrder.getOrdNo());
 		pjShip.setOrdId(pjOrder.getId());

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

@@ -34,6 +34,7 @@ import org.springblade.salesPart.entity.*;
 import org.springblade.salesPart.enums.OrderTypeEnum;
 import org.springblade.salesPart.excel.ShipItemImportExcel;
 import org.springblade.salesPart.goods.mapper.GoodsDescMapper;
+import org.springblade.salesPart.goods.mapper.GoodsTypeMapper;
 import org.springblade.salesPart.history.mapper.HistoryMapper;
 import org.springblade.salesPart.order.mapper.OrderMapper;
 import org.springblade.salesPart.order.service.IOrderItemsService;
@@ -82,6 +83,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 	private final ISysClient sysClient;
 	private final IStockDescService iStockDescService;
 	private final GoodsDescMapper goodsDescMapper;
+	private final GoodsTypeMapper goodsTypeMapper;
 	private final IProductLaunchService productLaunchService;
 	private final HistoryMapper historyMapper;
 	private final IUserClient userClient;
@@ -178,10 +180,8 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 
 		// 保存订单明细
 		if (CollectionUtils.isNotEmpty(ship.getShipItemsList())) {
-			long goodsId = ship.getShipItemsList().stream().map(PjShipItems::getGoodsId).count();
-			long salesCompanyId = ship.getShipItemsList().stream().map(PjShipItems::getSalesCompanyId).count();
-			long dot = ship.getShipItemsList().stream().map(PjShipItems::getDot).count();
-			if (goodsId > 1 && salesCompanyId > 1 && dot >1){
+			long goodsId = ship.getShipItemsList().stream().map(PjShipItems::getGoodsName).distinct().count();
+			if (goodsId < ship.getShipItemsList().size()){
 				throw new RuntimeException("明细中存在重复数据，保存失败");
 			}
 			List<PjShipItems> shipItemsList = new ArrayList<>();
@@ -640,14 +640,17 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					throw new RuntimeException("商品数据异常");
 				}
 
+
 				//生成库存账
 				PjStockDesc stockDesc = new PjStockDesc();
 
 				stockDesc.setSalesCompanyId(ship.getSalesCompanyId());
 				stockDesc.setSalesCompanyName(ship.getSalesCompanyName());
 				stockDesc.setGoodsTypeId(goodsDesc.getGoodsTypeId());
-				stockDesc.setGoodsTypeName(goodsDesc.getGoodsTypeName());
-
+				if (ObjectUtils.isNotNull(goodsDesc.getGoodsTypeId())){
+					PjGoodsType goodsType = goodsTypeMapper.selectById(item.getGoodsId());
+					stockDesc.setGoodsTypeName(goodsType.getCname());
+				}
 				//获得仓库
 				PjStorageDesc storageDesc = storageDescMapper.selectById(ship.getStorageId());
 				if (ObjectUtil.isNotEmpty(storageDesc)) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -162,14 +162,18 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 
 					//保存销售主表信息
 					PjOrder order = new PjOrder();
-
+					// 获取系统编号
+					R SrcOrdNo = serialClient.getBillNo("XS", "XS", "XS");
+					if (SrcOrdNo.getCode() != 200) {
+						TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+						throw new RuntimeException("生成系统编号失败");
+					}
 					if (list.size() == 1) {//如果只有一个公司，订单编号和主编号一致
-						order.setOrdNo((String) billNo.getData());
+						order.setOrdNo((String) SrcOrdNo.getData());
 					} else {
-						order.setOrdNo(billNo.getData() + "-" + i);
+						order.setOrdNo(SrcOrdNo.getData() + "-" + i);
 					}
 					order.setSrcOrdNo((String) billNo.getData());
-
 					order.setCreateUser(AuthUtil.getUserId());
 
 					//处理部门

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -17,18 +17,14 @@
 package org.springblade.salesPart.stock.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.License;
 import lombok.AllArgsConstructor;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import org.springblade.client.entity.CorpsDesc;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -37,22 +33,16 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.salesPart.entity.PjGoodsDesc;
-import org.springblade.salesPart.entity.PjOrder;
 import org.springblade.salesPart.entity.PjProductLaunch;
-import org.springblade.salesPart.excel.CorpsDescExportExcel;
+import org.springblade.salesPart.entity.PjStockDesc;
 import org.springblade.salesPart.excel.StockExportExcel;
-import org.springblade.salesPart.goods.service.IGoodsDescService;
 import org.springblade.salesPart.productLaunch.service.IProductLaunchService;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.salesPart.entity.PjStockDesc;
-import org.springblade.salesPart.vo.StockDescVO;
 import org.springblade.salesPart.stock.service.IStockDescService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.salesPart.vo.StockDescVO;
+import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -190,7 +180,7 @@ public class StockDescController extends BladeController {
 		lambdaQueryWrapper.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjStockDesc::getIsDeleted, 0)
 			.eq(PjStockDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
-			.eq(PjStockDesc::getStorageId, stockDesc.getStorageId())
+			.eq(ObjectUtils.isNotNull(stockDesc.getStorageId()), PjStockDesc::getStorageId, stockDesc.getStorageId())
 			.eq(PjStockDesc::getGoodsId, stockDesc.getGoodsId())
 			.ne(PjStockDesc::getDot, "")
 			.isNotNull(PjStockDesc::getDot);
@@ -216,10 +206,10 @@ public class StockDescController extends BladeController {
 			.eq(PjProductLaunch::getBillType, 0);
 		List<PjProductLaunch> productLaunches = productLaunchService.list(queryWrapper);
 
-		if (ObjectUtil.isNotEmpty(list)){
+		if (ObjectUtil.isNotEmpty(list)) {
 			list.forEach(e -> {
 				PjProductLaunch launch = productLaunches.stream().filter(productLaunch -> productLaunch.getGoodsId().equals(e.getGoodsId())).findFirst().orElse(null);
-				if (ObjectUtil.isNotEmpty(launch)){
+				if (ObjectUtil.isNotEmpty(launch)) {
 					list.remove(e);
 				}
 			});