楚江ERP：延期发货基础方法完善

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.bo.shipments.delay;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 import com.lframework.starter.web.core.bo.BaseBo;
@@ -46,6 +47,12 @@ public class GetDelayedShipmentBo extends BaseBo<DelayedShipment> {
     private LocalDate applyDate;
 
     /**
+     * 总数量
+     */
+    @ApiModelProperty("总数量")
+    private BigDecimal totalQuantity;
+
+    /**
      * 审核状态
      */
     @ApiModelProperty("审核状态")

@@ -38,18 +38,48 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
     private String planId;
 
     /**
+     * 发货单ID
+     */
+    @ApiModelProperty("发货单ID")
+    private String shipmentOrderId;
+
+    /**
      * 订货单ID
      */
     @ApiModelProperty("订货单ID")
     private String orderId;
 
     /**
+     * 订货单规格ID
+     */
+    @ApiModelProperty("订货单规格ID")
+    private String orderSpecId;
+
+    /**
      * 订单编号
      */
     @ApiModelProperty("订单编号")
     private String orderNo;
 
     /**
+     * 订单类型
+     */
+    @ApiModelProperty("订单类型")
+    private String orderType;
+
+    /**
+     * 所属分厂
+     */
+    @ApiModelProperty("所属分厂")
+    private String workshopName;
+
+    /**
+     * 申请次数
+     */
+    @ApiModelProperty("申请次数")
+    private Integer applyCount;
+
+    /**
      * 客户ID
      */
     @ApiModelProperty("客户ID")

@@ -13,6 +13,7 @@ import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.bo.system.user.QuerySysUserBo;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysUserService;
+import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
@@ -498,6 +499,13 @@ public class CustomerCreditController extends DefaultBaseController {
                 credit.setSupervisorReviewName(sysUser.getName());
             }
         }
+        //公司名称
+        if (StringUtil.isNotEmpty(credit.getCompanyId())) {
+            Customer customer = customerService.findById(credit.getCompanyId());
+            if (customer != null) {
+                credit.setCompanyName(customer.getName());
+            }
+        }
         return credit;
     }
 }

 package com.lframework.xingyun.sc.controller.shipments;
 
 import com.lframework.xingyun.sc.bo.shipments.plan.ShipmentsPlanDetailBo;
+import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
+import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
+import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.vo.shipments.plan.CreateShipmentsPlanDetailVo;
@@ -40,6 +43,8 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
 
     @Resource
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
+    @Resource
+    private DelayedShipmentDetailService delayedShipmentDetailService;
 
     /**
      * 查询列表
@@ -70,6 +75,15 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
             throw new DefaultClientException("发货计划明细不存在！");
         }
         ShipmentsPlanDetailBo result = new ShipmentsPlanDetailBo(data);
+        //添加申请次数
+        QueryDelayedShipmentDetailVo vo = new QueryDelayedShipmentDetailVo();
+        vo.setOrderSpecId(data.getOrderSpecId());
+        List<DelayedShipmentDetail> query = delayedShipmentDetailService.query(vo);
+        if (CollectionUtil.isEmpty(query)) {
+            result.setApplyCount(1);
+        } else {
+            result.setApplyCount(query.size() + 1);
+        }
 
         return InvokeResultBuilder.success(result);
     }

@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 @Api(tags = "延期发货表")
 @Validated
 @RestController
-@RequestMapping("/delayedShipment/delayedshipment")
+@RequestMapping("/delayedShipment")
 public class DelayedShipmentController extends DefaultBaseController {
 
     @Autowired
@@ -93,7 +93,7 @@ public class DelayedShipmentController extends DefaultBaseController {
     @ApiOperation("新增")
     @HasPermission({"delayedShipment:delayedshipment:add"})
     @PostMapping
-    public InvokeResult<Void> create(@Valid CreateDelayedShipmentVo vo) {
+    public InvokeResult<Void> create(@Valid @RequestBody CreateDelayedShipmentVo vo) {
 
         delayedShipmentService.create(vo);
 
@@ -106,7 +106,7 @@ public class DelayedShipmentController extends DefaultBaseController {
     @ApiOperation("修改")
     @HasPermission({"delayedShipment:delayedshipment:modify"})
     @PutMapping
-    public InvokeResult<Void> update(@Valid UpdateDelayedShipmentVo vo) {
+    public InvokeResult<Void> update(@Valid @RequestBody UpdateDelayedShipmentVo vo) {
 
         delayedShipmentService.update(vo);
 

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
 @Api(tags = "延期发货详情表")
 @Validated
 @RestController
-@RequestMapping("/delayedShipmentDetail/delayedshipmentdetail")
+@RequestMapping("/delayedShipmentDetail")
 public class DelayedShipmentDetailController extends DefaultBaseController {
 
     @Autowired

@@ -2,6 +2,8 @@ package com.lframework.xingyun.sc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
+
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -9,6 +11,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -52,6 +55,11 @@ public class DelayedShipment extends BaseEntity implements BaseDto {
     private String status;
 
     /**
+     * 总数量
+     */
+    private BigDecimal totalQuantity;
+
+    /**
      * 延期发货详情
      */
     @TableField(exist = false)

