楚江ERP-发货单相关功能开发

@@ -38,12 +38,24 @@ public class GetShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
     private String customerId;
 
     /**
+     * 购货单位名称
+     */
+    @ApiModelProperty("购货单位名称")
+    private String customerName;
+
+    /**
      * 厂房ID
      */
     @ApiModelProperty("厂房ID")
     private String workshopId;
 
     /**
+     * 厂房名称
+     */
+    @ApiModelProperty("厂房名称")
+    private String workshopName;
+
+    /**
      * 发货日期
      */
     @ApiModelProperty("发货日期")
@@ -57,6 +69,12 @@ public class GetShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
     private String deptId;
 
     /**
+     * 办事处名称
+     */
+    @ApiModelProperty("办事处名称")
+    private String deptName;
+
+    /**
      * 交货方式
      */
     @ApiModelProperty("交货方式")

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.controller.shipments;
 
 import com.lframework.xingyun.sc.bo.shipments.order.GetShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.order.QueryShipmentsOrderInfoBo;
+import com.lframework.xingyun.sc.vo.shipments.order.GenerateShipmentsOrderVo;
 import com.lframework.xingyun.sc.vo.shipments.order.QueryShipmentsOrderInfoVo;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.vo.shipments.order.CreateShipmentsOrderInfoVo;
@@ -110,4 +111,17 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
         shipmentsOrderInfoService.deleteById(id);
         return InvokeResultBuilder.success();
     }
