楚江ERP-发货计划拆分功能接口开发

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
+
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -40,6 +42,18 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
     private String orderId;
     private String orderId;
 
 
     /**
     /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
      * 父类ID
      * 父类ID
      */
      */
     @ApiModelProperty("父类ID")
     @ApiModelProperty("父类ID")
@@ -72,6 +86,66 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
     private Boolean canShipments;
     private Boolean canShipments;
 
 
     /**
     /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 计划吨位
+     */
+    @ApiModelProperty("计划吨位")
+    private BigDecimal quantity;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @ApiModelProperty("创建人ID")
     @ApiModelProperty("创建人ID")

@@ -308,7 +308,7 @@ public class ScSelectorController extends DefaultBaseController {
             orderIds.add(orderInfo.getId());
             orderIds.add(orderInfo.getId());
         }
         }
         // 获取物料行数据
         // 获取物料行数据
-        List<PurchaseOrderLine> orderLineList = orderLineService.listByOrderIds(orderIds);
+        List<PurchaseOrderLine> orderLineList = orderLineService.listByOrderIds(orderIds, false);
         if (CollectionUtils.isEmpty(orderLineList)) {
         if (CollectionUtils.isEmpty(orderLineList)) {
             return InvokeResultBuilder.success(result);
             return InvokeResultBuilder.success(result);
         }
         }

 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.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;
 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.ShipmentsPlanDetailSplitVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
+
+import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
@@ -18,7 +20,6 @@ import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
-import org.springframework.beans.factory.annotation.Autowired;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -37,10 +38,8 @@ import java.util.stream.Collectors;
 @RequestMapping("/shipments/plan/detail")
 @RequestMapping("/shipments/plan/detail")
 public class ShipmentsPlanDetailController extends DefaultBaseController {
 public class ShipmentsPlanDetailController extends DefaultBaseController {
 
 
-    @Autowired
+    @Resource
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
-    @Autowired
-    private ShipmentsPlanService shipmentsPlanService;
 
 
     /**
     /**
      * 查询列表
      * 查询列表
@@ -110,4 +109,15 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
         }
         }
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
     }
     }
+
+    /**
+     * 拆分
+     */
+    @ApiOperation("拆分")
+    @HasPermission({"shipments:plan:add"})
+    @PostMapping("/split")
+    public InvokeResult<Void> split(@Valid @RequestBody ShipmentsPlanDetailSplitVo vo) {
+        shipmentsPlanDetailService.planDetailSplit(vo);
+        return InvokeResultBuilder.success();
+    }
 }
 }

@@ -30,7 +30,7 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private String id;
     private String id;
 
 
     /**
     /**
-     * 订货单主表ID
+     * 订货单主表ID/订货单变更记录ID
      */
      */
     private String purchaseOrderId;
     private String purchaseOrderId;
 
 
@@ -131,6 +131,22 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private String assessmentExceedsAgreement;
     private String assessmentExceedsAgreement;
 
 
     /**
     /**
+     * 父类ID
+     * 拆分时使用
+     */
+    private String parentId;
+
+    /**
+     * 是否已发货
+     */
+    private Boolean shipment;
+
+    /**
+     * 是否已删除
+     */
+    private Boolean delFlag;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -93,7 +93,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         List<PurchaseOrderLine> beforeChangeList = JsonUtil.parseList(obj.toString(), PurchaseOrderLine.class);
         List<PurchaseOrderLine> beforeChangeList = JsonUtil.parseList(obj.toString(), PurchaseOrderLine.class);
         changeRecord.setBeforeChangeSpecList(beforeChangeList);
         changeRecord.setBeforeChangeSpecList(beforeChangeList);
         // 变更后
         // 变更后
-        List<PurchaseOrderLine> afterChangeList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(id));
+        List<PurchaseOrderLine> afterChangeList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(id), true);
         changeRecord.setAfterChangeSpecList(afterChangeList);
         changeRecord.setAfterChangeSpecList(afterChangeList);
 
 
         return changeRecord;
         return changeRecord;
