楚江erp：1、发货计划列表增加权限控制（经营办发货员、精轧车间计划员）；2、发货计划、发货单列表排序调整（按创建时间倒序）；3、生成发货单逻辑调整（过滤掉已发货的数据）

@@ -38,6 +38,7 @@ import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsOrderInfoMapper;
@@ -249,14 +250,21 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             // 根据客户批量生成
             List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByPlanId(planId);
             if (CollectionUtils.isEmpty(detailList)) {
-                return;
+                throw new DefaultClientException("发货明细数据不存在！");
             }
             // 根据客户分组
             Map<String, List<ShipmentsPlanDetail>> detailMap = new HashMap<>();
             for (ShipmentsPlanDetail detail : detailList) {
+                // 已发货的直接过滤
+                if (StringUtils.isNotBlank(detail.getShipmentOrderId())) {
+                    continue;
+                }
                 List<ShipmentsPlanDetail> list = detailMap.computeIfAbsent(detail.getCustomerId(), k -> new ArrayList<>());
                 list.add(detail);
             }
+            if (MapUtils.isEmpty(detailMap)) {
+                throw new DefaultClientException("发货明细数据不存在！");
+            }
             // todo 如果客户很多，则此处需要优化
             for (Map.Entry<String, List<ShipmentsPlanDetail>> entry : detailMap.entrySet()) {
                 List<ShipmentsPlanDetail> value = entry.getValue();

@@ -3,6 +3,9 @@ package com.lframework.xingyun.sc.impl.shipments;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.inner.entity.SysRole;
+import com.lframework.starter.web.inner.service.system.SysRoleService;
 import com.lframework.xingyun.sc.entity.ShipmentsPlan;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -15,7 +18,7 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
-import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanMapper;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
@@ -25,6 +28,7 @@ import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -33,12 +37,34 @@ public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMap
 
 
     @Resource
-    private PurchaseOrderLineService orderLineService;
+    private SysRoleService sysRoleService;
 
     @Override
     public PageResult<ShipmentsPlan> query(Integer pageIndex, Integer pageSize, QueryShipmentsPlanVo vo) {
         Assert.greaterThanZero(pageIndex);
         Assert.greaterThanZero(pageSize);
+        List<String> workshopCodeList = new ArrayList<>();
+        // 数据权限控制
+        String currentUserId = SecurityUtil.getCurrentUser().getId();
+        // 获取当前人所属角色
+        List<SysRole> roleList = sysRoleService.getByUserId(currentUserId);
+        for (SysRole role : roleList) {
+            String roleCode = role.getCode();
+            String workshopCode = "";
+            if ("yfcjybfhy".equals(roleCode) || "yfcjzcjjhy".equals(roleCode)) {
+                workshopCode = "yfc";
+            } else if ("efcjybfhy".equals(roleCode) || "efcjzcjjhy".equals(roleCode)) {
+                workshopCode = "efc";
+            } else if ("sfcjybfhy".equals(roleCode) || "sfcjzcjjhy".equals(roleCode)) {
+                workshopCode = "sfc";
+            } else if ("ztfcjybfhy".equals(roleCode) || "ztfcjzcjjhy".equals(roleCode)) {
+                workshopCode = "ztfc";
+            }
+            if (StringUtils.isNotBlank(workshopCode)) {
+                workshopCodeList.add(workshopCode);
+            }
+        }
+        vo.setWorkshopCodeList(workshopCodeList);
         // 开启分页
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<ShipmentsPlan> dataList = this.query(vo);

@@ -6,6 +6,7 @@ import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class QueryShipmentsPlanVo extends PageVo implements BaseVo, Serializable {
@@ -19,6 +20,12 @@ public class QueryShipmentsPlanVo extends PageVo implements BaseVo, Serializable
     private String workshopId;
 
     /**
+     * 生产厂编号
+     */
+    @ApiModelProperty("生产厂编号")
+    private List<String> workshopCodeList;
+
+    /**
      * 状态
      */
     @ApiModelProperty("状态")

@@ -70,6 +70,7 @@
                 AND c.name like concat('%', #{vo.customerName}, '%')
             </if>
         </where>
+        ORDER BY tb.create_time DESC
     </select>
 
     <insert id="batchAdd">

@@ -37,6 +37,12 @@
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
+            <if test="vo.workshopCodeList != null and vo.workshopCodeList.size() > 0">
+                AND w.code IN
+                <foreach collection="vo.workshopCodeList" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
             </if>
@@ -47,6 +53,7 @@
                 AND tb.create_time &lt;= #{vo.createEndTime}
             </if>
         </where>
+        ORDER BY tb.create_time DESC
     </select>
 
     <select id="getById" resultType="com.lframework.xingyun.sc.entity.ShipmentsPlan">