@@ -58,6 +58,18 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private String orderNo;
 
     /**
+     * 订单类型
+     */
+    @TableField(exist = false)
+    private String orderType;
+
+    /**
+     * 所属分厂
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
      * 合同类型
      */
     @TableField(exist = false)

@@ -1376,6 +1376,18 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
             data.setEnterpriseType(enterpriseType);
         }
 
+        // enterpriseOperationType 转中文
+        String opType = credit.getEnterpriseOperationType();
+        if ("NEW_CUSTOMER".equals(opType)) {
+            data.setEnterpriseOperationType("新开发客户");
+        } else if ("RECONNECT_CUSTOMER".equals(opType)) {
+            data.setEnterpriseOperationType("再接轨客户");
+        } else if ("OLD_CUSTOMER".equals(opType)) {
+            data.setEnterpriseOperationType("老客户");
+        } else {
+            data.setEnterpriseOperationType("");
+        }
+
         // 核心人员列表 - 确保放入数据模型供模板遍历
         List<GetCorePersonnelBo> corePersonnelBoList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(corePersonnelList)) {

@@ -80,7 +80,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     @Override
     public ShipmentsPlanDetail findById(String id) {
 
-        return getBaseMapper().selectById(id);
+        return getBaseMapper().findById(id);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "新增发货计划明细，ID：{}", params = {"#id"})

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.impl.shipments.delay;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
@@ -23,8 +24,6 @@ import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentDetailVo
 import com.lframework.xingyun.sc.vo.shipments.delay.UpdateDelayedShipmentDetailVo;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
-
-import java.util.Collection;
 import java.util.List;
 
 @Service
@@ -51,7 +50,7 @@ public class DelayedShipmentDetailServiceImpl extends BaseMpServiceImpl<DelayedS
     @Override
     public DelayedShipmentDetail findById(String id) {
 
-        return getBaseMapper().selectById(id);
+        return getBaseMapper().findById(id);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "新增延期发货详情表，ID：{}", params = {"#id"})
@@ -61,15 +60,33 @@ public class DelayedShipmentDetailServiceImpl extends BaseMpServiceImpl<DelayedS
 
         DelayedShipmentDetail data = new DelayedShipmentDetail();
         data.setId(IdUtil.getId());
-        data.setDelayedShipmentId(vo.getDelayedShipmentId());
-        data.setOrderId(vo.getOrderId());
-        data.setShipmentsPlanDetailId(vo.getShipmentsPlanDetailId());
-        data.setOrderSpecId(vo.getOrderSpecId());
-        data.setDeliveryDate(vo.getDeliveryDate());
-        data.setApplyShipmentDate(vo.getApplyShipmentDate());
-        data.setApplyCount(vo.getApplyCount());
-        data.setQuantity(vo.getQuantity());
-        data.setDelayReason(vo.getDelayReason());
+        if (!StringUtil.isBlank(vo.getDelayedShipmentId())) {
+            data.setDelayedShipmentId(vo.getDelayedShipmentId());
+        }
+        if (!StringUtil.isBlank(vo.getOrderId())) {
+            data.setOrderId(vo.getOrderId());
+        }
+        if (!StringUtil.isBlank(vo.getShipmentsPlanDetailId())) {
+            data.setShipmentsPlanDetailId(vo.getShipmentsPlanDetailId());
+        }
+        if (!StringUtil.isBlank(vo.getOrderSpecId())) {
+            data.setOrderSpecId(vo.getOrderSpecId());
+        }
+        if (vo.getDeliveryDate() != null) {
+            data.setDeliveryDate(vo.getDeliveryDate());
+        }
+        if (vo.getApplyShipmentDate() != null) {
+            data.setApplyShipmentDate(vo.getApplyShipmentDate());
+        }
+        if (vo.getApplyCount() != null) {
+            data.setApplyCount(vo.getApplyCount());
+        }
+        if (vo.getQuantity() != null) {
+            data.setQuantity(vo.getQuantity());
+        }
+        if (!StringUtil.isBlank(vo.getDelayReason())) {
+            data.setDelayReason(vo.getDelayReason());
+        }
 
         getBaseMapper().insert(data);
 
@@ -90,14 +107,7 @@ public class DelayedShipmentDetailServiceImpl extends BaseMpServiceImpl<DelayedS
         }
 
         LambdaUpdateWrapper<DelayedShipmentDetail> updateWrapper = Wrappers.lambdaUpdate(DelayedShipmentDetail.class)
