楚江erp：1、发货计划提交、核对增加数据完整性校验；2、客户开发增加订单吨位、发货吨位数据

@@ -937,7 +937,7 @@ alter table sys_data_dic_item modify column name varchar(50) comment '名称';
 
 
 create table if not exists customer_visit_record(
 create table if not exists customer_visit_record(
     id varchar(32) primary key comment 'ID',
     id varchar(32) primary key comment 'ID',
-    customer_id varchar(32) not null comment '客户ID',
+    customer_id varchar(32) not null comment '客户开发ID',
     user_id varchar(32) not null comment '拜访人员ID',
     user_id varchar(32) not null comment '拜访人员ID',
     visit_time date not null comment '拜访时间',
     visit_time date not null comment '拜访时间',
     visit_content varchar(500) comment '拜访内容',
     visit_content varchar(500) comment '拜访内容',

@@ -16,11 +16,11 @@ public class CreateCustomerVisitRecordVo implements BaseVo, Serializable {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**
-     * 客户ID
+     * 客户开发ID
      */
      */
-    @ApiModelProperty(value = "客户ID", required = true)
-    @NotBlank(message = "请输入客户ID！")
-    @Length(message = "客户ID最多允许32个字符！")
+    @ApiModelProperty(value = "客户开发ID", required = true)
+    @NotBlank(message = "请输入客户开发ID！")
+    @Length(message = "客户开发ID最多允许32个字符！")
     private String customerId;
     private String customerId;
 
 
     /**
     /**

@@ -156,6 +156,18 @@ public class GetCustomerDevelopPlanBo extends BaseBo<CustomerDevelopPlan> implem
     private List<CustomerVisitRecord> visitRecords;
     private List<CustomerVisitRecord> visitRecords;
 
 
     /**
     /**
+     * 订单吨位
+     */
+    @ApiModelProperty("订单吨位")
+    private Double orderQuantity;
+
+    /**
+     * 发货吨位
+     */
+    @ApiModelProperty("发货吨位")
+    private Double shipmentQuantity;
+
+    /**
      * 创建人
      * 创建人
      */
      */
     @ApiModelProperty("创建人")
     @ApiModelProperty("创建人")

@@ -17,8 +17,11 @@ import com.lframework.xingyun.basedata.service.product.ProductVarietyService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.bo.customer.develop.CustomerDevelopPlanStatisticsBo;
 import com.lframework.xingyun.sc.bo.customer.develop.CustomerDevelopPlanStatisticsBo;
 import com.lframework.xingyun.sc.bo.customer.develop.GetCustomerDevelopPlanBo;
 import com.lframework.xingyun.sc.bo.customer.develop.GetCustomerDevelopPlanBo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.enums.ExportType;
 import com.lframework.xingyun.sc.enums.ExportType;
 import com.lframework.xingyun.sc.excel.customer.CustomerDevelopExportTaskWorker;
 import com.lframework.xingyun.sc.excel.customer.CustomerDevelopExportTaskWorker;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.vo.customer.develop.QueryCustomerDevelopPlanVo;
 import com.lframework.xingyun.sc.vo.customer.develop.QueryCustomerDevelopPlanVo;
 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
 import com.lframework.xingyun.sc.vo.customer.develop.CreateCustomerDevelopPlanVo;
 import com.lframework.xingyun.sc.vo.customer.develop.CreateCustomerDevelopPlanVo;
@@ -44,10 +47,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.validation.Valid;
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -77,6 +78,10 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
     private ProductVarietyService productVarietyService;
     private ProductVarietyService productVarietyService;
     @Resource
     @Resource
     private SysUserService sysUserService;
     private SysUserService sysUserService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private ShipmentsOrderInfoService shipmentsOrderInfoService;
 
 
 
 
     /**
     /**
@@ -271,11 +276,25 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
         if (CollectionUtils.isNotEmpty(userList)) {
         if (CollectionUtils.isNotEmpty(userList)) {
             userMap = userList.stream().collect(Collectors.toMap(SysUser::getId, Function.identity()));
             userMap = userList.stream().collect(Collectors.toMap(SysUser::getId, Function.identity()));
         }
         }
+        // 获取订货单数据
+        List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByCustomerIds(customerIds);
+        Map<String, List<PurchaseOrderInfo>> orderInfoMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(orderInfoList)) {
+            for (PurchaseOrderInfo orderInfo : orderInfoList) {
+                String orderingUnit = orderInfo.getOrderingUnit();
+                List<PurchaseOrderInfo> list = orderInfoMap.computeIfAbsent(orderingUnit, k -> new ArrayList<>());
+                list.add(orderInfo);
+            }
+        }
+        // 获取发货单实际发货量
+        Map<String, Double> actualNumMap = shipmentsOrderInfoService.statisticsActualNum(customerIds);
+
         List<GetCustomerDevelopPlanBo> result = new ArrayList<>();
         List<GetCustomerDevelopPlanBo> result = new ArrayList<>();
         for (CustomerDevelopPlan plan : dataList) {
         for (CustomerDevelopPlan plan : dataList) {
             GetCustomerDevelopPlanBo data = new GetCustomerDevelopPlanBo(plan);
             GetCustomerDevelopPlanBo data = new GetCustomerDevelopPlanBo(plan);
             // 客户信息
             // 客户信息
-            Customer customer = customerMap.get(plan.getCustomerId());
+            String customerId = plan.getCustomerId();
+            Customer customer = customerMap.get(customerId);
             data.setCustomer(customer);
             data.setCustomer(customer);
             // 厂房信息
             // 厂房信息
             Workshop workshop = workshopMap.get(plan.getWorkshopId());
             Workshop workshop = workshopMap.get(plan.getWorkshopId());
@@ -292,6 +311,12 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
             // 责任人
             // 责任人
             SysUser user = userMap.get(plan.getChargeUserId());
             SysUser user = userMap.get(plan.getChargeUserId());
             data.setChargeUserName(user == null ? null : user.getName());
             data.setChargeUserName(user == null ? null : user.getName());
+            // 订货吨位
+            Double orderQuantity = calculateTotal(orderInfoMap.get(customerId));
+            data.setOrderQuantity(orderQuantity);
+            // 实发数
+            Double shipmentQuantity = actualNumMap.get(customerId);
+            data.setShipmentQuantity(shipmentQuantity);
 
 
             result.add(data);
             result.add(data);
         }
         }
@@ -329,7 +354,35 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
         // 获取责任人数据
         // 获取责任人数据
         SysUser user = sysUserService.findById(chargeUserId);
         SysUser user = sysUserService.findById(chargeUserId);
         data.setChargeUserName(user.getName());
         data.setChargeUserName(user.getName());
+        // 订货吨位
+        List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByCustomerIds(Collections.singletonList(customerId));
+        Double orderQuantity = calculateTotal(orderInfoList);
+        data.setOrderQuantity(orderQuantity);
+        // 发货吨位
+        Map<String, Double> actualNum = shipmentsOrderInfoService.statisticsActualNum(Collections.singletonList(customerId));
+        data.setShipmentQuantity(actualNum.get(customerId));
 
 
         return data;
         return data;
     }
     }
+
+
+    /**
+     * 计算订货吨位
+     *
+     * @param orderInfoList 订货单集合
+     * @return              Double
+     */
+    private Double calculateTotal(List<PurchaseOrderInfo> orderInfoList) {
+        if (CollectionUtils.isEmpty(orderInfoList)) {
+            return 0d;
+        }
+        BigDecimal total = BigDecimal.ZERO;
+        for (PurchaseOrderInfo orderInfo : orderInfoList) {
+            BigDecimal totalQuantity = orderInfo.getTotalQuantity();
+            if (totalQuantity != null) {
+                total = total.add(totalQuantity);
+            }
+        }
+        return total.doubleValue();
+    }
 }
 }

@@ -85,6 +85,8 @@ public class ShipmentsPlanController extends DefaultBaseController {
     @HasPermission({"shipping-plan-manage:shipping-plan:modify", "shipping-plan-manage:shipping-plan:check"})
     @HasPermission({"shipping-plan-manage:shipping-plan:modify", "shipping-plan-manage:shipping-plan:check"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@Valid UpdateShipmentsPlanVo vo) {
     public InvokeResult<Void> update(@Valid UpdateShipmentsPlanVo vo) {
+        // 校验数据完整性
+        shipmentsPlanDetailService.checkDataIntegrity(vo.getId(), vo.getStatus());
         shipmentsPlanService.update(vo);
         shipmentsPlanService.update(vo);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }

@@ -146,7 +146,9 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
     @Override
     @Override
     public CustomerDevelopPlan findById(String id) {
     public CustomerDevelopPlan findById(String id) {
         CustomerDevelopPlan plan = getBaseMapper().selectById(id);
         CustomerDevelopPlan plan = getBaseMapper().selectById(id);
-
+        if (plan == null) {
+            throw new DefaultClientException("客户开发计划不存在！");
+        }
         QueryCustomerVisitRecordVo recordVo = new QueryCustomerVisitRecordVo();
         QueryCustomerVisitRecordVo recordVo = new QueryCustomerVisitRecordVo();
         recordVo.setCustomerId(id);
         recordVo.setCustomerId(id);
         List<CustomerVisitRecord> visitRecordList = customerVisitRecordService.query(recordVo);
         List<CustomerVisitRecord> visitRecordList = customerVisitRecordService.query(recordVo);

 package com.lframework.xingyun.sc.impl.order;
 package com.lframework.xingyun.sc.impl.order;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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;
@@ -555,6 +556,17 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
     }
 
 
     @Override
     @Override
+    public List<PurchaseOrderInfo> listByCustomerIds(List<String> customerIds) {
+        if (CollectionUtils.isEmpty(customerIds)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<PurchaseOrderInfo> queryWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class);
+        queryWrapper.in(PurchaseOrderInfo::getOrderingUnit, customerIds);
+
+        return getBaseMapper().selectList(queryWrapper);
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {
 
 
     }
     }

@@ -256,7 +256,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         String type = vo.getType();
         String type = vo.getType();
         if ("AUTO".equals(type)) {
         if ("AUTO".equals(type)) {
             // 根据客户批量生成
             // 根据客户批量生成
-            List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByPlanId(planId);
+            List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByPlanId(planId, false);
             if (CollectionUtils.isEmpty(detailList)) {
             if (CollectionUtils.isEmpty(detailList)) {
                 throw new DefaultClientException("发货明细数据不存在！");
                 throw new DefaultClientException("发货明细数据不存在！");
             }
             }
@@ -420,6 +420,25 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         return getBaseMapper().queryByIds(ids);
         return getBaseMapper().queryByIds(ids);
     }
     }
 
 
+    @Override
+    public Map<String, Double> statisticsActualNum(List<String> customerIds) {
+        if (CollectionUtils.isEmpty(customerIds)) {
+            return Collections.emptyMap();
+        }
+        List<Map<String, Object>> mapList = getBaseMapper().statisticsActualNum(customerIds);
+        if (CollectionUtils.isEmpty(mapList)) {
+            return Collections.emptyMap();
+        }
+        Map<String, Double> result = new HashMap<>();
+        for (Map<String, Object> map : mapList) {
+            String key = (String) map.get("customer_id");
+            Double value = (Double) map.get("actual_num");
+
+            result.put(key, value);
+        }
+        return result;
+    }
+
 
 
     /**
     /**
      * 处理批次数据
      * 处理批次数据

@@ -32,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
+import java.time.LocalTime;
 import java.util.*;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -365,11 +366,11 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     }
     }
 
 
     @Override
     @Override
-    public List<ShipmentsPlanDetail> listByPlanId(String planId) {
+    public List<ShipmentsPlanDetail> listByPlanId(String planId, boolean includePreShipment) {
         if (StringUtils.isBlank(planId)) {
         if (StringUtils.isBlank(planId)) {
             return Collections.emptyList();
             return Collections.emptyList();
         }
         }
-        return getBaseMapper().listByPlanId(planId);
+        return getBaseMapper().listByPlanId(planId, includePreShipment);
     }
     }
 
 
     @Override
     @Override
@@ -407,6 +408,35 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         return getBaseMapper().selectList(queryWrapper);
         return getBaseMapper().selectList(queryWrapper);
     }
     }
 
 
+    @Override
+    public void checkDataIntegrity(String planId, String status) {
+        // 获取明细数据
+        List<ShipmentsPlanDetail> detailList = listByPlanId(planId, true);
+        if (CollectionUtils.isEmpty(detailList)) {
+            return;
+        }
+        // 校验数据完整性
+        for (ShipmentsPlanDetail detail : detailList) {
+            LocalTime shipmentsTime = detail.getShipmentsTime();
+            Boolean canShipments = detail.getCanShipments();
+            Boolean preShipments = detail.getPreShipments();
+            if ("CHECKING".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("是否可发货不能为空！");
+                }
+            }
+        }
+    }
+
 
 
     /**
     /**
      * 封装发货计划明细数据
      * 封装发货计划明细数据

@@ -114,9 +114,6 @@ public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMap
                 .eq(ShipmentsPlan::getId, vo.getId());
                 .eq(ShipmentsPlan::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
-        if ("CHECK".equals(vo.getStatus())) {
-            // 更新订货单规格发货状态
-        }
 
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);

@@ -6,6 +6,7 @@ import com.lframework.xingyun.sc.vo.shipments.order.QueryShipmentsOrderInfoVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -38,4 +39,12 @@ public interface ShipmentsOrderInfoMapper extends BaseMapper<ShipmentsOrderInfo>
      * @return      List<ShipmentsOrderInfo>
      * @return      List<ShipmentsOrderInfo>
      */
      */
     List<ShipmentsOrderInfo> queryByIds(@Param("ids") List<String> ids);
     List<ShipmentsOrderInfo> queryByIds(@Param("ids") List<String> ids);
+
+    /**
+     * 根据客户分组统计实发数
+     *
+     * @param customerIds   客户ID集合
+     * @return              List<Map<String, Double>>
+     */
+    List<Map<String, Object>> statisticsActualNum(@Param("customerIds") List<String> customerIds);
 }
 }

@@ -51,10 +51,11 @@ public interface ShipmentsPlanDetailMapper extends BaseMapper<ShipmentsPlanDetai
     /**
     /**
      * 根据计划ID查询
      * 根据计划ID查询
      *
      *
-     * @param planId    计划ID
+     * @param planId                计划ID
+     * @param includePreShipment    是否包含预发数据
      * @return          List<ShipmentsPlanDetail>
      * @return          List<ShipmentsPlanDetail>
      */
      */
-    List<ShipmentsPlanDetail> listByPlanId(@Param("planId") String planId);
+    List<ShipmentsPlanDetail> listByPlanId(@Param("planId") String planId, @Param("includePreShipment") boolean includePreShipment);
 
 
     /**
     /**
      * 查询
      * 查询

@@ -124,4 +124,12 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @return      List<PurchaseOrderInfo>
      * @return      List<PurchaseOrderInfo>
      */
      */
     List<PurchaseOrderInfo> queryByIds(List<String> ids);
     List<PurchaseOrderInfo> queryByIds(List<String> ids);
+
+    /**
+     * 批量获取客户所有订货单数据
+     *
+     * @param customerIds   客户ID集合
+     * @return              List<PurchaseOrderInfo>
+     */
+    List<PurchaseOrderInfo> listByCustomerIds(List<String> customerIds);
 }
 }

@@ -5,6 +5,7 @@ import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 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 java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 发货单 Service
  * 发货单 Service
@@ -99,4 +100,12 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
      * @return      List<ShipmentsOrderInfo>
      * @return      List<ShipmentsOrderInfo>
      */
      */
     List<ShipmentsOrderInfo> queryByIds(List<String> ids);
     List<ShipmentsOrderInfo> queryByIds(List<String> ids);
+
+    /**
+     * 根据客户分组统计实发数
+     *
+     * @param customerIds   客户ID集合
+     * @return              List<ShipmentsPlanDetail>
+     */
+    Map<String, Double> statisticsActualNum(List<String> customerIds);
 }
 }

