分管员

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -414,4 +414,16 @@ public class GoodsDesc implements Serializable {
 	@TableField(exist = false)
 	private BigDecimal salesPrice;
 
+	/**
+	 * 分管员idList
+	 */
+	@ApiModelProperty("分管员id组")
+	private String supervisorUserIdGroup;
+
+	/**
+	 * 分管员名List
+	 */
+	@ApiModelProperty("分管员名组")
+	private String supervisorUserNameGroup;
+
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceBank.java

@@ -280,4 +280,15 @@ public class PriceBank implements Serializable {
 	@ApiModelProperty(value = "计量单位")
 	private String unit;
 
+	/**
+	 * 分管员idList
+	 */
+	@ApiModelProperty("分管员id组")
+	private String supervisorUserIdGroup;
+
+	/**
+	 * 分管员名List
+	 */
+	@ApiModelProperty("分管员名组")
+	private String supervisorUserNameGroup;
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/feign/IPriceBankClient.java

@@ -62,7 +62,9 @@ public interface IPriceBankClient {
 					  @RequestParam(value = "priorityReferrer",required = false) Integer priorityReferrer,
 					  @RequestParam(value = "referrerReason",required = false) String referrerReason,
 					@RequestParam(value = "remarks",required = false) String remarks,
-					@RequestParam(value = "unit",required = false) String unit);
+					@RequestParam(value = "unit",required = false) String unit,
+					@RequestParam(value = "supervisorUserIdGroup",required = false) String supervisorUserIdGroup,
+					@RequestParam(value = "supervisorUserNameGroup",required = false) String supervisorUserNameGroup);
 
 	/**
 	 * 通过ids查看数据

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/OrderItems.java

@@ -713,4 +713,23 @@ public class OrderItems extends OrderBase {
 	 */
 	@ApiModelProperty(value = "出库日期")
 	private Date deliveryDate;
+
+	// 福达打印表单需求临时注销
+//	/**
+//	 * 账户id
+//	 */
+//	@ApiModelProperty(value = "账户id")
+//	private Long corpsBankId;
+
+	/**
+	 * 分管员idList
+	 */
+	@ApiModelProperty("分管员id组")
+	private String supervisorUserIdGroup;
+
+	/**
+	 * 分管员名List
+	 */
+	@ApiModelProperty("分管员名组")
+	private String supervisorUserNameGroup;
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -427,7 +427,8 @@ public class GoodsDescController extends BladeController {
 	}
 
 	/**
-	 * 分页 商品详情表
+	 * 修改商品信息
+	 * // 分页 商品详情表
 	 */
 	@PostMapping("/modify")
 	@ApiOperationSupport(order = 2)

blade-service/blade-client/src/main/java/org/springblade/client/goods/mapper/GoodsDescMapper.java

@@ -49,7 +49,7 @@ public interface GoodsDescMapper extends BaseMapper<GoodsDesc> {
 	 * @param goodsDesc
 	 * @return
 	 */
-	List<GoodsDescVO> selectGoods (IPage page,@Param("GoodsDesc") GoodsDesc goodsDesc);
+	List<GoodsDescVO> selectGoods (@Param("page") IPage page, @Param("GoodsDesc") GoodsDesc goodsDesc, @Param("operationalUserId") Long operationalUserId);
 
 	/**
 	 * 根据销售明细的商品id获得商品信息

blade-service/blade-client/src/main/java/org/springblade/client/goods/mapper/GoodsDescMapper.xml

@@ -154,6 +154,9 @@
         from basic_goods_desc bg
         LEFT JOIN basic_goods_type ba ON ba.id = bg.goods_type_id AND ba.status = 0 AND ba.is_deleted = 0
         where bg.is_deleted = 0
+        <if test="operationalUserId != null and operationalUserId != ''">
+          and (bg.supervisor_user_id_group like concat(concat('%',  #{operationalUserId}),'%') or bg.supervisor_user_id_group is null or bg.supervisor_user_id_group = '')
+        </if>
         <if test="GoodsDesc.id!=null">
             and bg.id = #{GoodsDesc.id}
         </if>
@@ -202,7 +205,7 @@
         <if test='GoodsDesc.goodsTypeIdList!=null and GoodsDesc.goodsTypeIdList != ""'>
             AND goods_type_id  in
             <foreach collection="GoodsDesc.goodsTypeIdList" index="index" item="item" open="(" separator="," close=")">
-                #{item}
+                #{page.item}
             </foreach>
         </if>
     </select>

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -187,7 +187,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 
 	@Override
 	public IPage<GoodsDescVO> selectGoods(IPage<GoodsDescVO> page, GoodsDesc goodsDesc) {
-		return page.setRecords(baseMapper.selectGoods(page, goodsDesc));
+		return page.setRecords(baseMapper.selectGoods(page, goodsDesc, AuthUtil.getUserId()));
 	}
 
 	@Override

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -39,6 +39,7 @@ import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.excel.util.ExcelUtil;
 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.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -158,6 +159,11 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(priceBank.getDateValidityEnd()),PriceBank::getEndTime,priceBank.getDateValidityEnd());
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()),PriceBank::getBillType,priceBank.getBillType());
 		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
+
+		lambdaQueryWrapper.and(qw -> qw.like(PriceBank::getSupervisorUserIdGroup, AuthUtil.getUserId())
+										.or().isNull(PriceBank::getSupervisorUserIdGroup)
+										.or().eq(PriceBank::getSupervisorUserIdGroup, ""));
+
 		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/feign/PriceBankClient.java

@@ -68,7 +68,9 @@ public class PriceBankClient implements IPriceBankClient {
 						   Integer priorityReferrer,
 						   String referrerReason,
 						   String remarks,
-						   String unit) {
+						   String unit,
+						   String supervisorUserIdGroup,
+						   String supervisorUserNameGroup) {
 
 		Date date = new Date();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -113,6 +115,8 @@ public class PriceBankClient implements IPriceBankClient {
 		bank.setPriorityReferrer(priorityReferrer);
 		bank.setReferrerReason(referrerReason);
 		bank.setUnit(unit);
+		bank.setSupervisorUserIdGroup(supervisorUserIdGroup);
+		bank.setSupervisorUserNameGroup(supervisorUserNameGroup);
 		if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 			bank.setCorpName(corpMessage.getData().getCname());
 		}

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceBankServiceImpl.java

@@ -167,6 +167,8 @@ public class PriceBankServiceImpl extends ServiceImpl<PriceBankMapper, PriceBank
 						priceBank.setCode(goodName.getCode());//商品编码
 						priceBank.setSpecs(goodName.getTypeno());//商品中文规格
 						priceBank.setCnameDescription(goodName.getCnameDescription());//英文描述
+						priceBank.setSupervisorUserIdGroup(goodName.getSupervisorUserIdGroup());//分管员id组
+						priceBank.setSupervisorUserNameGroup(goodName.getSupervisorUserNameGroup());//分管员名组
 						//查询是否存在
 						LambdaQueryWrapper<PriceBank> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 						lambdaQueryWrapper.eq(PriceBank::getCorpId, priceBank.getCorpId());

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

@@ -573,8 +573,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					item.setUpdateUser(SecureUtil.getUserId());
 					orderItemsService.updateById(item);
 				}
-				priceBankClient.updatePrice(item.getItemId(), item.getPrice(), SecureUtil.getTenantId(), item.getCorpId(), item.getItemType(), OrderTypeEnum.PURCHASE.getType(), order.getTradeType(),
-					item.getExchangeRate(), item.getGreenback(), item.getCurrency(), item.getCoefficient(), item.getTaxRate(), format, item.getPurchaseAmount(), item.getPriorityReferrer(), item.getReferrerReason(), item.getRemarks(), item.getUnit());
+				priceBankClient.updatePrice(item.getItemId(), item.getPrice(), SecureUtil.getTenantId(), item.getCorpId()
+					, item.getItemType(), OrderTypeEnum.PURCHASE.getType(), order.getTradeType(),
+					item.getExchangeRate(), item.getGreenback(), item.getCurrency(), item.getCoefficient()
+					, item.getTaxRate(), format, item.getPurchaseAmount(), item.getPriorityReferrer()
+					, item.getReferrerReason(), item.getRemarks(), item.getUnit()
+					, item.getSupervisorUserIdGroup(), item.getSupervisorUserNameGroup());
 			});
 		}
 		return R.data(order);