-                .set(DelayedShipmentDetail::getDelayedShipmentId, vo.getDelayedShipmentId())
-                .set(DelayedShipmentDetail::getOrderId, vo.getOrderId())
-                .set(DelayedShipmentDetail::getShipmentsPlanDetailId, vo.getShipmentsPlanDetailId())
-                .set(DelayedShipmentDetail::getOrderSpecId, vo.getOrderSpecId())
-                .set(DelayedShipmentDetail::getDeliveryDate, vo.getDeliveryDate())
                 .set(DelayedShipmentDetail::getApplyShipmentDate, vo.getApplyShipmentDate())
-                .set(DelayedShipmentDetail::getApplyCount, vo.getApplyCount())
-                .set(DelayedShipmentDetail::getQuantity, vo.getQuantity())
                 .set(DelayedShipmentDetail::getDelayReason, vo.getDelayReason())
                 .eq(DelayedShipmentDetail::getId, vo.getId());
 

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.impl.shipments.delay;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.common.utils.StringUtil;
 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;
@@ -17,17 +19,19 @@ import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.entity.DelayedShipment;
 import com.lframework.xingyun.sc.mappers.DelayedShipmentMapper;
+import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
-import com.lframework.xingyun.sc.vo.shipments.delay.CreateDelayedShipmentVo;
-import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentVo;
-import com.lframework.xingyun.sc.vo.shipments.delay.UpdateDelayedShipmentVo;
+import com.lframework.xingyun.sc.vo.shipments.delay.*;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
-
+import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.util.List;
 
 @Service
 public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmentMapper, DelayedShipment> implements DelayedShipmentService {
+    @Resource
+    private DelayedShipmentDetailService delayedShipmentDetailService;
 
     @Override
     public PageResult<DelayedShipment> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentVo vo) {
@@ -50,7 +54,7 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
     @Override
     public DelayedShipment findById(String id) {
 
-        return getBaseMapper().selectById(id);
+        return getBaseMapper().findById(id);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "新增延期发货表，ID：{}", params = {"#id"})
@@ -60,12 +64,34 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
 
         DelayedShipment data = new DelayedShipment();
         data.setId(IdUtil.getId());
-        data.setDeptId(vo.getDeptId());
-        data.setApplyDate(vo.getApplyDate());
-        data.setStatus(vo.getStatus());
+        if (!StringUtil.isBlank(vo.getDeptId())) {
+            data.setDeptId(vo.getDeptId());
+        }
+        if (vo.getApplyDate() != null) {
+            data.setApplyDate(vo.getApplyDate());
+        } else {
+            data.setApplyDate(LocalDate.now());
+        }
+        if (vo.getTotalQuantity() != null) {
+            data.setTotalQuantity(vo.getTotalQuantity());
+        }
+        if (!StringUtil.isBlank(vo.getStatus())) {
+            data.setStatus(vo.getStatus());
+        } else {
+            data.setStatus("AUDIT");
+        }
 
         getBaseMapper().insert(data);
 
+        //新增延期发货详情列
+        if (CollectionUtil.isNotEmpty(vo.getDelayedShipmentDetailList())) {
+            List<CreateDelayedShipmentDetailVo> delayedShipmentDetailList = vo.getDelayedShipmentDetailList();
+            for (CreateDelayedShipmentDetailVo createDelayedShipmentDetailVo : delayedShipmentDetailList) {
+                createDelayedShipmentDetailVo.setDelayedShipmentId(data.getId());
+                delayedShipmentDetailService.create(createDelayedShipmentDetailVo);
+            }
+        }
+
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
 
@@ -85,11 +111,20 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         LambdaUpdateWrapper<DelayedShipment> updateWrapper = Wrappers.lambdaUpdate(DelayedShipment.class)
                 .set(DelayedShipment::getDeptId, vo.getDeptId())
                 .set(DelayedShipment::getApplyDate, vo.getApplyDate())
-                .set(DelayedShipment::getStatus, vo.getStatus())
+                .set(DelayedShipment::getTotalQuantity, vo.getTotalQuantity())
+                .set(DelayedShipment::getStatus, "AUDIT")
                 .eq(DelayedShipment::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
 
+        //更新延期发货详情列
+        if (CollectionUtil.isNotEmpty(vo.getDelayedShipmentDetailList())) {
+            List<UpdateDelayedShipmentDetailVo> delayedShipmentDetailList = vo.getDelayedShipmentDetailList();
+            for (UpdateDelayedShipmentDetailVo updateDelayedShipmentDetailVo : delayedShipmentDetailList) {
+                delayedShipmentDetailService.update(updateDelayedShipmentDetailVo);
+            }
+        }
+
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
     }

@@ -21,4 +21,12 @@ public interface DelayedShipmentDetailMapper extends BaseMapper<DelayedShipmentD
      * @return
      */
     List<DelayedShipmentDetail> query(@Param("vo") QueryDelayedShipmentDetailVo vo);
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @return DelayedShipmentDetail
+     */
+    DelayedShipmentDetail findById(@Param("id") String id);
 }