@@ -113,7 +113,7 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * @param planId    计划ID
      * @param planId    计划ID
      * @return          List<ShipmentsPlanDetail>
      * @return          List<ShipmentsPlanDetail>
      */
      */
-    List<ShipmentsPlanDetail> listByPlanId(String planId);
+    List<ShipmentsPlanDetail> listByPlanId(String planId, boolean includePreShipment);
 
 
 
 
     /**
     /**
@@ -130,4 +130,13 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * @return          List<ShipmentsPlanDetail>
      * @return          List<ShipmentsPlanDetail>
      */
      */
     List<ShipmentsPlanDetail> listBySpecIds(List<String> specIds);
     List<ShipmentsPlanDetail> listBySpecIds(List<String> specIds);
+
+    /**
+     * 校验数据完整性
+     * 仅针对发货时点、是否可发货
+     *
+     * @param planId    计划ID
+     * @param status    状态
+     */
+    void checkDataIntegrity(String planId, String status);
 }
 }

@@ -113,4 +113,15 @@
             #{item}
             #{item}
         </foreach>
         </foreach>
     </select>
     </select>
+
+    <select id="statisticsActualNum" resultType="java.util.Map">
+        select o.customer_id,sum(d.actual_shipment_quantity) as actual_num
+        from shipments_order_info o
+        inner join shipments_plan_detail d on o.id = d.shipment_order_id
+        where o.customer_id in
+        <foreach collection="customerIds" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+        group by o.customer_id
+    </select>
 </mapper>
 </mapper>

@@ -275,7 +275,12 @@
             ol.quantity,
             ol.quantity,
             c.id as customer_id
             c.id as customer_id
         from shipments_plan_detail pd
         from shipments_plan_detail pd
-        inner join shipments_plan p on pd.plan_id = p.id and pd.shipments_date = p.tomo_pre_ship_date
+        <if test="includePreShipment == true">
+            inner join shipments_plan p on pd.plan_id = p.id
+        </if>
+        <if test="includePreShipment == false">
+            inner join shipments_plan p on pd.plan_id = p.id and pd.shipments_date = p.tomo_pre_ship_date
+        </if>
         left join tbl_purchase_order_line ol on pd.order_spec_id = ol.id
         left join tbl_purchase_order_line ol on pd.order_spec_id = ol.id
         left join purchase_order_info o on pd.order_id = o.id
         left join purchase_order_info o on pd.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