2023年9月12日17:41:21

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/TradingBoxItem.java

@@ -210,6 +210,7 @@ public class TradingBoxItem implements Serializable {
 	 * 租金计算截止日期
 	 */
 	@ApiModelProperty(value = "租金计算截止日期")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date rentEndDate;
 
 	/**

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/check/entity/PjAuditProecess.java

@@ -26,6 +26,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 审批流记录实体类
@@ -122,6 +123,12 @@ public class PjAuditProecess implements Serializable {
 	 */
 	@ApiModelProperty(value = "业务日期")
 	private Date billTime;
+
+	/**
+	 * 业务日期
+	 */
+	@TableField(exist = false)
+	private List<String> billTimeList;
 	/**
 	 * 存储对应审批字段
 	 */

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/vo/PjOrderStatisticsWeb.java

@@ -98,5 +98,11 @@ public class PjOrderStatisticsWeb implements Serializable {
 	@TableField(exist = false)
 	private Integer type;
 
+	/**
+	 * 所属公司id
+	 */
+	@TableField(exist = false)
+	private Long salesCompanyId;
+
 
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxFeesController.java

@@ -180,7 +180,7 @@ public class TradingBoxFeesController extends BladeController {
 	@RepeatSubmit
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		TradingBoxFees tradingBoxFees = tradingBoxFeesService.getById(ids);
-		if (!AuthUtil.getUserRole().contains("管理员")) {
+		if (!AuthUtil.getUserRole().contains("admin")) {
 			if (ObjectUtils.isNotNull(tradingBoxFees) && !tradingBoxFees.getCreateUser().equals(AuthUtil.getUserId())) {
 				throw new RuntimeException("当前登录人没有删除该单据权限");
 			}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TransportItemFeesController.java

@@ -188,7 +188,7 @@ public class TransportItemFeesController extends BladeController {
 	@RepeatSubmit
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		TransportItemFees transportItemFees = transportItemFeesService.getById(ids);
-		if (!AuthUtil.getUserRole().contains("管理员")) {
+		if (!AuthUtil.getUserRole().contains("admin")) {
 			if (ObjectUtils.isNotNull(transportItemFees) && !transportItemFees.getCreateUser().equals(AuthUtil.getUserId())) {
 				throw new RuntimeException("当前登录人没有删除该单据权限");
 			}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/controller/BrandDescController.java

@@ -233,6 +233,7 @@ public class BrandDescController extends BladeController {
 		lambdaQueryWrapper.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjBrandDesc::getIsDeleted, 0)
 			.eq(PjBrandDesc::getType, brandDesc.getType())
+			.eq(PjBrandDesc::getEnableOrNot, brandDesc.getEnableOrNot())
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname())
 		.orderByDesc(PjBrandDesc::getSort);
 		if (!AuthUtil.getUserRole().contains("admin")) {
@@ -261,6 +262,7 @@ public class BrandDescController extends BladeController {
 		lambdaQueryWrapper.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjBrandDesc::getIsDeleted, 0)
 			.eq(PjBrandDesc::getType, brandDesc.getType())
+			.eq(PjBrandDesc::getEnableOrNot, brandDesc.getEnableOrNot())
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname())
 			.orderByDesc(PjBrandDesc::getSort);
 		List<PjBrandDesc> list = brandDescService.list(lambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/check/controller/AuditProecessController.java

@@ -93,6 +93,10 @@ public class AuditProecessController extends BladeController {
 		lambdaQueryWrapper.gt(auditProecess.getApplybegintime() != null, PjAuditProecess::getSendTime, auditProecess.getApplybegintime());//请核时间
 		lambdaQueryWrapper.le(auditProecess.getApplyendtime() != null, PjAuditProecess::getSendTime, auditProecess.getApplyendtime());
 		lambdaQueryWrapper.orderByDesc(PjAuditProecess::getSendTime);
+		if (ObjectUtils.isNotNull(auditProecess.getBillTimeList())){
+			lambdaQueryWrapper.gt( PjAuditProecess::getBillTime, auditProecess.getBillTimeList().get(0));
+			lambdaQueryWrapper.le( PjAuditProecess::getBillTime, auditProecess.getBillTimeList().get(1));
+		}
 		lambdaQueryWrapper.ne(StringUtils.isBlank(auditProecess.getAuditStatus()), PjAuditProecess::getAuditStatus, "N");
 		if (!AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(PjAuditProecess::getSalesCompanyId, AuthUtil.getDeptId());//公司

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsDescController.java

@@ -326,7 +326,7 @@ public class CorpsDescController extends BladeController {
 		lambdaQueryWrapper.eq(PjCorpsDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjCorpsDesc::getIsDeleted, 0)
 			.eq(PjCorpsDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
-			.eq(PjCorpsDesc::getCorpType, corpsDesc.getCorpType())
+			.apply("find_in_set(corp_type,'" + corpsDesc.getCorpType() + "')")
 			.eq(ObjectUtils.isNotNull(corpsDesc.getEnableOrNot()), PjCorpsDesc::getEnableOrNot, corpsDesc.getEnableOrNot())
 			.like(ObjectUtils.isNotNull(corpsDesc.getCname()), PjCorpsDesc::getCname, corpsDesc.getCname());
 		if (AuthUtil.getUserRole().contains("业务员")) {

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

@@ -37,6 +37,7 @@ 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.corps.service.ICorpsAttnService;
+import org.springblade.salesPart.entity.PjBrandDesc;
 import org.springblade.salesPart.entity.PjCorpsAttn;
 import org.springblade.salesPart.entity.PjOrder;
 import org.springblade.salesPart.entity.PjOrderItems;
@@ -678,7 +679,7 @@ public class OrderController extends BladeController {
 			lambdaQueryWrapper.eq(PjOrder::getGenerateTask, "已生成")
 				.apply("find_in_set(actual_payment_status,'1,3')");
 		} else if ("c".equals(order.getSettlementType())) {
-			lambdaQueryWrapper.eq(PjOrder::getStatus, "审核完成")
+			lambdaQueryWrapper.eq(PjOrder::getCheckStatus, "审核完成")
 				.apply("find_in_set(actual_payment_status,'1,3')");
 		}
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
@@ -744,6 +745,9 @@ public class OrderController extends BladeController {
 	@GetMapping("/statistics")
 	@ApiOperation(value = "app营业分析", notes = "传入参数")
 	public R<IPage<PjOrderStatisticsWeb>> statistics(PjOrderStatisticsWeb order, Query query) {
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			order.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
+		}
 		IPage<PjOrderStatisticsWeb> pages = orderService.statisticsPage(Condition.getPage(query), order);
 		return R.data(pages);
 	}
@@ -754,6 +758,9 @@ public class OrderController extends BladeController {
 	@GetMapping("/statistics-export")
 	@ApiOperation(value = "app营业分析", notes = "传入参数")
 	public void statisticsExport(PjOrderStatisticsWeb order, HttpServletResponse response) {
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			order.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
+		}
 		List<PjOrderStatisticsExcel> list = orderService.statisticsExport(order);
 		ExcelUtil.export(response, "利润统计", "利润统计", list, PjOrderStatisticsExcel.class);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -81,11 +81,14 @@
         <if test="order.salesCompanyId!=null">
             and po.sales_company_id = #{order.salesCompanyId}
         </if>
-        <if test="order.businesDate == null">
+        <if test="order.businesDateList == null">
             AND DATE_FORMAT(po.busines_date, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
         </if>
-        <if test="order.salesCompanyId !=null">
-            AND DATE_FORMAT(po.busines_date, '%Y-%m') = DATE_FORMAT(#{order.businesDate}, '%Y-%m')
+        <if test="order.businesDateList !=null and order.businesDateList[0] != '' and order.businesDateList[0] != null">
+            AND DATE_FORMAT(po.busines_date, '%Y-%m') &gt;= #{order.businesDateList[0]}
+        </if>
+        <if test="order.businesDateList !=null and order.businesDateList[1] != '' and order.businesDateList[1] != null">
+            AND DATE_FORMAT(po.busines_date, '%Y-%m') &lt;= #{order.businesDateList[1]}
         </if>
         GROUP BY po.customer_id) as po1 on pcd.id = po1.customer_id
         LEFT JOIN (SELECT
@@ -102,8 +105,14 @@
         <if test="order.salesCompanyId!=null">
             and po.sales_company_id = #{order.salesCompanyId}
         </if>
-        <if test="order.salesCompanyId !=null">
-            AND DATE_FORMAT(po.busines_date, '%Y-%m') = DATE_FORMAT(#{order.businesDate}, '%Y-%m')
+        <if test="order.businesDateList == null">
+            AND DATE_FORMAT(po.busines_date, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+        </if>
+        <if test="order.businesDateList !=null and order.businesDateList[0] != '' and order.businesDateList[0] != null">
+            AND DATE_FORMAT(po.busines_date, '%Y-%m') &gt;= #{order.businesDateList[0]}
+        </if>
+        <if test="order.businesDateList !=null and order.businesDateList[1] != '' and order.businesDateList[1] != null">
+            AND DATE_FORMAT(po.busines_date, '%Y-%m') &lt;= #{order.businesDateList[1]}
         </if>
         GROUP BY po.customer_id) as po2 on pcd.id = po2.customer_id
         where pcd.corp_type = 'KH'
@@ -252,6 +261,9 @@
         <if test="order.businesDateList !=null and order.businesDateList !='' and order.businesDateList[1] != ''">
             and DATE_FORMAT(o.busines_date,'%Y-%m') &lt;= #{order.businesDateList[1]}
         </if>
+        <if test="order.salesCompanyId != null">
+            and o.sales_company_id = #{order.salesCompanyId}
+        </if>
         <if test="order.type != null and order.type  == 0">
             and o.bs_type = 'XS'
         </if>

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

@@ -181,7 +181,24 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		shipLambdaQueryWrapper.eq(PjShip::getTenantId, AuthUtil.getTenantId())
 			.eq(PjShip::getIsDeleted, 0)
 			.eq(PjShip::getOrdId, detail.getId());
-		detail.setOutboundRecordsList(shipMapper.selectList(shipLambdaQueryWrapper));
+		List<PjShip> pjShipList = shipMapper.selectList(shipLambdaQueryWrapper);
+		for (PjShip item : pjShipList) {
+			if ("SHGD".equals(item.getBizTypeName())) {
+				item.setBizTypeName("入库工单");
+			} else if ("SHRW".equals(item.getBizTypeName())) {
+				item.setBizTypeName("入库任务");
+			} else if ("FHRW".equals(item.getBizTypeName())) {
+				item.setBizTypeName("出库任务");
+			} else if ("FHGD".equals(item.getBizTypeName())) {
+				item.setBizTypeName("出库工单");
+			} else if ("TKSHGD".equals(item.getBizTypeName())) {
+				item.setBizTypeName("退款入库");
+			} else {
+				item.setBizTypeName("");
+			}
+		}
+
+		detail.setOutboundRecordsList(pjShipList);
 		return detail;
 	}
 
@@ -541,11 +558,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		}
 		BeanUtil.copyProperties(pjOrder, pjShip);
 		pjShip.setId(null);
-//		pjShip.setStockClerkName();
-		if (ObjectUtils.isNotNull(pjOrder.getStorageId())) {
-			//仓库名称
-			pjShip.setStorageName(storageDescMapper.selectById(pjOrder.getStorageId()).getCname());
+		if (Long.parseLong(AuthUtil.getDeptId()) == pjOrder.getSalesCompanyId()) {
+			if (ObjectUtils.isNotNull(pjOrder.getStorageId())) {
+				//仓库名称
+				pjShip.setStorageName(storageDescMapper.selectById(pjOrder.getStorageId()).getCname());
+			}
+		} else {
+			pjShip.setStorageId(null);
 		}
+
 		pjShip.setBusinesDate(new Date());
 		pjShip.setBillno((String) billNo.getData());
 		pjShip.setOrdNo(pjOrder.getOrdNo());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/controller/ProductLaunchController.java

@@ -33,8 +33,10 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 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.brand.service.IBrandFilesService;
 import org.springblade.salesPart.corps.service.ICorpsAttnService;
 import org.springblade.salesPart.corps.service.ICorpsDescService;
 import org.springblade.salesPart.entity.*;
@@ -67,6 +69,7 @@ import java.util.stream.Collectors;
 public class ProductLaunchController extends BladeController {
 
 	private final IProductLaunchService productLaunchService;
+	private final IBrandFilesService brandFilesService;
 	private final IProductLaunchFilesService productLaunchFilesService;
 	private final ICorpsAttnService corpsAttnService;//客户联系人
 	private final ICorpsDescService corpsDescService;//客户
@@ -128,7 +131,7 @@ public class ProductLaunchController extends BladeController {
 					.map(Dept::getFullName).collect(Collectors.joining(" | "));
 				item.setSharedCompany(deptName);
 			}
-			item.setFilesList(productLaunchFilesService.list(new QueryWrapper<PjProductLaunchFiles>().eq("pid", item.getId()).eq("is_deleted", 0).eq("main_image",0)));
+			item.setFilesList(productLaunchFilesService.list(new QueryWrapper<PjProductLaunchFiles>().eq("pid", item.getId()).eq("is_deleted", 0).eq("main_image", 0)));
 		}
 		return R.data(pages);
 	}
@@ -322,7 +325,12 @@ public class ProductLaunchController extends BladeController {
 			pages.getRecords().stream().forEach(item -> {
 				item.setFilesList(productLaunchFilesService.list(new QueryWrapper<PjProductLaunchFiles>()
 					.eq("pid", item.getId()).eq("is_deleted", 0)));
-
+				if (ObjectUtils.isNull(item.getFilesList()) || item.getFilesList().size() == 0) {
+					if (ObjectUtils.isNotNull(item.getBrandId())) {
+						item.setFilesList(BeanUtil.copy(brandFilesService.list(new QueryWrapper<PjBrandFiles>()
+							.eq("pid", item.getBrandId()).eq("is_deleted", 0)), PjProductLaunchFiles.class));
+					}
+				}
 				if (StringUtils.isNotBlank(finalCorpsDesc.getPriceSystem())) {
 					if ("售价1".equals(finalCorpsDesc.getPriceSystem())) {
 						item.setMallPrice(item.getPriceOne());

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

@@ -570,7 +570,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R revokeOutboundCompleted(PjShip ship) {
-		ship.setStatusName(OrderTypeEnum.REVOKEOURTBOUND.getType());
+		ship.setStatusName(OrderTypeEnum.TOBESHIPPEDOUT.getType());
 		ship.setUpdateUser(AuthUtil.getUserId());
 		ship.setUpdateTime(new Date());
 		baseMapper.updateById(ship);
@@ -661,7 +661,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 		}
 
 		//生成出库工单历史记录
-		saveHistory(ship.getId(), OrderTypeEnum.REVOKEOURTBOUND.getType());
+		saveHistory(ship.getId(), OrderTypeEnum.TOBESHIPPEDOUT.getType());
 
 		return R.data(ship);
 	}
@@ -1342,9 +1342,9 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			ship.setNumberRows(ship.getShipItemsList().size());
 		}
 		//生成出库工单历史记录
-		saveHistory(ship.getId(), OrderTypeEnum.REVOKE.getType());
+		saveHistory(ship.getId(), OrderTypeEnum.TREATWAREHOUSING.getType());
 
-		ship.setStatusName(OrderTypeEnum.REVOKE.getType());
+		ship.setStatusName(OrderTypeEnum.TREATWAREHOUSING.getType());
 		baseMapper.updateById(ship);
 		//修改任务发货数量
 		PjShip rwShip = baseMapper.selectById(ship.getTaskId());

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

@@ -154,6 +154,12 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 			}
 
 			Integer i = 1;
+			// 获取系统编号
+			R SrcOrdNo = serialClient.getBillNo("XS", "XS", "XS");
+			if (SrcOrdNo.getCode() != 200) {
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+				throw new RuntimeException("生成系统编号失败");
+			}
 			for (Map<String, Object> map : list) {
 				String k = (String) map.get("name");
 				if (StringUtil.isNotBlank(k)) {
@@ -164,12 +170,6 @@ 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) SrcOrdNo.getData());
 					} else {

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

@@ -230,6 +230,7 @@ public class StockGoodsClient implements IStockGoodsClient {
 			ids.append(item.getStorageId()).append(",");
 			corpIds.append(item.getCorpId()).append(",");
 		});
+		List<StockGoods> listNew = new ArrayList<>();
 		List<StorageDesc> storageDescList = storageClient.selectStorageIds(ids.toString());
 		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds.toString());
 		for (StockGoods stockGoods1 : list) {
@@ -237,6 +238,13 @@ public class StockGoodsClient implements IStockGoodsClient {
 			String corpName = corpsDescList.stream().filter(e -> stockGoods1.getCorpId().equals(e.getId())).findFirst().orElse(new CorpsDesc()).getCname();
 			stockGoods1.setStorageName(name);
 			stockGoods1.setCorpName(corpName);
+			if ("681169".equals(AuthUtil.getTenantId())){
+				listNew.add(stockGoods1);
+			}else{
+				if (new BigDecimal("0.00").compareTo(stockGoods1.getBalanceQuantity()) != 0) {
+					listNew.add(stockGoods1);
+				}
+			}
 		}
 		/*BigDecimal reduce = null;
 		if (CollectionUtils.isNotEmpty(list)) {
@@ -244,7 +252,7 @@ public class StockGoodsClient implements IStockGoodsClient {
 		} else {
 			reduce = new BigDecimal("0");
 		}*/
-		return R.data(list);
+		return R.data(listNew);
 	}
 
 	@Override