@@ -21,4 +21,12 @@ public interface DelayedShipmentMapper extends BaseMapper<DelayedShipment> {
      * @return
      */
     List<DelayedShipment> query(@Param("vo") QueryDelayedShipmentVo vo);
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @return DelayedShipment
+     */
+    DelayedShipment findById(@Param("id") String id);
 }

@@ -55,4 +55,12 @@ public interface ShipmentsPlanDetailMapper extends BaseMapper<ShipmentsPlanDetai
      * @return          List<ShipmentsPlanDetail>
      */
     List<ShipmentsPlanDetail> listByPlanId(@Param("planId") String planId);
+
+    /**
+     * 查询
+     *
+     * @param id 主键
+     * @return ShipmentsPlanDetail
+     */
+    ShipmentsPlanDetail findById(@Param("id") String id);
 }

@@ -2,10 +2,8 @@ package com.lframework.xingyun.sc.vo.shipments.delay;
 
 import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
 import java.math.BigDecimal;
-import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
 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;
@@ -20,64 +18,56 @@ public class CreateDelayedShipmentDetailVo implements BaseVo, Serializable {
     /**
      * 延期发货ID
      */
-    @ApiModelProperty(value = "延期发货ID", required = true)
-    @NotBlank(message = "请输入延期发货ID！")
+    @ApiModelProperty("延期发货ID")
     @Length(message = "延期发货ID最多允许32个字符！")
     private String delayedShipmentId;
 
     /**
      * 订货单ID
      */
-    @ApiModelProperty(value = "订货单ID", required = true)
-    @NotBlank(message = "请输入订货单ID！")
+    @ApiModelProperty("订货单ID")
     @Length(message = "订货单ID最多允许32个字符！")
     private String orderId;
 
     /**
      * 发货计划明细ID
      */
-    @ApiModelProperty(value = "发货计划明细ID", required = true)
-    @NotBlank(message = "请输入发货计划明细ID！")
+    @ApiModelProperty("发货计划明细ID")
     @Length(message = "发货计划明细ID最多允许32个字符！")
     private String shipmentsPlanDetailId;
 
     /**
      * 订货单物料行ID
      */
-    @ApiModelProperty(value = "订货单物料行ID", required = true)
-    @NotBlank(message = "请输入订货单物料行ID！")
+    @ApiModelProperty("订货单物料行ID")
     @Length(message = "订货单物料行ID最多允许32个字符！")
     private String orderSpecId;
 
     /**
      * 原订单计划发货日期
      */
-    @ApiModelProperty(value = "原订单计划发货日期", required = true)
-    @NotNull(message = "请输入原订单计划发货日期！")
+    @ApiModelProperty("原订单计划发货日期")
     @TypeMismatch(message = "原订单计划发货日期格式有误！")
     private LocalDate deliveryDate;
 
     /**
      * 现申请发货日期
      */
-    @ApiModelProperty(value = "现申请发货日期", required = true)
-    @NotNull(message = "请输入现申请发货日期！")
+    @ApiModelProperty("现申请发货日期")
     @TypeMismatch(message = "现申请发货日期格式有误！")
     private LocalDate applyShipmentDate;
 
     /**
      * 申请次数
      */
-    @ApiModelProperty(value = "申请次数", required = true)
-    @NotNull(message = "请输入申请次数！")
+    @ApiModelProperty("申请次数")
     @TypeMismatch(message = "申请次数格式有误！")
     private Integer applyCount;
 
     /**
      * 发货数量
      */
-    @ApiModelProperty(value = "发货数量", required = true)
-    @NotNull(message = "请输入发货数量！")
+    @ApiModelProperty("发货数量")
     @TypeMismatch(message = "发货数量格式有误！")
     @IsNumberPrecision(message = "发货数量最多允许4位小数！", value = 4)
     private BigDecimal quantity;
@@ -85,8 +75,7 @@ public class CreateDelayedShipmentDetailVo implements BaseVo, Serializable {
     /**
      * 延迟原因
      */
-    @ApiModelProperty(value = "延迟原因", required = true)
-    @NotBlank(message = "请输入延迟原因！")
+    @ApiModelProperty("延迟原因")
     private String delayReason;
 
 }

 package com.lframework.xingyun.sc.vo.shipments.delay;
 
-import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 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.util.List;
 import lombok.Data;
 
 @Data
@@ -18,25 +18,34 @@ public class CreateDelayedShipmentVo implements BaseVo, Serializable {
     /**
      * 所属办ID
      */
-    @ApiModelProperty(value = "所属办ID", required = true)
-    @NotBlank(message = "请输入所属办ID！")
+    @ApiModelProperty("所属办ID")
     @Length(message = "所属办ID最多允许32个字符！")
     private String deptId;
 
     /**
      * 申请日期
      */
-    @ApiModelProperty(value = "申请日期", required = true)
-    @NotNull(message = "请输入申请日期！")
+    @ApiModelProperty("申请日期")
     @TypeMismatch(message = "申请日期格式有误！")
     private LocalDate applyDate;
 
     /**
      * 审核状态
      */
-    @ApiModelProperty(value = "审核状态", required = true)
-    @NotBlank(message = "请输入审核状态！")
+    @ApiModelProperty("审核状态")
     @Length(message = "审核状态最多允许20个字符！")
     private String status;
 
+    /**
+     * 总数量
+     */
+    @ApiModelProperty("总数量")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 延期发货详情
+     */
+    @ApiModelProperty("延期发货详情")
+    private List<CreateDelayedShipmentDetailVo> delayedShipmentDetailList;
+
 }

@@ -17,4 +17,11 @@ public class QueryDelayedShipmentDetailVo extends PageVo implements BaseVo, Seri
     @ApiModelProperty("延期发货ID")
     private String delayedShipmentId;
 
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty("订货单物料行ID")
+    private String orderSpecId;
+
+
 }