@@ -189,7 +189,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
             purchaseOrderLineService.create(orderLineVo);
             purchaseOrderLineService.create(orderLineVo);
         }
         }
         // 缓存订货单物料行数据
         // 缓存订货单物料行数据
-        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(data.getOrderId()));
+        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(data.getOrderId()), true);
         redisHandler.set(vo.getOrderId() + "_order_line_info", JsonUtil.toJsonString(orderLineList));
         redisHandler.set(vo.getOrderId() + "_order_line_info", JsonUtil.toJsonString(orderLineList));
         // 更新订货单变更状态
         // 更新订货单变更状态
         purchaseOrderInfoService.updateSpecChangeStatus(vo.getOrderId(), OrderSpecChangeStatus.IN_PROGRESS.getCode());
         purchaseOrderInfoService.updateSpecChangeStatus(vo.getOrderId(), OrderSpecChangeStatus.IN_PROGRESS.getCode());

@@ -198,13 +198,17 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
     }
 
 
     @Override
     @Override
-    public List<PurchaseOrderLine> listByOrderIds(List<String> orderIds) {
+    public List<PurchaseOrderLine> listByOrderIds(List<String> orderIds, boolean includeShipment) {
         if (CollectionUtils.isEmpty(orderIds)) {
         if (CollectionUtils.isEmpty(orderIds)) {
             return Collections.emptyList();
             return Collections.emptyList();
         }
         }
         LambdaQueryWrapper<PurchaseOrderLine> queryWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class);
         LambdaQueryWrapper<PurchaseOrderLine> queryWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class);
-        queryWrapper.in(PurchaseOrderLine::getPurchaseOrderId, orderIds)
-                .orderByAsc(PurchaseOrderLine::getShowOrder);
+        queryWrapper.eq(PurchaseOrderLine::getDelFlag, Boolean.FALSE)
+                .in(PurchaseOrderLine::getPurchaseOrderId, orderIds);
+        if (!includeShipment) {
+            queryWrapper.eq(PurchaseOrderLine::getShipment, Boolean.FALSE);
+        }
+        queryWrapper.orderByAsc(PurchaseOrderLine::getShowOrder);
 
 
         return getBaseMapper().selectList(queryWrapper);
         return getBaseMapper().selectList(queryWrapper);
     }
     }
@@ -266,6 +270,18 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
     }
 
 
     @Override
     @Override
+    public void logicDelById(String id) {
+        if (StringUtils.isEmpty(id)) {
+            return;
+        }
+        LambdaUpdateWrapper<PurchaseOrderLine> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderLine.class);
+        updateWrapper.set(PurchaseOrderLine::getDelFlag, Boolean.TRUE)
+                .eq(PurchaseOrderLine::getId, id);
+
+        getBaseMapper().update(updateWrapper);
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {
 
 
     }
     }

@@ -23,14 +23,17 @@ import com.lframework.xingyun.sc.mappers.ShipmentsPlanDetailMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 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.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
+import com.lframework.xingyun.sc.utils.CommonUtil;
 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;
+import com.lframework.xingyun.sc.vo.shipments.plan.ShipmentsPlanDetailSplitVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -148,7 +151,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                 .select(ShipmentsPlanDetail::getOrderSpecId);
                 .select(ShipmentsPlanDetail::getOrderSpecId);
         List<ShipmentsPlanDetail> shipmentsPlanDetails = getBaseMapper().selectList(queryWrapper);
         List<ShipmentsPlanDetail> shipmentsPlanDetails = getBaseMapper().selectList(queryWrapper);
         if (CollectionUtils.isNotEmpty(shipmentsPlanDetails)) {
         if (CollectionUtils.isNotEmpty(shipmentsPlanDetails)) {
-            List<String> orderSpecIds = shipmentsPlanDetails.stream().map(ShipmentsPlanDetail::getId).collect(Collectors.toList());
+            List<String> orderSpecIds = shipmentsPlanDetails.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
             vo.setOrderSpecIds(orderSpecIds);
             vo.setOrderSpecIds(orderSpecIds);
         }
         }
         // 开启分页
         // 开启分页
@@ -157,4 +160,75 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
 
 
         return PageResultUtil.convert(new PageInfo<>(dataList));
         return PageResultUtil.convert(new PageInfo<>(dataList));
     }
     }
