aps-生产计划跟踪报表

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -2739,6 +2739,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         }
         param.setOrders(order);
 
+        //当前用户所属工厂
+        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        String tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
+        param.setTenantId(tenantId);
+
         Page<ProductPlanReportVo> queryPage = new Page<>(current, size);
 
 

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsBlankOrderDao.xml

@@ -268,6 +268,9 @@
             <if test="param.blankNumber != ''">
                 AND abo.BLANKNUMBER like concat('%',#{param.blankNumber},'%')
             </if>
+            <if test="param.tenantId != ''">
+                AND apo.TENANTID = #{param.tenantId}
+            </if>
             <if test="param.likeSearchAll != ''">
                 AND (apo.CUSTOMNAME like concat('%',#{param.likeSearchAll},'%')
                     OR apo.CUSTOMORDERNO like concat('%',#{param.likeSearchAll},'%')

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ProductPlanReportParamVo.java

@@ -20,4 +20,7 @@ public class ProductPlanReportParamVo {
     private String productionOrderStatus = "";
 
     private String orders = "";
+
+    //输出工厂
+    private String tenantId = "";
 }