@@ -6,7 +6,6 @@ import java.math.BigDecimal;
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
-import javax.validation.constraints.NotNull;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
@@ -27,73 +26,64 @@ public class UpdateDelayedShipmentDetailVo implements BaseVo, Serializable {
     /**
      * 延期发货ID
      */
-    @ApiModelProperty(value = "延期发货ID", required = true)
-    @NotBlank(message = "请输入延期发货ID！")
+    @ApiModelProperty("延期发货ID")
     @Length(message = "延期发货ID最多允许32个字符！")
     private String delayedShipmentId;
 
     /**
      * 订货单ID
      */
-    @ApiModelProperty(value = "订货单ID", required = true)
-    @NotBlank(message = "请输入订货单ID！")
+    @ApiModelProperty("订货单ID")
     @Length(message = "订货单ID最多允许32个字符！")
     private String orderId;
 
     /**
      * 发货计划明细ID
      */
-    @ApiModelProperty(value = "发货计划明细ID", required = true)
-    @NotBlank(message = "请输入发货计划明细ID！")
+    @ApiModelProperty("发货计划明细ID")
     @Length(message = "发货计划明细ID最多允许32个字符！")
     private String shipmentsPlanDetailId;
 
     /**
      * 订货单物料行ID
      */
-    @ApiModelProperty(value = "订货单物料行ID", required = true)
-    @NotBlank(message = "请输入订货单物料行ID！")
+    @ApiModelProperty("订货单物料行ID")
     @Length(message = "订货单物料行ID最多允许32个字符！")
     private String orderSpecId;
 
     /**
      * 原订单计划发货日期
      */
-    @ApiModelProperty(value = "原订单计划发货日期", required = true)
+    @ApiModelProperty("原订单计划发货日期")
     @TypeMismatch(message = "原订单计划发货日期格式有误！")
-    @NotNull(message = "请输入原订单计划发货日期！")
     private LocalDate deliveryDate;
 
     /**
      * 现申请发货日期
      */
-    @ApiModelProperty(value = "现申请发货日期", required = true)
+    @ApiModelProperty("现申请发货日期")
     @TypeMismatch(message = "现申请发货日期格式有误！")
-    @NotNull(message = "请输入现申请发货日期！")
     private LocalDate applyShipmentDate;
 
     /**
      * 申请次数
      */
-    @ApiModelProperty(value = "申请次数", required = true)
+    @ApiModelProperty("申请次数")
     @TypeMismatch(message = "申请次数格式有误！")
-    @NotNull(message = "请输入申请次数！")
     private Integer applyCount;
 
     /**
      * 发货数量
      */
-    @ApiModelProperty(value = "发货数量", required = true)
+    @ApiModelProperty("发货数量")
     @TypeMismatch(message = "发货数量格式有误！")
-    @NotNull(message = "请输入发货数量！")
     @IsNumberPrecision(message = "发货数量最多允许4位小数！", value = 4)
     private BigDecimal quantity;
 
     /**
      * 延迟原因
      */
-    @ApiModelProperty(value = "延迟原因", required = true)
-    @NotBlank(message = "请输入延迟原因！")
+    @ApiModelProperty("延迟原因")
     private String delayReason;
 
 }

