问题处理

hx-item/src/main/java/com/fjhx/item/entity/product/dto/ProductInfoSelectDto.java

@@ -116,4 +116,9 @@ public class ProductInfoSelectDto extends BaseSelectDto {
      */
     private Long materialId;
 
+    /**
+     * 禁用权限 1禁用
+     */
+    private Integer disablePerm;
+
 }

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -196,10 +196,14 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
             }
         }
 
-        //权限过滤：产品-子公司看自己的产品，总公司看全部，物料没有限制
-        Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100L)) {
-            dto.setCompanyId(companyId);
+
+        //没禁用权限过滤的情况
+        if (!ObjectUtil.equals(dto.getDisablePerm(), 1)) {
+            //权限过滤：产品-子公司看自己的产品，总公司看全部，物料没有限制
+            Long companyId = SecurityUtils.getCompanyId();
+            if (!Objects.equals(companyId, 100L)) {
+                dto.setCompanyId(companyId);
+            }
         }
         wrapper.and(q1 -> q1.
                 and(q -> q.eq("pi", ProductInfo::getDefinition, 1).eq("pi", ProductInfo::getCompanyId, dto.getCompanyId()))

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProductionOrderDto.java

@@ -15,11 +15,6 @@ import lombok.Setter;
 public class ProductionOrderDto extends ProductionOrder {
 
     /**
-     * 1已确认 2驳回
-     */
-    private Integer confirmStatus;
-
-    /**
      * 驳回备注
      */
     private String rejectRemark;

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionOrder.java

@@ -1,6 +1,7 @@
 package com.fjhx.mes.entity.production.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
@@ -32,6 +33,7 @@ public class ProductionOrder extends BasePo {
     /**
      * 交期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date deliveryPeriod;
 
     /**
@@ -64,4 +66,9 @@ public class ProductionOrder extends BasePo {
      */
     private Date finishTime;
 
+    /**
+     * 1已确认 2驳回
+     */
+    private Integer confirmStatus;
+
 }

hx-wms/src/main/java/com/fjhx/wms/mapper/stock/StockJournalDetailsMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,6 +19,7 @@ import java.util.List;
  * @author
  * @since 2023-03-20
  */
+@Mapper
 public interface StockJournalDetailsMapper extends BaseMapper<StockJournalDetails> {
 
     /**