+
+
+    /**
+     * 生成发货单和要车相关数据
+     */
+    @ApiOperation("生成发货单和要车相关数据")
+    @HasPermission({"shipping-plan-manage:shipping-plan:generate"})
+    @PostMapping("/generate")
+    public InvokeResult<Void> generate(@Valid @RequestBody GenerateShipmentsOrderVo vo) {
+        // 生成发货单和要车相关数据
+        shipmentsOrderInfoService.generate(vo);
+        return InvokeResultBuilder.success();
+    }
 }

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -92,6 +94,12 @@ public class ShipmentsOrderInfo extends BaseEntity implements BaseDto {
     private String status;
 
     /**
+     * 发货明细数据
+     */
+    @TableField(exist = false)
+    private List<ShipmentsPlanDetail> detailList;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -37,6 +37,11 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private String planId;
 
     /**
+     * 发货单ID
+     */
+    private String shipmentOrderId;
+
+    /**
      * 订货单ID
      */
     private String orderId;
@@ -53,6 +58,25 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private String orderNo;
 
     /**
+     * 合同类型
+     */
+    @TableField(exist = false)
+    private String contractType;
+
+    /**
+     * 交货方式
+     */
+    @TableField(exist = false)
+    private String deliveryMethod;
+
+
+    /**
+     * 结算方式或期限
+     */
+    @TableField(exist = false)
+    private String settlementTerms;
+
+    /**
      * 客户ID
      */
     @TableField(exist = false)

@@ -3,20 +3,26 @@ 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.utils.*;
 import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
-import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
-import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
-import com.lframework.starter.web.core.utils.IdUtil;
 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 com.lframework.xingyun.sc.entity.ShipmentsPlan;
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
+import com.lframework.xingyun.sc.vo.shipments.order.GenerateShipmentsOrderVo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,13 +45,12 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
 
     @Resource
     private SysDeptService sysDeptService;
+    @Resource
+    private ShipmentsPlanDetailService shipmentsPlanDetailService;
+    @Resource
+    private ShipmentsPlanService shipmentsPlanService;
 
 
-
-    public ShipmentsOrderInfoServiceImpl(SysDeptService sysDeptService) {
-        this.sysDeptService = sysDeptService;
-    }
-
     @Override
     public PageResult<ShipmentsOrderInfo> query(Integer pageIndex, Integer pageSize, QueryShipmentsOrderInfoVo vo) {
         Assert.greaterThanZero(pageIndex);
@@ -106,7 +111,40 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
 
     @Override
     public ShipmentsOrderInfo findById(String id) {
-        return getBaseMapper().selectById(id);
+        ShipmentsOrderInfo orderInfo = getBaseMapper().selectById(id);
+        // 购货单位
+        String customerId = orderInfo.getCustomerId();
+        if (StringUtils.isNotBlank(customerId)) {
+            CustomerService customerService = ApplicationUtil.getBean(CustomerService.class);
+            Customer customer = customerService.findById(customerId);
+            orderInfo.setCustomerName(customer == null ? null : customer.getName());
+        }
+        // 厂房
+        String workshopId = orderInfo.getWorkshopId();
+        if (StringUtils.isNotBlank(workshopId)) {
+            WorkshopService workshopService = ApplicationUtil.getBean(WorkshopService.class);
+            Workshop workshop = workshopService.findById(workshopId);
+            orderInfo.setWorkshopName(workshop == null ? null : workshop.getName());
+        }
+        // 办事处
+        String deptId = orderInfo.getDeptId();
+        if (StringUtils.isNotBlank(deptId)) {
+            String[] split = deptId.split(",");
+            List<SysDept> deptList = sysDeptService.listByIds(Arrays.asList(split));
+            StringBuilder builder = new StringBuilder();
+            for (SysDept dept : deptList) {
+                builder.append(dept.getName()).append(",");
+            }
+            if (builder.length() > 0) {
+                builder.deleteCharAt(builder.length() - 1);
+            }
+            orderInfo.setDeptName(builder.toString());
+        }
+        // 获取发货单明细数据
+        List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(id);
+        orderInfo.setDetailList(detailList);
+
+        return orderInfo;
     }
 
     @OpLog(type = OtherOpLogType.class, name = "新增发货单，ID：{}", params = {"#id"})
@@ -161,4 +199,59 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     public void deleteById(String id) {
         getBaseMapper().deleteById(id);
     }
+
+    @Override
+    public void generate(GenerateShipmentsOrderVo vo) {
+        String planId = vo.getPlanId();
+        String type = vo.getType();
+        if ("AUTO".equals(type)) {
+            // 根据客户批量生成
+
+        } else {
+            List<String> planDetailIds = vo.getPlanDetailIds();
+            if (CollectionUtils.isEmpty(planDetailIds)) {
+                throw new DefaultClientException("发货明细id不能为空！");
+            }
+            List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByIds(planDetailIds);
+            if (CollectionUtils.isEmpty(detailList)) {
+                throw new DefaultClientException("发货明细数据不存在！");
+            }
+            String id = IdUtil.getId();
+            String customerId = detailList.get(0).getCustomerId();
+            StringBuilder deliveryTypeBuilder = new StringBuilder();
+            StringBuilder destinationBuilder = new StringBuilder();
+            // 获取城市数据
+
+            for (ShipmentsPlanDetail detail : detailList) {
+                if (!customerId.equals(detail.getCustomerId())) {
+                    throw new DefaultClientException("只能选择同一客户下的数据！");
+                }
+                detail.setShipmentOrderId(id);
+
+                deliveryTypeBuilder.append(detail.getDeliveryMethod()).append(",");
+            }
+            if (deliveryTypeBuilder.length() > 0) {
+                deliveryTypeBuilder.setLength(deliveryTypeBuilder.length() - 1);
+            }
+            if (destinationBuilder.length() > 0) {
+                destinationBuilder.setLength(destinationBuilder.length() - 1);
+            }
+            // 获取发货计划数据
+            ShipmentsPlan plan = shipmentsPlanService.findById(planId);
+            // 封装发货单数据
+            CreateShipmentsOrderInfoVo createVo = new CreateShipmentsOrderInfoVo();
+            createVo.setPlanId(planId);
+            createVo.setCustomerId(customerId);
+            createVo.setWorkshopId(plan.getWorkshopId());
+            createVo.setShipmentsDate(plan.getTomoPreShipDate());
+            createVo.setDeliveryType(deliveryTypeBuilder.toString());
+            createVo.setDestination(destinationBuilder.toString());
+
+            create(createVo);
+            // 更新明细数据
+            shipmentsPlanDetailService.setShipmentsOrderId(planDetailIds, id);
+            // 获取订货单数据
+
+        }
+    }
 }

@@ -34,16 +34,14 @@ 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 org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -136,8 +134,8 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         }
 
         LambdaUpdateWrapper<ShipmentsPlanDetail> updateWrapper = Wrappers.lambdaUpdate(ShipmentsPlanDetail.class)