@@ -2,13 +2,14 @@ package com.lframework.xingyun.sc.vo.shipments.delay;
 
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
-import javax.validation.constraints.NotNull;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class UpdateDelayedShipmentVo implements BaseVo, Serializable {
@@ -25,25 +26,35 @@ public class UpdateDelayedShipmentVo implements BaseVo, Serializable {
     /**
      * 所属办ID
      */
-    @ApiModelProperty(value = "所属办ID", required = true)
-    @NotBlank(message = "请输入所属办ID！")
+    @ApiModelProperty("所属办ID")
     @Length(message = "所属办ID最多允许32个字符！")
     private String deptId;
 
     /**
      * 申请日期
      */
-    @ApiModelProperty(value = "申请日期", required = true)
+    @ApiModelProperty("申请日期")
     @TypeMismatch(message = "申请日期格式有误！")
-    @NotNull(message = "请输入申请日期！")
     private LocalDate applyDate;
 
     /**
      * 审核状态
      */
-    @ApiModelProperty(value = "审核状态", required = true)
-    @NotBlank(message = "请输入审核状态！")
+    @ApiModelProperty("审核状态")
     @Length(message = "审核状态最多允许20个字符！")
     private String status;
 
+    /**
+     * 总数量
+     */
+    @ApiModelProperty("总数量")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 延期发货详情
+     */
+    @ApiModelProperty("延期发货详情")
+    private List<UpdateDelayedShipmentDetailVo> delayedShipmentDetailList;
+
+
 }

@@ -196,6 +196,7 @@
                 AND cu.name LIKE CONCAT('%', #{vo.companyName},'%')
             </if>
         </where>
+        ORDER BY tb.create_time DESC
     </select>
 
     <select id="findById" resultType="com.lframework.xingyun.sc.entity.CustomerCredit">

@@ -7,6 +7,7 @@
         <result column="plan_id" property="planId"/>
         <result column="order_id" property="orderId"/>
         <result column="order_no" property="orderNo"/>
+        <result column="order_type" property="orderType"/>
         <result column="customer_id" property="customerId"/>
         <result column="customer_name" property="customerName"/>
         <result column="thickness" property="thickness"/>
@@ -36,6 +37,12 @@
             tb.plan_id,
             tb.order_id,
             o.order_no,
+            CASE
+                WHEN s.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销'
+                WHEN s.type IN ('INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT') THEN '外贸'
+                WHEN s.type = 'PROCESS_STD_AGMT' THEN '加工'
+                ELSE '其它'
+                END AS order_type,
             o.ordering_unit AS customer_id,
             c.name AS customer_name,
             tb.order_spec_id,
@@ -55,6 +62,7 @@
             tb.shipments_time,
             tb.can_shipments,
             tb.del_flag,
+            ws.name AS workshop_name,
             tb.create_by_id,
             tb.update_by_id,
             tb.create_time,
@@ -64,6 +72,8 @@
         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 tbl_purchase_order_line ol ON tb.order_spec_id = ol.id
+        LEFT JOIN tbl_contract_distributor_standard s on s.id = o.contract_id
+        LEFT JOIN base_data_workshop ws on ws.id = o.workshop_id
     </sql>
 
     <select id="query" resultMap="ShipmentsPlanDetail">
@@ -210,4 +220,13 @@
         where pd.del_flag = false
         and pd.plan_id = #{planId}
     </select>
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail">
+        <include refid="ShipmentsPlanDetail_sql"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND tb.id = #{id}
+            </if>
+        </where>
+    </select>
 </mapper>

@@ -33,7 +33,12 @@
             tb.delayed_shipment_id,
             tb.order_id,
             o.order_no,
-            s.type AS order_type,
+            CASE
+                WHEN s.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销'
+                WHEN s.type IN ('INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT') THEN '外贸'
+                WHEN s.type = 'PROCESS_STD_AGMT' THEN '加工'
+                ELSE '其它'
+                END AS order_type,
             o.workshop_id,
             ws.name AS workshop_name,
             o.ordering_unit AS customer_id,
@@ -67,4 +72,13 @@
         </where>
         ORDER BY tb.create_time DESC
     </select>
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.DelayedShipmentDetail">
+        <include refid="DelayedShipmentDetail_sql"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND tb.id = #{id}
+            </if>
+        </where>
+    </select>
 </mapper>

@@ -7,6 +7,7 @@
         <result column="apply_date" property="applyDate"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_name" property="deptName"/>
+        <result column="total_quantity" property="totalQuantity"/>
         <result column="status" property="status"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
@@ -22,6 +23,7 @@
             tb.apply_date,
             tb.dept_id,
             sd.name AS dept_name,
+            tb.total_quantity,
             tb.status,
             tb.create_by_id,
             tb.create_by,
@@ -53,4 +55,13 @@
         </where>
         ORDER BY tb.create_time DESC
     </select>
+
+    <select id="findById" resultType="com.lframework.xingyun.sc.entity.DelayedShipment">
+        <include refid="DelayedShipment_sql"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND tb.id = #{id}
+            </if>
+        </where>
+    </select>
 </mapper>

@@ -83,7 +83,7 @@
                     <w:szCs w:val="32"/>
                     <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                 </w:rPr>
-                <w:t>老客户）</w:t>
+                <w:t>${enterpriseOperationType!}）</w:t>
             </w:r>
             <w:bookmarkStart w:id="0" w:name="_GoBack"/>
             <w:bookmarkEnd w:id="0"/>