+
+    /**
+     * 计划明细拆分
+     *
+     * @param vo    条件
+     */
+    @Override
+    public void planDetailSplit(ShipmentsPlanDetailSplitVo vo) {
+        String id = vo.getId();
+        ShipmentsPlanDetail detail = findById(id);
+        if (detail == null) {
+            throw new DefaultClientException("计划明细不存在！");
+        }
+        // 获取订货单规格数据
+        PurchaseOrderLine orderLine = purchaseOrderLineService.findById(detail.getOrderSpecId());
+        // 判断拆分后总数量是否变化
+        List<BigDecimal> splitQuantityList = vo.getSplitQuantityList();
+        boolean match = CommonUtil.isQuantityMatchWithScale(splitQuantityList, orderLine.getQuantity(), 4);
+        if (!match) {
+            throw new DefaultClientException("拆分数量总和必须等于原先数量！");
+        }
+        // 封装数据
+        String userId = SecurityUtil.getCurrentUser().getId();
+        List<ShipmentsPlanDetail> detailList = new ArrayList<>();
+        List<PurchaseOrderLine> orderLineList = new ArrayList<>();
+        for (BigDecimal quantity : splitQuantityList) {
+            ShipmentsPlanDetail data = getShipmentsPlanDetail(quantity, detail, userId);
+            detailList.add(data);
+            // 封装订货单规格数据
+            PurchaseOrderLine copyLineInfo = CommonUtil.deepCopy(orderLine);
+            copyLineInfo.setId(data.getOrderSpecId());
+            copyLineInfo.setParentId(orderLine.getId());
+            copyLineInfo.setQuantity(quantity);
+
+            orderLineList.add(copyLineInfo);
+        }
+        getBaseMapper().batchAdd(detailList);
+        // 删除计划明细数据（逻辑删除）
+        LambdaUpdateWrapper<ShipmentsPlanDetail> updateWrapper = Wrappers.lambdaUpdate(ShipmentsPlanDetail.class);
+        updateWrapper.set(ShipmentsPlanDetail::getDelFlag, Boolean.TRUE)
+                .eq(ShipmentsPlanDetail::getId, id);
+        getBaseMapper().update(updateWrapper);
+        // 同步订货单规格数据
+        purchaseOrderLineService.logicDelById(orderLine.getId());
+        purchaseOrderLineService.batchAdd(orderLineList);
+    }
+
+
+    /**
+     * 封装发货计划明细数据
+     *
+     * @param quantity  数量
+     * @param detail    原数据
+     * @param userId    人员ID
+     * @return          ShipmentsPlanDetail
+     */
+    private static ShipmentsPlanDetail getShipmentsPlanDetail(BigDecimal quantity, ShipmentsPlanDetail detail, String userId) {
+        ShipmentsPlanDetail data = new ShipmentsPlanDetail();
+        data.setId(IdUtil.getId());
+        data.setPlanId(detail.getPlanId());
+        data.setOrderId(detail.getOrderId());
+        data.setOrderSpecId(IdUtil.getId());
+        data.setParentId(detail.getId());
+        data.setShipmentsDate(detail.getShipmentsDate());
+        data.setQuantity(quantity);
+        data.setPreShipments(Boolean.FALSE);
+        data.setCreateById(userId);
+        data.setUpdateById(userId);
+        data.setDelFlag(Boolean.FALSE);
+        return data;
+    }
 }
 }

@@ -66,10 +66,11 @@ public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLin
     /**
     /**
      * 根据订货单ID查询
      * 根据订货单ID查询
      *
      *
-     * @param orderIds  订货单ID集合
-     * @return          List<PurchaseOrderLine>
+     * @param orderIds          订货单ID集合
+     * @param includeShipment   是否包含已发货数据
+     * @return                  List<PurchaseOrderLine>
      */
      */
