Merge branch 'master_after20' into master_cj_zq

@@ -129,7 +129,7 @@ CREATE TABLE IF NOT EXISTS `customer_credit`
     `create_time`                     datetime     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_time`                     datetime     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     `status`                          varchar(20)  DEFAULT NULL COMMENT '审核状态',
-    `certification_certificate`       varchar(100) DEFAULT NULL COMMENT '认证证书',
+    `certification_certificate`       varchar(500) DEFAULT NULL COMMENT '认证证书',
     `business_file_name`              varchar(100) DEFAULT NULL COMMENT '工商信息文件名',
     `business_file_id`                varchar(100) DEFAULT NULL COMMENT '工商信息文件ID',
     `shareholder_file_name`           varchar(100) DEFAULT NULL COMMENT '股东信息文件名',
@@ -212,7 +212,7 @@ CREATE TABLE IF NOT EXISTS `customer_credit_history`
     `create_time`                  datetime     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_time`                  datetime     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     `status`                       varchar(20)  DEFAULT NULL COMMENT '审核状态',
-    `certification_certificate`    varchar(100) DEFAULT NULL COMMENT '认证证书',
+    `certification_certificate`    varchar(500) DEFAULT NULL COMMENT '认证证书',
     PRIMARY KEY (`id`),
     KEY                            `idx_serial_number` (`serial_number`),
     KEY                            `idx_register_date` (`register_date`),

@@ -72,6 +72,12 @@ public class ShipmentsPlanBo extends BaseBo<ShipmentsPlan> {
     private Boolean operate;
 
     /**
+     * 是否系统自动生成
+     */
+    @ApiModelProperty("是否系统自动生成")
+    private Boolean autoGenerate;
+
+    /**
      * 创建人ID
      */
     @ApiModelProperty("创建人ID")

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.controller.shipments;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.xingyun.sc.bo.shipments.plan.ShipmentsPlanBo;
 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.CreateShipmentsPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanVo;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanVo;
@@ -25,6 +27,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -99,4 +102,38 @@ public class ShipmentsPlanController extends DefaultBaseController {
     public void autoCreateShipmentPlan() {
         shipmentsPlanDetailService.autoCreateShipmentPlan();
     }
+
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"shipping-plan-manage:shipping-plan:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@RequestBody CreateShipmentsPlanVo vo) {
+        // 日期处理
+        LocalDate now = LocalDate.now();
+        vo.setTomoPreShipDate(now.plusDays(1));
+        vo.setAfTomoPreShipDate(now.plusDays(2));
+        // 新增发货计划
+        String planId = shipmentsPlanService.create(vo);
+        // 处理发货明细
+        CreateShipmentsPlanDetailVo planDetailVo = new CreateShipmentsPlanDetailVo();
+        planDetailVo.setPlanId(planId);
+        List<String> tomoPreShipOrderSpecIds = vo.getTomoPreShipOrderSpecIds();
+        if (CollectionUtil.isNotEmpty(tomoPreShipOrderSpecIds)) {
+            planDetailVo.setOrderSpecIds(tomoPreShipOrderSpecIds);
+            planDetailVo.setShipmentDate(vo.getTomoPreShipDate());
+
+            shipmentsPlanDetailService.create(planDetailVo);
+        }
+        List<String> afTomoPreShipOrderSpecIds = vo.getAfTomoPreShipOrderSpecIds();
+        if (CollectionUtil.isNotEmpty(afTomoPreShipOrderSpecIds)) {
+            planDetailVo.setOrderSpecIds(afTomoPreShipOrderSpecIds);
+            planDetailVo.setShipmentDate(vo.getAfTomoPreShipDate());
+
+            shipmentsPlanDetailService.create(planDetailVo);
+        }
+        return InvokeResultBuilder.success();
+    }
 }

@@ -53,6 +53,11 @@ public class ShipmentsPlan extends BaseEntity implements BaseDto {
     private LocalDate afTomoPreShipDate;
 
     /**
+     * 是否系统自动生成
+     */
+    private Boolean autoGenerate;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -350,10 +350,6 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 if (shipmentsTime == null) {
                     throw new DefaultClientException("发货时点不能为空！");
                 }
-                UpdateShipmentsPlanDetailVo detailVo = new UpdateShipmentsPlanDetailVo();
-                detailVo.setId(detail.getId());
-                detailVo.setCanShipments(Boolean.TRUE);
-                shipmentsPlanDetailService.update(detailVo);
             }
             List<List<ShipmentsPlanDetail>> batchList = CommonUtil.partition(detailList, 8);
             handleBatchData(batchList, planId);

