楚江ERP-获取可以发货的列表数据

@@ -96,4 +96,18 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
         shipmentsPlanDetailService.update(vo);
         return InvokeResultBuilder.success();
     }
+
+    /**
+     * 获取可以发货的订货单规格数据
+     */
+    @ApiOperation("查询列表")
+    @GetMapping("/queryCanShipmentsData")
+    public InvokeResult<PageResult<ShipmentsPlanDetailBo>> queryCanShipmentsData(@Valid QueryShipmentsPlanDetailVo vo) {
+        PageResult<ShipmentsPlanDetail> pageResult = shipmentsPlanDetailService.queryCanShipmentsData(getPageIndex(vo), getPageSize(vo), vo);
+        List<ShipmentsPlanDetailBo> results = null;
+        if (!CollectionUtil.isEmpty(pageResult.getDatas())) {
+            results = pageResult.getDatas().stream().map(ShipmentsPlanDetailBo::new).collect(Collectors.toList());
+        }
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
 }

@@ -139,6 +139,11 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private LocalTime shipmentsTime;
 
     /**
+     * 是否预发
+     */
+    private Boolean preShipments;
+
+    /**
      * 是否可以发货
      */
     private Boolean canShipments;

 package com.lframework.xingyun.sc.impl.shipments;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.xingyun.sc.entity.PurchaseOrderLine;
+import com.lframework.xingyun.sc.entity.ShipmentsPlan;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -20,6 +22,7 @@ import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanDetailMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.vo.shipments.plan.CreateShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
@@ -28,6 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -39,6 +43,9 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
 
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private ShipmentsPlanService shipmentsPlanService;
+
 
     @Override
     public PageResult<ShipmentsPlanDetail> query(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo) {
@@ -68,6 +75,10 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void create(CreateShipmentsPlanDetailVo vo) {
+        ShipmentsPlan plan = shipmentsPlanService.getById(vo.getPlanId());
+        if (plan == null) {
+            throw new DefaultClientException("发货计划不存在！");
+        }
         List<String> orderSpecIds = vo.getOrderSpecIds();
         if (CollectionUtils.isEmpty(orderSpecIds)) {
             throw new DefaultClientException("订货单规格ID不能为空！");
@@ -87,6 +98,10 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
             data.setOrderId(orderIdMap.get(specId));
             data.setOrderSpecId(specId);
             data.setShipmentsDate(vo.getShipmentDate());
+            // 判断是否预发
+            LocalDate afTomoPreShipDate = plan.getAfTomoPreShipDate();
+            data.setPreShipments(afTomoPreShipDate.equals(vo.getShipmentDate()));
+
             data.setCreateById(userId);
             data.setUpdateById(userId);
             data.setDelFlag(false);
@@ -116,4 +131,30 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
     }
+
+    /**
+     * 获取可以发货的列表数据
+     *
+     * @param pageIndex 分页页码
+     * @param pageSize  分页大小
+     * @param vo        查询条件
+     * @return          PageResult<ShipmentsPlanDetail>
+     */
+    @Override
+    public PageResult<ShipmentsPlanDetail> queryCanShipmentsData(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo) {
+        // 获取已经加入发货计划的订货单规格id
+        LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+        queryWrapper.eq(ShipmentsPlanDetail::getPreShipments, Boolean.FALSE)
+                .select(ShipmentsPlanDetail::getOrderSpecId);
+        List<ShipmentsPlanDetail> shipmentsPlanDetails = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(shipmentsPlanDetails)) {
+            List<String> orderSpecIds = shipmentsPlanDetails.stream().map(ShipmentsPlanDetail::getId).collect(Collectors.toList());
+            vo.setOrderSpecIds(orderSpecIds);
+        }
+        // 开启分页
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ShipmentsPlanDetail> dataList = getBaseMapper().queryCanShipmentsData(LocalDate.now(), vo);
+
+        return PageResultUtil.convert(new PageInfo<>(dataList));
+    }
 }