-                .set(ShipmentsPlanDetail::getShipmentsTime, vo.getShipmentsTime())
-                .set(ShipmentsPlanDetail::getCanShipments, vo.getCanShipments())
+                .set(vo.getShipmentsTime() != null, ShipmentsPlanDetail::getShipmentsTime, vo.getShipmentsTime())
+                .set(vo.getCanShipments() != null, ShipmentsPlanDetail::getCanShipments, vo.getCanShipments())
                 .eq(ShipmentsPlanDetail::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
@@ -167,7 +165,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         }
         // 开启分页
         PageHelperUtil.startPage(pageIndex, pageSize);
-        List<ShipmentsPlanDetail> dataList = getBaseMapper().queryCanShipmentsData(LocalDate.now(), vo);
+        List<ShipmentsPlanDetail> dataList = getBaseMapper().queryCanShipmentsData(vo);
 
         return PageResultUtil.convert(new PageInfo<>(dataList));
     }
@@ -297,6 +295,25 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         getBaseMapper().delete(updateWrapper);
     }
 
+    @Override
+    public List<ShipmentsPlanDetail> listByShipmentOrderId(String shipmentOrderId) {
+        if (StringUtils.isBlank(shipmentOrderId)) {
+            return Collections.emptyList();
+        }
+        return getBaseMapper().listByShipmentOrderId(shipmentOrderId);
+    }
+
+    @Override
+    public void setShipmentsOrderId(List<String> ids, String shipmentOrderId) {
+        if (CollectionUtils.isEmpty(ids) || StringUtils.isBlank(shipmentOrderId)) {
+            return;
+        }
+        LambdaUpdateWrapper<ShipmentsPlanDetail> updateWrapper = Wrappers.lambdaUpdate(ShipmentsPlanDetail.class);
+        updateWrapper.set(ShipmentsPlanDetail::getShipmentOrderId, shipmentOrderId)
+                .in(ShipmentsPlanDetail::getId, ids);
+        getBaseMapper().update(updateWrapper);
+    }
+
 
     /**
      * 封装发货计划明细数据

@@ -38,5 +38,13 @@ public interface ShipmentsPlanDetailMapper extends BaseMapper<ShipmentsPlanDetai
      * @param vo    查询条件
      * @return      List<ShipmentsPlanDetail>
      */
-    List<ShipmentsPlanDetail> queryCanShipmentsData(@Param("shipmentsDate") LocalDate shipmentsDate, @Param("vo") QueryShipmentsPlanDetailVo vo);
+    List<ShipmentsPlanDetail> queryCanShipmentsData(@Param("vo") QueryShipmentsPlanDetailVo vo);
+
+    /**
+     * 根据发货单ID查询
+     *
+     * @param shipmentOrderId   发货单ID
+     * @return                  List<ShipmentsPlanDetail>
+     */
+    List<ShipmentsPlanDetail> listByShipmentOrderId(String shipmentOrderId);
 }

 package com.lframework.xingyun.sc.service.shipments;
 
 import com.lframework.xingyun.sc.vo.shipments.order.CreateShipmentsOrderInfoVo;
