楚江ERP-发货计划基础接口开发

 package com.lframework.xingyun.sc.controller.shipments;
 package com.lframework.xingyun.sc.controller.shipments;
 
 
 import com.lframework.xingyun.sc.bo.shipments.plan.ShipmentsPlanDetailBo;
 import com.lframework.xingyun.sc.bo.shipments.plan.ShipmentsPlanDetailBo;
-import com.lframework.xingyun.sc.entity.ShipmentsPlan;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;

@@ -75,18 +75,4 @@ public class ShipmentsPlan extends BaseEntity implements BaseDto {
      */
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
     private LocalDateTime updateTime;
-
-    /**
-     * 明天发货计划明细
-     * 非持久化字段
-     */
-    @TableField(exist = false)
-    List<ShipmentsPlanDetail> tomoPlanList;
-
-    /**
-     * 后天发货计划明细
-     * 非持久化字段
-     */
-    @TableField(exist = false)
-    List<ShipmentsPlanDetail> afTomoPlanList;
 }
 }

@@ -42,6 +42,11 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private String orderId;
     private String orderId;
 
 
     /**
     /**
+     * 订货单规格ID
+     */
+    private String orderSpecId;
+
+    /**
      * 订单编号
      * 订单编号
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -17,7 +18,7 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanDetailMapper;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanDetailMapper;
-import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.vo.shipments.plan.CreateShipmentsPlanDetailVo;
 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.QueryShipmentsPlanDetailVo;
@@ -29,13 +30,15 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
 public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsPlanDetailMapper, ShipmentsPlanDetail> implements ShipmentsPlanDetailService {
 public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsPlanDetailMapper, ShipmentsPlanDetail> implements ShipmentsPlanDetailService {
 
 
 
 
     @Resource
     @Resource
-    private PurchaseOrderInfoService purchaseOrderInfoService;
+    private PurchaseOrderLineService purchaseOrderLineService;
 
 
     @Override
     @Override
     public PageResult<ShipmentsPlanDetail> query(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo) {
     public PageResult<ShipmentsPlanDetail> query(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo) {
@@ -65,21 +68,28 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public void create(CreateShipmentsPlanDetailVo vo) {
     public void create(CreateShipmentsPlanDetailVo vo) {
-        List<String> orderIds = vo.getOrderIds();
-        if (CollectionUtils.isEmpty(orderIds)) {
-            throw new DefaultClientException("订货单ID不能为空！");
+        List<String> orderSpecIds = vo.getOrderSpecIds();
+        if (CollectionUtils.isEmpty(orderSpecIds)) {
+            throw new DefaultClientException("订货单规格ID不能为空！");
         }
         }
+        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByIds(orderSpecIds);
+        if (CollectionUtils.isEmpty(orderLineList)) {
+            throw new DefaultClientException("订货单规格数据不能为空！");
+        }
+        Map<String, String> orderIdMap = orderLineList.stream().collect(Collectors.toMap(PurchaseOrderLine::getId, PurchaseOrderLine::getPurchaseOrderId));
         // 当前人员id
         // 当前人员id
         String userId = SecurityUtil.getCurrentUser().getId();
         String userId = SecurityUtil.getCurrentUser().getId();
         List<ShipmentsPlanDetail> detailList = new ArrayList<>();
         List<ShipmentsPlanDetail> detailList = new ArrayList<>();
-        for (String orderId : orderIds) {
+        for (String specId : orderSpecIds) {
             ShipmentsPlanDetail data = new ShipmentsPlanDetail();
             ShipmentsPlanDetail data = new ShipmentsPlanDetail();
             data.setId(IdUtil.getId());
             data.setId(IdUtil.getId());
             data.setPlanId(vo.getPlanId());
             data.setPlanId(vo.getPlanId());
-            data.setOrderId(orderId);
+            data.setOrderId(orderIdMap.get(specId));
+            data.setOrderSpecId(specId);
             data.setShipmentsDate(vo.getShipmentDate());
             data.setShipmentsDate(vo.getShipmentDate());
             data.setCreateById(userId);
             data.setCreateById(userId);
             data.setUpdateById(userId);
             data.setUpdateById(userId);
+            data.setDelFlag(false);
 
 
             detailList.add(data);
             detailList.add(data);
         }
         }

@@ -15,10 +15,7 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
-import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
-import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanMapper;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanMapper;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
@@ -28,8 +25,6 @@ import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanVo;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
-import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 @Service
 @Service
@@ -58,38 +53,7 @@ public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMap
 
 
     @Override
     @Override
     public ShipmentsPlan findById(String id) {
     public ShipmentsPlan findById(String id) {
-        ShipmentsPlan plan = getBaseMapper().getById(id);
-        if (plan == null) {
-            throw new DefaultClientException("发货计划不存在！");
-        }
-        // 获取计划明细
-        QueryShipmentsPlanDetailVo detailVo = new QueryShipmentsPlanDetailVo();
-        detailVo.setPlanId(plan.getId());
-        // 发货日期
-        List<LocalDate> dateList = new ArrayList<>();
-        dateList.add(plan.getTomoPreShipDate());
-        dateList.add(plan.getAfTomoPreShipDate());
-        detailVo.setShipmentsDateList(dateList);
-
-        List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.query(detailVo);
-        if (CollectionUtils.isEmpty(detailList)) {
-            return plan;
-        }
-        // 根据日期分组
-        List<ShipmentsPlanDetail> tomorrowPlans = new ArrayList<>();
-        List<ShipmentsPlanDetail> afterTomorrowPlans = new ArrayList<>();
-        for (ShipmentsPlanDetail detail : detailList) {
-            LocalDate shipmentsDate = detail.getShipmentsDate();
-            if (shipmentsDate.equals(plan.getTomoPreShipDate())) {
-                tomorrowPlans.add(detail);
-            } else if (shipmentsDate.equals(plan.getAfTomoPreShipDate())) {
-                afterTomorrowPlans.add(detail);
-            }
-        }
-        plan.setTomoPlanList(tomorrowPlans);
-        plan.setAfTomoPlanList(afterTomorrowPlans);
-
-        return plan;
+        return getBaseMapper().getById(id);
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "新增发货计划，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "新增发货计划，ID：{}", params = {"#id"})

@@ -26,11 +26,11 @@ public class CreateShipmentsPlanDetailVo implements BaseVo, Serializable {
     private String planId;
     private String planId;
 
 
     /**
     /**
-     * 订货单ID集合
+     * 订货单规格ID集合
      */
      */
     @ApiModelProperty(value = "订货单ID", required = true)
     @ApiModelProperty(value = "订货单ID", required = true)
     @NotEmpty(message = "请输入订货单ID！")
     @NotEmpty(message = "请输入订货单ID！")