-    List<PurchaseOrderLine> listByOrderIds(List<String> orderIds);
+    List<PurchaseOrderLine> listByOrderIds(List<String> orderIds, boolean includeShipment);
 
 
     /**
     /**
      * 批量新增
      * 批量新增
@@ -98,4 +99,11 @@ public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLin
      * @param orderId   订货单ID
      * @param orderId   订货单ID
      */
      */
     void deleteByOrderId(String orderId);
     void deleteByOrderId(String orderId);
+
+    /**
+     * 根据ID逻辑删除
+     *
+     * @param id    主键ID
+     */
+    void logicDelById(String id);
 }
 }

@@ -2,32 +2,11 @@ package com.lframework.xingyun.sc.service.shipments;
 
 
 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;
+import com.lframework.xingyun.sc.vo.shipments.plan.ShipmentsPlanDetailSplitVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 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.utils.PageResultUtil;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
-import javax.validation.constraints.NotBlank;
-import com.lframework.starter.web.core.vo.PageVo;
-import com.lframework.starter.web.core.utils.OpLogUtil;
-import com.lframework.starter.common.utils.StringUtil;
-import com.lframework.starter.web.core.vo.BaseVo;
-import javax.validation.constraints.NotNull;
-import com.lframework.starter.web.core.components.validation.TypeMismatch;
-import com.lframework.starter.common.exceptions.impl.DefaultClientException;
-import java.time.LocalDate;
-import com.lframework.starter.web.core.utils.EnumUtil;
-import com.lframework.starter.web.core.utils.IdUtil;
-import java.time.LocalTime;
-import com.lframework.starter.common.utils.ObjectUtil;
-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 io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-import java.util.Collection;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -82,4 +61,11 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * @return          PageResult<ShipmentsPlanDetail>
      * @return          PageResult<ShipmentsPlanDetail>
      */
      */
     PageResult<ShipmentsPlanDetail> queryCanShipmentsData(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo);
     PageResult<ShipmentsPlanDetail> queryCanShipmentsData(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo);
+
+    /**
+     * 计划明细拆分
+     *
+     * @param vo    条件
+     */
+    void planDetailSplit(ShipmentsPlanDetailSplitVo vo);
 }
 }

+package com.lframework.xingyun.sc.utils;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.*;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+@Slf4j
+public class CommonUtil {
+
+
+
+    /**
+     * 深度拷贝
+     *
+     * @param object    被拷贝对象
+     * @return          T
+     */
+    public static <T> T deepCopy(T object) {
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+             ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream)) {
+            objectOutputStream.writeObject(object);
+            try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+                 ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream)) {
+                return (T) objectInputStream.readObject();
+            }
+        } catch (IOException | ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    /**
+     * 比较数量是否相等
+     *
+     * @param splitQuantityList 数值集合
+     * @param quantity          数值
+     * @param scale             小数位
+     * @return                  boolean
+     */
+    public static boolean isQuantityMatchWithScale(List<BigDecimal> splitQuantityList, BigDecimal quantity, int scale) {
+        // 计算总和
+        BigDecimal sum = splitQuantityList.stream()
+                .reduce(BigDecimal.ZERO, BigDecimal::add)
+                .setScale(scale, RoundingMode.HALF_UP);
+
+        BigDecimal target = quantity.setScale(scale, RoundingMode.HALF_UP);
+        return sum.compareTo(target) == 0;
+    }
+}

+package com.lframework.xingyun.sc.vo.shipments.plan;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ShipmentsPlanDetailSplitVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 发货计划明细ID
+     */
+    @ApiModelProperty("发货计划明细ID")
+    @NotBlank(message = "发货计划明细ID不能为空！")
+    private String id;
+
+    /**
+     * 拆分数量集合
+     */
+    @ApiModelProperty("拆分数量集合")
+    @NotEmpty(message = "拆分数量不能为空")
+    @TypeMismatch(message = "拆分数量格式有误！")
+    private List<BigDecimal> splitQuantityList;
+}

@@ -180,12 +180,13 @@
             tb.revoke_status='PARTIAL')
             tb.revoke_status='PARTIAL')
             AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
             AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
             AND tb.examine_status = 'PASS'
             AND tb.examine_status = 'PASS'
