2023年7月20日13:49:10

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/PjShipStockDetails.java

@@ -105,4 +105,9 @@ public class PjShipStockDetails implements Serializable {
 	 */
 	private String salesCompanyId;
 
+	/**
+	 * 租户id
+	 */
+	private String tenantId;
+
 }

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

@@ -19,9 +19,8 @@ package org.springblade.salesPart.vo;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springblade.common.execl.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -215,7 +215,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 				SimpleDateFormat simpleDateFormat = new SimpleDateFormat();
 				String corpName = null;
 				if (auditProecessDTO.getCorpId() != null) {
-					if ("883868".equals(AuthUtil.getTenantId())){
+					String status = sysClient.getParamService("mall.data");
+					if (ObjectUtils.isNotNull(status) && "1".equals(status)){
 						PjCorpsDesc corpMessage = ipjCorpClient.getByCorp(auditProecessDTO.getCorpId());
 						if (corpMessage != null) {
 							corpName = corpMessage.getCname();

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/AllotController.java

@@ -100,6 +100,8 @@ public class AllotController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getDeliveryRemarks()), Delivery::getDeliveryRemarks, delivery.getDeliveryRemarks());//备注
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()), Delivery::getCreateUser, delivery.getCreateUser());//制单人
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()), Delivery::getStorageId, delivery.getStorageId());//仓库
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getVoucherNo()), Delivery::getVoucherNo, delivery.getVoucherNo());//状态
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getVoucherStatus()), Delivery::getVoucherStatus, delivery.getVoucherStatus());//状态
 		lambdaQueryWrapper.orderByDesc(Delivery::getId);
 		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())) {

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -226,6 +226,8 @@ public class DeliveryController extends BladeController {
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getDeliveryStatus()),Delivery::getDeliveryStatus,delivery.getDeliveryStatus());//状态
 		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getArrivalStartTime()),Delivery::getArrivalTime,delivery.getArrivalStartTime());//确认到货日期开始
 		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getArrivalEndTime()),Delivery::getArrivalTime,delivery.getArrivalEndTime());//确认到货日期结束
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getVoucherNo()), Delivery::getVoucherNo, delivery.getVoucherNo());//状态
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getVoucherStatus()), Delivery::getVoucherStatus, delivery.getVoucherStatus());//状态
 		lambdaQueryWrapper.orderByDesc(Delivery::getId);
 		List<Delivery> list = deliveryService.list(lambdaQueryWrapper);
 

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ReCeVingController.java

@@ -124,6 +124,7 @@ public class ReCeVingController extends BladeController {
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()), Delivery::getStorageId, delivery.getStorageId());//仓库
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getDeliveryStatus()), Delivery::getDeliveryStatus, delivery.getDeliveryStatus());//状态
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getVoucherStatus()), Delivery::getVoucherStatus, delivery.getVoucherStatus());//状态
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getVoucherNo()), Delivery::getVoucherNo, delivery.getVoucherNo());//状态
 		lambdaQueryWrapper.orderByDesc(Delivery::getCreateTime);
 		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		//解决回显字段问题

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/controller/WechatMarkController.java