+import com.lframework.xingyun.sc.vo.shipments.order.GenerateShipmentsOrderVo;
 import com.lframework.xingyun.sc.vo.shipments.order.QueryShipmentsOrderInfoVo;
 import com.lframework.xingyun.sc.vo.shipments.order.UpdateShipmentsOrderInfoVo;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
@@ -57,4 +58,11 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
      * @param id    主键ID
      */
     void deleteById(String id);
+
+    /**
+     * 生成发货单
+     *
+     * @param vo    生成条件
+     */
+    void generate(GenerateShipmentsOrderVo vo);
 }

@@ -80,4 +80,20 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * @param ids   主键ID集合
      */
     void batchDelete(List<String> ids);
+
+    /**
+     * 根据发货单ID查询
+     *
+     * @param shipmentOrderId   发货单ID
+     * @return                  List<ShipmentsPlanDetail>
+     */
+    List<ShipmentsPlanDetail> listByShipmentOrderId(String shipmentOrderId);
+
+    /**
+     * 批量设置发货单ID
+     *
+     * @param ids               主键集合
+     * @param shipmentOrderId   发货单ID
+     */
+    void setShipmentsOrderId(List<String> ids, String shipmentOrderId);
 }

+package com.lframework.xingyun.sc.vo.shipments.order;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class GenerateShipmentsOrderVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 计划ID
+     */
+    @ApiModelProperty(value = "planId", required = true)
+    @NotBlank(message = "计划ID不能为空！")
+    private String planId;
+
+    /**
+     * 生成类型
+     * AUTO：自动生成
+     * NO_AUTO：手动生成
+     */
+    @ApiModelProperty(value = "type", required = true)
+    @NotBlank(message = "生成类型不能为空！")
+    private String type;
+
+    /**
+     * 计划明细ID集合
+     */
+    @ApiModelProperty(value = "状态", required = true)
+    private List<String> planDetailIds;
+}

@@ -26,6 +26,7 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial
     @ApiModelProperty("发货日期")
     @TypeMismatch(message = "发货日期格式有误！")
     private LocalDate shipmentsDate;
+    private LocalDate shipmentDate;
 
     /**
      * 订货单规格ID集合

@@ -138,7 +138,7 @@
         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}
+        where ol.delivery_date >= #{vo.shipmentDate}
         <if test="vo.orderSpecIds != null and vo.orderSpecIds.size() > 0">
             and ol.id not in
             <foreach collection="vo.orderSpecIds" open="(" separator="," close=")" item="item">
@@ -152,4 +152,47 @@
             AND c.name like concat('%', #{vo.customerName}, '%')
         </if>
     </select>
+
+    <select id="listByShipmentOrderId" resultType="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail">
+        SELECT
+            tb.id,
+            tb.plan_id,
+            tb.shipment_order_id,
+            tb.order_id,
+            o.order_no,
+            o.ordering_unit AS customer_id,
+            o.delivery_method,
+            o.settlement_terms,
+            sc.type as contract_type,
+            c.name AS customer_name,
+            tb.order_spec_id,
+            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,
+            tb.parent_id,
+            tb.status,
+            tb.shipments_date,
+            tb.shipments_time,
+            tb.can_shipments,
+            tb.del_flag,
+            tb.create_by_id,
+            tb.update_by_id,
+            tb.create_time,
+            tb.update_time
+        FROM shipments_plan_detail AS tb
+        INNER JOIN shipments_order_info so ON tb.shipment_order_id = so.id
+        LEFT JOIN purchase_order_info o ON tb.order_id = o.id
+        LEFT JOIN tbl_contract_distributor_standard sc ON o.contract_id = sc.id
+        LEFT JOIN base_data_customer c ON o.ordering_unit = c.id
+        LEFT JOIN tbl_purchase_order_line ol ON tb.order_spec_id = ol.id
+        WHERE tb.del_flag = false
+        AND tb.shipment_order_id = #{shipmentOrderId}
+    </select>
 </mapper>