Merge branch 'master_after20' into master_cj_zq

# Conflicts:
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/ShipmentsOrderInfoServiceImpl.java

@@ -13,6 +13,7 @@ import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.service.DicCityService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
@@ -91,6 +92,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     private PurchaseOrderLineService purchaseOrderLineService;
     @Resource
     private ReceiptLedgerInfoService receiptLedgerInfoService;
+    @Resource
+    private SysUserRoleService sysUserRoleService;
 
 
     @Override
@@ -308,6 +311,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             if (CollectionUtils.isEmpty(detailList)) {
                 throw new DefaultClientException("发货明细数据不存在！");
             }
+            // 剔除经营办发货员添加的计划
+            dataFilter(detailList);
             // 根据客户分组
             Map<String, List<ShipmentsPlanDetail>> detailMap = new HashMap<>();
             for (ShipmentsPlanDetail detail : detailList) {
@@ -765,4 +770,35 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         ticketVo.setLoadingTime(loadingTime);
         return ticketVo;
     }
+
+
+    /**
+     * 数据过滤
+     *
+     * @param dataList  源数据
+     */
+    private void dataFilter(List<ShipmentsPlanDetail> dataList) {
+        if (CollectionUtils.isEmpty(dataList)) {
+            return;
+        }
+        // 获取所有经营办发货员
+        List<String> roleCodeList = new ArrayList<>();
+        roleCodeList.add("yfcjybfhy");
+        roleCodeList.add("efcjybfhy");
+        roleCodeList.add("sfcjybfhy");
+        roleCodeList.add("ztfcjybfhy");
+        List<String> deliveryUserIds = sysUserRoleService.listUserIdByRoleCodes(roleCodeList);
+        if (CollectionUtils.isEmpty(deliveryUserIds)) {
+            return;
+        }
+        Iterator<ShipmentsPlanDetail> iterator = dataList.iterator();
+        while (iterator.hasNext()) {
+            ShipmentsPlanDetail next = iterator.next();
+            String createById = next.getCreateById();
+            if (deliveryUserIds.contains(createById)) {
+                // 剔除经营办发货员添加的计划
+                iterator.remove();
+            }
+        }
+    }
 }

@@ -6,6 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.*;
+import com.lframework.starter.web.inner.entity.SysRole;
+import com.lframework.starter.web.inner.entity.SysUserRole;
+import com.lframework.starter.web.inner.service.system.SysRoleService;
+import com.lframework.starter.web.inner.service.system.SysUserDeptService;
+import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.vo.workshop.QueryWorkshopVo;
@@ -49,6 +54,12 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     private WorkshopService workshopService;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private SysUserRoleService sysUserRoleService;
+    @Resource
+    private SysRoleService sysRoleService;
+    @Resource
+    private SysUserDeptService sysUserDeptService;
 
 
     @Override
@@ -187,6 +198,20 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
             existOrderSpecIds.addAll(orderSpecIds);
         }
         vo.setOrderSpecIds(existOrderSpecIds);
+        // 业务员做权限控制
+        List<String> userIds = new ArrayList<>();
+        String currentUserId = SecurityUtil.getCurrentUser().getId();
+        List<SysUserRole> userRoles = sysUserRoleService.getByUserId(currentUserId);
+        List<String> roleIds = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
+        List<SysRole> roleList = sysRoleService.listByIds(roleIds);
+        for (SysRole role : roleList) {
+            String code = role.getCode();
+            if ("ywy".equals(code)) {
+                userIds = sysUserDeptService.listAllUserByUserId(Collections.singletonList(currentUserId), false);
+                break;
+            }
+        }
+        vo.setCreateByIds(userIds);
         // 开启分页
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<ShipmentsPlanDetail> dataList = getBaseMapper().queryCanShipmentsData(vo);
@@ -433,16 +458,11 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
             LocalTime shipmentsTime = detail.getShipmentsTime();
             Boolean canShipments = detail.getCanShipments();
             Boolean preShipments = detail.getPreShipments();
-            if ("CHECKING".equals(status)) {
-                // 提交计划
+            if ("IN_PROGRESS".equals(status)) {
+                // 核对计划
                 if (!preShipments && shipmentsTime == null) {
                     throw new DefaultClientException("发货时点不能为空！");
                 }
-                if (preShipments && canShipments == null) {
-                    throw new DefaultClientException("是否可发货不能为空！");
-                }
-            } else if ("IN_PROGRESS".equals(status)) {
-                // 核对计划
                 if (!preShipments && canShipments == null) {
                     throw new DefaultClientException("是否可发货不能为空！");
                 }

@@ -75,4 +75,10 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial
      */
     @ApiModelProperty("客户名称")
     private Boolean completed;
+
+    /**
+     * 创建人ID集合
+     */
+    @ApiModelProperty("创建人ID集合")
+    private List<String> createByIds;
 }

@@ -203,6 +203,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="vo.createByIds != null and vo.createByIds.size() > 0">
+            and o.contract_create_by_id in
+            <foreach collection="vo.createByIds" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.orderNo != null and vo.orderNo != ''">
             AND o.order_no like concat('%', #{vo.orderNo}, '%')
         </if>