@@ -33,6 +33,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.pay.tonglianPayment.entity.WechatMark;
 import org.springblade.pay.tonglianPayment.service.IWechatMarkService;
 import org.springblade.pay.tonglianPayment.vo.WechatMarkVO;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -51,6 +52,8 @@ public class WechatMarkController extends BladeController {
 
 	private final IWechatMarkService wechatMarkService;
 
+	private final ISysClient sysClient;
+
 	/**
 	 * 详情
 	 */
@@ -75,7 +78,8 @@ public class WechatMarkController extends BladeController {
 			.eq(ObjectUtils.isNotNull(wechatMark.getType()), WechatMark::getType, wechatMark.getType())
 			.like(ObjectUtils.isNotNull(wechatMark.getSerialNumber()), WechatMark::getSerialNumber, wechatMark.getSerialNumber())
 			.eq(ObjectUtils.isNotNull(wechatMark.getStatus()), WechatMark::getStatus, wechatMark.getStatus());
-		if ("883868".equals(AuthUtil.getTenantId())) {
+		String status = sysClient.getParamService("mall.data");
+		if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
 			lambdaQueryWrapper.and(ObjectUtils.isNotNull(wechatMark.getSrcBillNo()), i -> i.like(WechatMark::getSrcBillNo, wechatMark.getSrcBillNo())
 				.or().like(WechatMark::getBillNo, wechatMark.getSrcBillNo()));
 		} else {

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

@@ -578,6 +578,7 @@ public class OrderController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入order")
 	public R<IPage<OrderStatistics>> collectionStatistics(OrderVO order, Query query) {
+		order.setTenantId(AuthUtil.getTenantId());
 		IPage<OrderStatistics> pages = orderService.collectionStatistics(Condition.getPage(query), order);
 		return R.data(pages);
 	}
@@ -589,6 +590,7 @@ public class OrderController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入order")
 	public void  collectionExport(OrderVO order, HttpServletResponse response) {
+		order.setTenantId(AuthUtil.getTenantId());
 		List<OrderStatistics> list = orderService.collectionStatisticsList(order);
 		ExcelUtil.export(response, "应收款统计", "应收款统计", list, OrderStatistics.class);
 

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

@@ -74,7 +74,7 @@
         pjpf_order po
         WHERE
          po.is_deleted = 0
-        AND po.tenant_id = '883868'
+        AND po.tenant_id = #{order.tenantId}
         AND po.bs_type = 'XS'
         AND po.business_source ='内部销售'
         and FIND_IN_SET(po.`status`,'待确认,待发货,已发货,退款请核')
@@ -95,7 +95,7 @@
         pjpf_order po
         WHERE
          po.is_deleted = 0
-        AND po.tenant_id = '883868'
+        AND po.tenant_id = #{order.tenantId}
         AND po.bs_type = 'XS'
         AND po.business_source ='内部销售'
         and FIND_IN_SET(po.`status`,'待确认,待发货,已发货,退款请核')
@@ -178,7 +178,7 @@
         pjpf_order po
         WHERE
         po.is_deleted = 0
-        AND po.tenant_id = '883868'
+        AND po.tenant_id = #{order.tenantId}
         AND po.bs_type = 'XS'
         AND po.business_source ='内部销售'
         and FIND_IN_SET(po.`status`,'待确认,待发货,已发货,退款请核')
@@ -199,7 +199,7 @@
         pjpf_order po
         WHERE
         po.is_deleted = 0
-        AND po.tenant_id = '883868'
+        AND po.tenant_id = #{order.tenantId}
         AND po.bs_type = 'XS'
         AND po.business_source ='内部销售'
         and FIND_IN_SET(po.`status`,'待确认,待发货,已发货,退款请核')

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

@@ -98,6 +98,7 @@ public class ProductLaunchController extends BladeController {
 		lambdaQueryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
 			.eq(PjProductLaunch::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(productLaunch.getBrandId()), PjProductLaunch::getBrandId, productLaunch.getBrandId())
+			.like(ObjectUtils.isNotNull(productLaunch.getBrandItem()), PjProductLaunch::getBrandItem, productLaunch.getBrandItem())
 			.eq(PjProductLaunch::getBillType, productLaunch.getBillType());
 		lambdaQueryWrapper.like(ObjectUtils.isNotEmpty(productLaunch.getSpecificationAndModel()), PjProductLaunch::getSpecificationAndModel, productLaunch.getSpecificationAndModel())//规格型号
 			.eq(ObjectUtil.isNotEmpty(productLaunch.getUpAndDownShelves()), PjProductLaunch::getUpAndDownShelves, productLaunch.getUpAndDownShelves());//上下架

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/controller/ShipController.java

@@ -371,6 +371,7 @@ public class ShipController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入order")
 	public R<List<PjShipStockDetails>> stockDataDetails(PjShipStockDetails pjShipStockDetails) {
 		pjShipStockDetails.setSalesCompanyId(AuthUtil.getDeptId());
+		pjShipStockDetails.setTenantId(AuthUtil.getTenantId());
 		List<PjShipStockDetails> pages = shipService.stockDataDetails(pjShipStockDetails);
 		return R.data(pages);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/mapper/ShipMapper.xml

@@ -75,9 +75,9 @@
             `pjpf_ship` ps
                 LEFT JOIN pjpf_ship_items psi ON ps.id = psi.pid
         WHERE
-            ps.tenant_id = '883868'
-          AND ps.is_deleted = '0'
+             ps.is_deleted = '0'
           AND FIND_IN_SET( ps.biz_type_name, 'FHGD,SHGD,TKSHGD' )
+            AND ps.tenant_id = #{order.tenantId}
         <if test="order.storageId!=null">
             and ps.storage_id = #{order.storageId}
         </if>

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -58,8 +58,9 @@ public class UserClient implements IUserClient {
 		LambdaQueryWrapper<User> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		userLambdaQueryWrapper
 			.eq(User::getIsDeleted, 0);
+		String status = sysClient.getParamService("mall.data");
 		if (ObjectUtils.isNotNull(tenantId) && ObjectUtils.isNotNull(salesCompanyId)){
-			if ("883868".equals(tenantId)) {
+			if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
 				userLambdaQueryWrapper.eq(User::getDeptId, salesCompanyId)
 					.apply("find_in_set('" + roleId + "',role_id)");
 			} else {
@@ -67,7 +68,7 @@ public class UserClient implements IUserClient {
 			}
 			userLambdaQueryWrapper.eq(User::getTenantId,tenantId);
 		}else{
-			if ("883868".equals(AuthUtil.getTenantId())) {
+			if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
 				userLambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId())
 					.apply("find_in_set('" + roleId + "',role_id)");
 			} else {
@@ -114,7 +115,8 @@ public class UserClient implements IUserClient {
 				.eq(User::getIsDeleted, 0)
 				.eq(User::getTenantId, AuthUtil.getTenantId())
 				.apply("find_in_set('" + res.getData() + "',role_id)");
-			if ("883868".equals(AuthUtil.getTenantId())) {
+			String status = sysClient.getParamService("mall.data");
+			if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
 				userLambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId());
 			}
 			return service.list(userLambdaQueryWrapper);

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserSearchServiceImpl.java

@@ -18,10 +18,12 @@ package org.springblade.system.user.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.mapper.UserMapper;
 import org.springblade.system.user.service.IUserSearchService;
@@ -39,6 +41,8 @@ import java.util.List;
 @AllArgsConstructor
 public class UserSearchServiceImpl extends BaseServiceImpl<UserMapper, User> implements IUserSearchService {
 
+	private final ISysClient sysClient;
+
 	@Override
 	public List<User> listByUser(List<Long> userId) {
 		return this.list(Wrappers.<User>lambdaQuery().in(User::getId, userId));
@@ -61,7 +65,8 @@ public class UserSearchServiceImpl extends BaseServiceImpl<UserMapper, User> imp
 	@Override
 	public List<User> listByRole(List<Long> roleId) {
 		LambdaQueryWrapper<User> queryWrapper = Wrappers.lambdaQuery();
-		if ("883868".equals(AuthUtil.getTenantId())) {
+		String status = sysClient.getParamService("mall.data");
+		if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
 			queryWrapper.apply("find_in_set(dept_id,'" + AuthUtil.getDeptId() + "')");
 		}
 		roleId.forEach(id -> queryWrapper.like(User::getRoleId, id).or());

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -20,6 +20,7 @@ package org.springblade.system.user.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
@@ -442,7 +443,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
 	@Override
 	public List<Map<String, Object>> gainUser(String tenantId) {
-		if ("883868".equals(AuthUtil.getTenantId())) {
+		String status = sysClient.getParamService("mall.data");
+		if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
 			return baseMapper.gainUser(tenantId, AuthUtil.getDeptId());
 		} else {
 			return baseMapper.gainUser(tenantId, null);

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

@@ -2206,7 +2206,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				Rk.setId(orderItems.getSrcItemId());
 				Rk.setIsIssue(isIssue);
 				Rk.setScanningComparison(scanningComparison);
+				Rk.setDeliveryDate(new Date());
 				orderItems.setIsIssue(isIssue);
+				orderItems.setDeliveryDate(new Date());
 				orderItems.setScanningComparison(scanningComparison);
 				orderItemsMapper.updateById(Rk);
 				orderItemsMapper.updateById(orderItems);