-    private List<String> orderIds;
+    private List<String> orderSpecIds;
 
 
     /**
     /**
      * 发货日期
      * 发货日期

@@ -7,7 +7,6 @@ import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.io.Serializable;
-import java.util.List;
 
 
 @Data
 @Data
 public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serializable {
 public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serializable {
@@ -25,5 +24,5 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial
      */
      */
     @ApiModelProperty("发货日期")
     @ApiModelProperty("发货日期")
     @TypeMismatch(message = "发货日期格式有误！")
     @TypeMismatch(message = "发货日期格式有误！")
-    private List<LocalDate> shipmentsDateList;
+    private LocalDate shipmentsDate;
 }
 }

@@ -3,7 +3,6 @@ package com.lframework.xingyun.sc.vo.shipments.plan;
 import lombok.Data;
 import lombok.Data;
 import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
-import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;

@@ -36,6 +36,7 @@
             tb.order_id,
             tb.order_id,
             o.order_no,
             o.order_no,
             c.name AS customer_name,
             c.name AS customer_name,
+            tb.order_spec_id,
             ol.thickness,
             ol.thickness,
             ol.thickness_tol_pos,
             ol.thickness_tol_pos,
             ol.thickness_tol_neg,
             ol.thickness_tol_neg,
@@ -80,6 +81,7 @@
         id,
         id,
         plan_id,
         plan_id,
         order_id,
         order_id,
+        order_spec_id,
         parent_id,
         parent_id,
         status,
         status,
         shipments_date,
         shipments_date,
@@ -96,6 +98,7 @@
             #{item.id},
             #{item.id},
             #{item.planId},
             #{item.planId},
             #{item.orderId},
             #{item.orderId},
+            #{item.orderSpecId},
             #{item.parentId},
             #{item.parentId},
             #{item.status},
             #{item.status},
             #{item.shipmentsDate},
             #{item.shipmentsDate},

@@ -19,7 +19,7 @@
         SELECT
         SELECT
             tb.id,
             tb.id,
             tb.workshop_id,
             tb.workshop_id,
-            w.workshop_name,
+            w.name AS workshop_name,
             tb.status,
             tb.status,
             tb.tomo_pre_ship_date,
             tb.tomo_pre_ship_date,
             tb.af_tomo_pre_ship_date,
             tb.af_tomo_pre_ship_date,
@@ -40,6 +40,12 @@
             <if test="vo.status != null and vo.status != ''">
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
                 AND tb.status = #{vo.status}
             </if>
             </if>
+            <if test="vo.createStartTime != null">
+                AND tb.create_time >= #{vo.createStartTime}
+            </if>
+            <if test="vo.createEndTime != null">
+                AND tb.create_time &lt;= #{vo.createEndTime}
+            </if>
         </where>
         </where>
     </select>
     </select>