权限管理搁置

hx-common/src/main/java/com/fjhx/common/utils/AuthorityUtils.java

@@ -3,33 +3,29 @@ package com.fjhx.common.utils;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.mybatis.holder.TenantHolder;
 
 import java.util.List;
 import java.util.Objects;
 
 public class AuthorityUtils {
 
-    /**
-     * 是000000租户且角色是高级权限的可看所有数据
-     */
-    private static boolean authorityFilter() {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        String tenantId = user.getTenantId();
-        List<SysRole> sysRoleList = user.getRoles();
-        for (SysRole sysRole : sysRoleList) {
-            if (Objects.equals(sysRole.getAuthorityLv(), 99) && Objects.equals(tenantId, "000000")) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * 高权限判断
+	 */
+	private static boolean isHighAuthority() {
+		SysUser user = SecurityUtils.getLoginUser().getUser();
+		List<SysRole> sysRoleList = user.getRoles();
+		boolean flag = false;
+		for (SysRole sysRole : sysRoleList) {
+			flag = flag || Objects.equals(sysRole.getAuthorityLv(), 99);
+		}
+		//-----------------------------------------------------------------
+//		1.角色是高权限 And 归属集团[000000租户]，看所有数据不限制
+//		2.角色是高权限，看所在公司的所有数据
+//		3.角色是低权限，看自己的数据
+
+
+		return false;
+	}
 
-    public static void filterSta() {
-        if (authorityFilter()) {
-            TenantHolder.setIgnore(true);
-        } else {
-            TenantHolder.clear();
-        }
-    }
 }

hx-mes/src/main/java/com/fjhx/mes/entity/produce/dto/ProduceOrderSelectDto.java

@@ -1,9 +1,12 @@
 package com.fjhx.mes.entity.produce.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * 生产订单列表查询入参实体
  *
@@ -14,4 +17,21 @@ import lombok.Setter;
 @Setter
 public class ProduceOrderSelectDto extends BaseSelectDto {
 
+	/**
+	 * 生产状态 0未开始 1进行中 2已完成
+	 */
+	private Integer produceStatus;
+
+	/**
+	 * 交期开始时间
+	 */
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	private Date staDeliveryPeriod;
+
+	/**
+	 * 交期结束时间
+	 */
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	private Date endDeliveryPeriod;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/produce/impl/ProduceOrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,6 +59,18 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
 	public Page<ProduceOrderVo> getPage(ProduceOrderSelectDto dto) {
 		IWrapper<ProduceOrder> wrapper = getWrapper();
 		wrapper.orderByDesc("po", ProduceOrder::getId);
+
+		//生产状态
+		wrapper.eq(ProduceOrder::getProduceStatus, dto.getProduceStatus());
+		//交期-时间范围过滤
+		wrapper.ge("po", ProduceOrder::getDeliveryPeriod, dto.getStaDeliveryPeriod());
+		wrapper.le("po", ProduceOrder::getDeliveryPeriod, dto.getEndDeliveryPeriod());
+		//下单时间（创建时间）-时间范围过滤
+		wrapper.ge("po", ProduceOrder::getCreateTime, dto.getBeginTime());
+		wrapper.le("po", ProduceOrder::getCreateTime, dto.getEndTime());
+		//关键字
+		wrapper.keyword(dto.getKeyword(), new SqlField(ProduceOrder::getCode));
+
 		Page<ProduceOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 		List<ProduceOrderVo> records = page.getRecords();
 		if (ObjectUtil.isEmpty(records)) {
@@ -66,7 +79,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
 		//赋值订单明细信息
 		List<Long> produceOrderIds = records.stream().map(ProduceOrder::getId).collect(Collectors.toList());
 		List<ProduceOrderDetail> produceOrderDetailList = produceOrderDetailService.list(q ->
-				q.eq(ProduceOrderDetail::getProduceOrderId, produceOrderIds));
+				q.in(ProduceOrderDetail::getProduceOrderId, produceOrderIds));
 		List<ProduceOrderDetailVo> produceOrderDetailVos = BeanUtil.copyToList(produceOrderDetailList, ProduceOrderDetailVo.class);
 
 		productInfoService.attributeAssign(produceOrderDetailVos, ProduceOrderDetail::getProductId, (item, product) -> {

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -348,25 +348,30 @@ public class Contract extends BasePo {
     @Version
     private Integer version;
 
-    /**
-     * 是否显示
-     */
-    private Integer isShow;
-
-    /**
-     * 数据JSON
-     */
-    private String dataJson;
-
-    /**
-     * 交接单附件列表
-     */
-    @TableField(exist = false)
-    private List<ObsFile> fileList;
-
-    /**
-     * 包装附件列表
-     */
+	/**
+	 * 是否显示
+	 */
+	private Integer isShow;
+
+	/**
+	 * 数据JSON
+	 */
+	private String dataJson;
+
+	/**
+	 * 订单下发状态
+	 */
+	private Integer orderDistributeStatus;
+
+	/**
+	 * 交接单附件列表
+	 */
+	@TableField(exist = false)
+	private List<ObsFile> fileList;
+
+	/**
+	 * 包装附件列表
+	 */
     @TableField(exist = false)
     private List<ObsFile> packageFileList;
 

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -31,7 +31,6 @@ import com.fjhx.common.service.contract.ContractTemplateService;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
 import com.fjhx.common.utils.Assert;
-import com.fjhx.common.utils.AuthorityUtils;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.service.customer.CustomerService;
@@ -251,9 +250,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
      */
     @Override
     public Map<String, Object> getHeadStatistic(ContractSelectDto dto) {
-        //权限过滤开始
-        AuthorityUtils.filterSta();
-
         IWrapper<Contract> wrapper = getWrapper();
         setContractParam(dto, wrapper);
         SysUser sysUser = UserUtil.getUserInfo();
@@ -293,9 +289,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Override
     @TenantIgnore
     public Page<ContractVo> getPage(ContractSelectDto dto) {
-        //权限过滤开始
-        AuthorityUtils.filterSta();
-
         IWrapper<Contract> wrapper = getWrapper();
         setContractParam(dto, wrapper);
         SysUser sysUser = UserUtil.getUserInfo();

hx-wms/src/main/java/com/fjhx/wms/entity/purchase/po/PurchaseDetailPo.java

@@ -1,7 +1,6 @@
 package com.fjhx.wms.entity.purchase.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,7 +17,6 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-@TableName("purchase_detail")
 public class PurchaseDetailPo extends BasePo {
 
     /**

hx-wms/src/main/java/com/fjhx/wms/entity/purchase/po/PurchasePo.java

@@ -1,7 +1,6 @@
 package com.fjhx.wms.entity.purchase.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
@@ -20,7 +19,6 @@ import java.util.List;
  */
 @Getter
 @Setter
-@TableName("purchase")
 public class PurchasePo extends BasePo {
 
     /**