@@ -181,10 +181,14 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     public PageResult<ShipmentsPlanDetail> queryCanShipmentsData(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo) {
         // 获取发货计划数据
         ShipmentsPlan plan = shipmentsPlanService.findById(vo.getPlanId());
-        if (plan == null) {
-            throw new DefaultClientException("发货计划不存在！");
+        String workshopId = vo.getWorkshopId();
+        if (plan != null) {
+            workshopId = plan.getWorkshopId();
         }
-        vo.setWorkshopId(plan.getWorkshopId());
+        if (StringUtils.isEmpty(workshopId)) {
+            throw new DefaultClientException("厂房数据不能为空，请选择对应厂房！");
+        }
+        vo.setWorkshopId(workshopId);
         List<String> existOrderSpecIds = new ArrayList<>();
         // 获取已经存在的明细数据
         LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
@@ -195,10 +199,12 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
             List<String> orderSpecIds = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
             existOrderSpecIds.addAll(orderSpecIds);
         }
-        detailList = listByPlanId(plan.getId(), true);
-        if (CollectionUtils.isNotEmpty(detailList)) {
-            List<String> orderSpecIds = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
-            existOrderSpecIds.addAll(orderSpecIds);
+        if (plan != null) {
+            detailList = listByPlanId(plan.getId(), true);
+            if (CollectionUtils.isNotEmpty(detailList)) {
+                List<String> orderSpecIds = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
+                existOrderSpecIds.addAll(orderSpecIds);
+            }
         }
         vo.setOrderSpecIds(existOrderSpecIds);
         // 业务员做权限控制

@@ -89,7 +89,8 @@ public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMap
         ShipmentsPlan data = new ShipmentsPlan();
         data.setId(IdUtil.getId());
         data.setWorkshopId(vo.getWorkshopId());
-        data.setStatus(vo.getStatus());
+        data.setStatus("DRAFT");
+        data.setAutoGenerate(Boolean.FALSE);
         data.setTomoPreShipDate(vo.getTomoPreShipDate());
         data.setAfTomoPreShipDate(vo.getAfTomoPreShipDate());
 

 package com.lframework.xingyun.sc.vo.shipments.plan;
 
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDate;
-import com.lframework.starter.web.core.utils.IdUtil;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.starter.web.core.vo.BaseVo;
-import javax.validation.constraints.NotNull;
 import io.swagger.annotations.ApiModelProperty;
-import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.List;
+
 import lombok.Data;
 
 @Data
@@ -25,27 +26,28 @@ public class CreateShipmentsPlanVo implements BaseVo, Serializable {
     private String workshopId;
 
     /**
-     * 状态
-     */
-    @ApiModelProperty(value = "状态", required = true)
-    @NotBlank(message = "请输入状态！")
-    @Length(message = "状态最多允许20个字符！")
-    private String status;
-
-    /**
      * 明日预发日期
      */
-    @ApiModelProperty(value = "明日预发日期", required = true)
-    @NotNull(message = "请输入明日预发日期！")
+    @ApiModelProperty(value = "明日预发日期")
     @TypeMismatch(message = "明日预发日期格式有误！")
     private LocalDate tomoPreShipDate;
 
     /**
      * 后日预发日期
      */
-    @ApiModelProperty(value = "后日预发日期", required = true)
-    @NotNull(message = "请输入后日预发日期！")
+    @ApiModelProperty(value = "后日预发日期")
     @TypeMismatch(message = "后日预发日期格式有误！")
     private LocalDate afTomoPreShipDate;
 
+    /**
+     * 明日预发规格集合
+     */
+    @ApiModelProperty(value = "明日预发规格集合")
+    private List<String> tomoPreShipOrderSpecIds;
+
+    /**
+     * 后日预发规格集合
+     */
+    @ApiModelProperty(value = "后日预发规格集合")
+    private List<String> afTomoPreShipOrderSpecIds;
 }

@@ -9,6 +9,7 @@
         <result column="status" property="status"/>
         <result column="tomo_pre_ship_date" property="tomoPreShipDate"/>
         <result column="af_tomo_pre_ship_date" property="afTomoPreShipDate"/>
+        <result column="auto_generate" property="autoGenerate"/>
         <result column="create_by_id" property="createById"/>
         <result column="update_by_id" property="updateById"/>
         <result column="create_time" property="createTime"/>
@@ -23,6 +24,7 @@
             tb.status,
             tb.tomo_pre_ship_date,
             tb.af_tomo_pre_ship_date,
+            tb.auto_generate,
             tb.create_by_id,
             tb.update_by_id,
             tb.create_time,