@@ -15,7 +15,6 @@ 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.shipments.ShipmentsPlanDetailService;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanMapper;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
@@ -24,15 +23,12 @@ import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanVo;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 @Service
 public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMapper, ShipmentsPlan> implements ShipmentsPlanService {
 
 
-    @Resource
-    private ShipmentsPlanDetailService shipmentsPlanDetailService;;
 
 
     @Override

@@ -5,6 +5,7 @@ import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -29,4 +30,13 @@ public interface ShipmentsPlanDetailMapper extends BaseMapper<ShipmentsPlanDetai
      * @param dataList  数据实体
      */
     void batchAdd(List<ShipmentsPlanDetail> dataList);
+
+
+    /**
+     * 获取可以发货的列表数据
+     *
+     * @param vo    查询条件
+     * @return      List<ShipmentsPlanDetail>
+     */
+    List<ShipmentsPlanDetail> queryCanShipmentsData(@Param("shipmentsDate") LocalDate shipmentsDate, @Param("vo") QueryShipmentsPlanDetailVo vo);
 }

@@ -73,4 +73,13 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      */
     void update(UpdateShipmentsPlanDetailVo vo);
 
+    /**
+     * 获取可以发货的列表数据
+     *
+     * @param pageIndex 分页页码
+     * @param pageSize  分页大小
+     * @param vo        查询条件
+     * @return          PageResult<ShipmentsPlanDetail>
+     */
+    PageResult<ShipmentsPlanDetail> queryCanShipmentsData(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo);
 }

@@ -4,6 +4,8 @@ import javax.validation.constraints.NotBlank;
 import com.lframework.starter.web.core.vo.BaseVo;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
@@ -28,13 +30,14 @@ public class CreateShipmentsPlanDetailVo implements BaseVo, Serializable {
     /**
      * 订货单规格ID集合
      */
-    @ApiModelProperty(value = "订货单ID", required = true)
-    @NotEmpty(message = "请输入订货单ID！")
+    @ApiModelProperty(value = "订货单规格ID", required = true)
+    @NotEmpty(message = "请输入订货单规格ID！")
     private List<String> orderSpecIds;
 
     /**
      * 发货日期
      */
     @ApiModelProperty(value = "发货日期")
+    @NotNull(message = "请输入发货日期！")
     private LocalDate shipmentDate;
 }

@@ -7,6 +7,7 @@ import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serializable {
@@ -25,4 +26,22 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial
     @ApiModelProperty("发货日期")
     @TypeMismatch(message = "发货日期格式有误！")
     private LocalDate shipmentsDate;
+
+    /**
+     * 订货单规格ID集合
+     */
+    @ApiModelProperty("订货单规格ID集合")
+    private List<String> orderSpecIds;
+
+    /**
+     * 订货单编号
+     */
+    @ApiModelProperty("订货单编号")
+    private String orderNo;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
 }

@@ -86,6 +86,7 @@
         status,
         shipments_date,
         shipments_time,
+        pre_shipments,
         can_shipments,
         del_flag,
         create_by_id,
@@ -103,6 +104,7 @@
             #{item.status},
             #{item.shipmentsDate},
             #{item.shipmentsTime},
+            #{item.preShipments},
             #{item.canShipments},
             #{item.delFlag},
             #{item.createById},
@@ -112,4 +114,37 @@
             )
         </foreach>
     </insert>
+
+    <select id="queryCanShipmentsData" resultType="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail">
+        select
+            o.id as order_id,
+            o.order_no,
+            c.name AS customer_name,
+            ol.thickness,
+            ol.thickness_tol_pos,
+            ol.thickness_tol_neg,
+            ol.width,
+            ol.width_tol_pos,
+            ol.width_tol_neg,
+            ol.length,
+            ol.length_tol_pos,
+            ol.length_tol_neg,
+            ol.quantity
+        from tbl_purchase_order_line ol
+        inner join purchase_order_info o on ol.purchase_order_id = o.id
+        left join base_data_customer c on o.ordering_unit = c.id
+        where ol.delivery_date >= #{shipmentsDate}
+        <if test="vo.orderSpecIds != null and vo.orderSpecIds.size() > 0">
+            and ol.id not in
+            <foreach collection="vo.orderSpecIds" 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>
+        <if test="vo.customerName != null and vo.customerName != ''">
+            AND c.name like concat('%', #{vo.customerName}, '%')
+        </if>
+    </select>
 </mapper>