-            AND tb.spec_change_status != 'IN_PROGRESS'
+            AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL)
             </when>
             </when>
             <when test="vo.queryType == 'CHANGE'">
             <when test="vo.queryType == 'CHANGE'">
                 AND tb.examine_status = 'PASS'
                 AND tb.examine_status = 'PASS'
                 AND tb.status != 'SHIPPED'
                 AND tb.status != 'SHIPPED'
                 AND (tb.revoke_status != 'UNDOING' OR tb.revoke_status IS NULL)
                 AND (tb.revoke_status != 'UNDOING' OR tb.revoke_status IS NULL)
+                AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL)
             </when>
             </when>
             <otherwise>
             <otherwise>
                 AND 1 = 0  <!-- 确保查询不到任何数据 -->
                 AND 1 = 0  <!-- 确保查询不到任何数据 -->

@@ -65,6 +65,7 @@
     <select id="query" resultMap="PurchaseOrderLine">
     <select id="query" resultMap="PurchaseOrderLine">
         <include refid="PurchaseOrderLine_sql"/>
         <include refid="PurchaseOrderLine_sql"/>
         <where>
         <where>
+            and tb.del_flag = false
             <if test="vo.purchaseOrderId != null and vo.purchaseOrderId != ''">
             <if test="vo.purchaseOrderId != null and vo.purchaseOrderId != ''">
                 AND tb.purchase_order_id = #{vo.purchaseOrderId}
                 AND tb.purchase_order_id = #{vo.purchaseOrderId}
             </if>
             </if>
@@ -89,7 +90,7 @@
         length, length_tol_pos, length_tol_neg,
         length, length_tol_pos, length_tol_neg,
         status, quantity, sales_price, delivery_date, show_order,
         status, quantity, sales_price, delivery_date, show_order,
         assessment_exceeds_agreement, create_by_id, create_by, update_by_id, update_by,
         assessment_exceeds_agreement, create_by_id, create_by, update_by_id, update_by,
-        create_time, update_time
+        create_time, update_time, parent_id
         ) VALUES
         ) VALUES
         <foreach collection="specList" item="item" separator=",">
         <foreach collection="specList" item="item" separator=",">
             (
             (
@@ -99,7 +100,7 @@
             #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},
             #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},
             #{item.status}, #{item.quantity}, #{item.salesPrice}, #{item.deliveryDate}, #{item.showOrder},
             #{item.status}, #{item.quantity}, #{item.salesPrice}, #{item.deliveryDate}, #{item.showOrder},
             #{item.assessmentExceedsAgreement}, #{item.createById}, #{item.createBy}, #{item.updateById}, #{item.updateBy},
             #{item.assessmentExceedsAgreement}, #{item.createById}, #{item.createBy}, #{item.updateById}, #{item.updateBy},
-            #{item.createTime}, #{item.updateTime}
+            #{item.createTime}, #{item.updateTime}, #{item.parentId}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>

@@ -61,12 +61,13 @@
         INNER JOIN shipments_plan p ON tb.plan_id = p.id
         INNER JOIN shipments_plan p ON tb.plan_id = p.id
         LEFT JOIN purchase_order_info o ON tb.order_id = o.id
         LEFT JOIN purchase_order_info o ON tb.order_id = o.id
         LEFT JOIN base_data_customer c ON o.ordering_unit = c.id
         LEFT JOIN base_data_customer c ON o.ordering_unit = c.id
-        LEFT JOIN tbl_purchase_order_line ol ON tb.order_id = ol.purchase_order_id
+        LEFT JOIN tbl_purchase_order_line ol ON tb.order_spec_id = ol.id
     </sql>
     </sql>
 
 
     <select id="query" resultMap="ShipmentsPlanDetail">
     <select id="query" resultMap="ShipmentsPlanDetail">
         <include refid="ShipmentsPlanDetail_sql"/>
         <include refid="ShipmentsPlanDetail_sql"/>
         <where>
         <where>
+            and tb.del_flag = false
             <if test="vo.planId != null and vo.planId != ''">
             <if test="vo.planId != null and vo.planId != ''">
                 AND tb.plan_id = #{vo.planId}
                 AND tb.plan_id = #{vo.planId}
             </if>
             </if>