楚江ERP-1、录入实发数接口开发（包含列表）；2、上传签收单据接口开发

 package com.lframework.xingyun.sc.bo.shipments.plan;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
@@ -50,6 +48,12 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
     private String orderNo;
 
     /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private String packagingFee;
+
+    /**
      * 客户ID
      */
     @ApiModelProperty("客户ID")
@@ -94,6 +98,12 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
     private Boolean canShipments;
 
     /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    private String brand;
+
+    /**
      * 厚度
      */
     @ApiModelProperty("厚度")
@@ -154,6 +164,30 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
     private BigDecimal quantity;
 
     /**
+     * 单价
+     */
+    @ApiModelProperty("单价")
+    private BigDecimal salesPrice;
+
+    /**
+     * 实发数
+     */
+    @ApiModelProperty("实发数")
+    private Double actualShipmentQuantity;
+
+    /**
+     * 生产批号
+     */
+    @ApiModelProperty("生产批号")
+    private String yieldBatchNo;
+
+    /**
+     * 件数
+     */
+    @ApiModelProperty("件数")
+    private Double num;
+
+    /**
      * 创建人ID
      */
     @ApiModelProperty("创建人ID")
@@ -195,8 +229,6 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
 
     @Override
     protected void afterInit(ShipmentsPlanDetail dto) {
-        if (dto.getQuantity() != null && dto.getQuantity().compareTo(BigDecimal.ZERO) != 0) {
-            this.quantity = dto.getQuantity().divide(new BigDecimal(1000), 4, RoundingMode.HALF_EVEN);
-        }
+
     }
 }

@@ -2,11 +2,11 @@ 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.bo.shipments.plan.ShipmentsPlanDetailBo;
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
+import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
-import com.lframework.xingyun.sc.vo.shipments.order.CreateShipmentsOrderInfoVo;
-import com.lframework.xingyun.sc.vo.shipments.order.UpdateShipmentsOrderInfoVo;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -43,6 +43,8 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
 
     @Resource
     private ShipmentsOrderInfoService shipmentsOrderInfoService;
+    @Resource
+    private ShipmentsPlanDetailService shipmentsPlanDetailService;
 
 
     /**
@@ -124,4 +126,42 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
         shipmentsOrderInfoService.generate(vo);
         return InvokeResultBuilder.success();
     }
+
+
+    /**
+     * 发货单明细数据
+     */
+    @ApiOperation("发货单明细数据")
+    @HasPermission({"shipping-plan-manage:shipping-plan:query"})
+    @GetMapping("/listByShipmentOrderId")
+    public InvokeResult<List<ShipmentsPlanDetailBo>> listByShipmentOrderId(@NotBlank(message = "发货单ID不能为空！") String shipmentsOrderId) {
+        List<ShipmentsPlanDetail> dataList = shipmentsPlanDetailService.listByShipmentOrderId(shipmentsOrderId);
+        List<ShipmentsPlanDetailBo> results = null;
+        if (!CollectionUtil.isEmpty(dataList)) {
+            results = dataList.stream().map(ShipmentsPlanDetailBo::new).collect(Collectors.toList());
+        }
+        return InvokeResultBuilder.success(results);
+    }
+
+    /**
+     * 明细数据补充录入
+     */
+    @ApiOperation("明细数据补充录入")
+    @HasPermission({"shipping-plan-manage:shipping-plan:query"})
+    @GetMapping("/dataReplenishInput")
+    public InvokeResult<Void> dataReplenishInput(@Valid @RequestBody ShipmentsOrderVo vo) {
+        shipmentsOrderInfoService.dataReplenishInput(vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 保存签收单据
+     */
+    @ApiOperation("保存签收单据")
+    @HasPermission({"shipping-plan-manage:shipping-plan:query"})
+    @GetMapping("/saveSignInTicket")
+    public InvokeResult<Void> saveSignInTicket(@Valid SignInTicketVo vo) {
+        shipmentsOrderInfoService.saveSignInTicket(vo);
+        return InvokeResultBuilder.success();
+    }
 }

@@ -89,9 +89,14 @@ public class ShipmentsOrderInfo extends BaseEntity implements BaseDto {
     private String paymentType;
 
     /**
-     * 实发数量
+     * 签收单据文件ID
      */
-    private Double actualShipmentQuantity;
+    private String receiptsId;
+
+    /**
+     * 签收单据文件名称
+     */
+    private String receiptsName;
 
     /**
      * 状态

@@ -58,6 +58,12 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private String orderNo;
 
     /**
+     * 包装费
+     */
+    @TableField(exist = false)
+    private String packagingFee;
+
+    /**
      * 合同类型
      */
     @TableField(exist = false)
@@ -76,6 +82,12 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private String customerName;
 
     /**
+     * 牌号
+     */
+    @TableField(exist = false)
+    private String brand;
+
+    /**
      * 厚度
      */
     @TableField(exist = false)
@@ -136,6 +148,27 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private BigDecimal quantity;
 
     /**
+     * 单价
+     */
+    @TableField(exist = false)
+    private BigDecimal salesPrice;
+
+    /**
+     * 实发数
+     */
+    private Double actualShipmentQuantity;
+
+    /**
+     * 生产批号
+     */
+    private String yieldBatchNo;
+
+    /**
+     * 件数
+     */
+    private Double num;
+
+    /**
      * 父类ID
      */
     private String parentId;

@@ -391,6 +391,18 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateStatus(List<String> ids, String status) {
+        if (CollectionUtils.isNotEmpty(ids) || StringUtils.isBlank(status)) {
+            return;
+        }
+        LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class);
+        updateWrapper.set(PurchaseOrderInfo::getStatus, status)
+                .in(PurchaseOrderInfo::getId, ids);
+        getBaseMapper().update(updateWrapper);
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "更新撤销状态，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override

@@ -31,16 +31,13 @@ import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateDraftRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
-import com.lframework.xingyun.sc.vo.shipments.order.GenerateShipmentsOrderVo;
+import com.lframework.xingyun.sc.vo.shipments.order.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsOrderInfoMapper;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
-import com.lframework.xingyun.sc.vo.shipments.order.CreateShipmentsOrderInfoVo;
-import com.lframework.xingyun.sc.vo.shipments.order.QueryShipmentsOrderInfoVo;
-import com.lframework.xingyun.sc.vo.shipments.order.UpdateShipmentsOrderInfoVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -269,6 +266,66 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         getBaseMapper().batchAdd(orderInfos);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void dataReplenishInput(ShipmentsOrderVo vo) {
+        String shipmentsOrderId = vo.getId();
+        List<ShipmentsOrderDetailVo> detailList = vo.getDetailList();
+        if (CollectionUtils.isEmpty(detailList)) {
+            return;
+        }
+        List<ShipmentsPlanDetail> dataList = new ArrayList<>();
+        for (ShipmentsOrderDetailVo detailVo : detailList) {
+            ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
+            detail.setId(detailVo.getId());
+            detail.setActualShipmentQuantity(detailVo.getActualShipmentQuantity());
+            detail.setNum(detailVo.getNum());
+            detail.setYieldBatchNo(detailVo.getYieldBatchNo());
+            // 判断发货数量
+            Double quantity = detailVo.getQuantity();
+            Double actualShipmentQuantity = detailVo.getActualShipmentQuantity();
+            if (actualShipmentQuantity >= quantity) {
+                purchaseOrderInfoService.updateStatus(detailVo.getOrderId(), "SHIPPED");
+            } else {
+                purchaseOrderInfoService.updateStatus(detailVo.getOrderId(), "TRANSIT");
+            }
+            dataList.add(detail);
+        }
+        // 更新发货明细
+        shipmentsPlanDetailService.updateBatchById(dataList);
+        // 更新发货单状态
+        updateStatus(shipmentsOrderId, "SHIPMENTS");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveSignInTicket(SignInTicketVo vo) {
+        LambdaUpdateWrapper<ShipmentsOrderInfo> updateWrapper = Wrappers.lambdaUpdate(ShipmentsOrderInfo.class);
+        updateWrapper.set(ShipmentsOrderInfo::getReceiptsId, vo.getFileId())
+                .set(ShipmentsOrderInfo::getReceiptsName, vo.getFileName())
+                .set(ShipmentsOrderInfo::getStatus, "DELIVERED")
+                .eq(ShipmentsOrderInfo::getId, vo.getShipmentsOrderId());
+        getBaseMapper().update(updateWrapper);
+        // 更新订货单状态
+        List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(vo.getShipmentsOrderId());
+        if (CollectionUtils.isEmpty(detailList)) {
+            return;
+        }
+        List<String> orderIds = detailList.stream().map(ShipmentsPlanDetail::getOrderId).distinct().collect(Collectors.toList());
+        purchaseOrderInfoService.updateStatus(orderIds, "DELIVERED");
+    }
+
+    @Override
+    public void updateStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            return;
+        }
+        LambdaUpdateWrapper<ShipmentsOrderInfo> updateWrapper = Wrappers.lambdaUpdate(ShipmentsOrderInfo.class);
+        updateWrapper.set(ShipmentsOrderInfo::getStatus, status)
+                .eq(ShipmentsOrderInfo::getId, id);
+        getBaseMapper().update(updateWrapper);
+    }
+
 
     /**
      * 处理批次数据

@@ -5,6 +5,7 @@ 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.components.security.SecurityUtil;
+import com.lframework.starter.web.core.utils.*;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.vo.workshop.QueryWorkshopVo;
@@ -13,14 +14,10 @@ import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.entity.ShipmentsPlan;
 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.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.mappers.ShipmentsPlanDetailMapper;
@@ -335,6 +332,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         ShipmentsPlanDetail data = new ShipmentsPlanDetail();
         data.setId(IdUtil.getId());
         data.setPlanId(detail.getPlanId());
+        data.setShipmentOrderId(detail.getShipmentOrderId());
         data.setOrderId(detail.getOrderId());
         data.setOrderSpecId(IdUtil.getId());
         data.setParentId(detail.getId());

@@ -76,6 +76,7 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @param status 审核状态
      */
     void updateStatus(String id, String status);
+    void updateStatus(List<String> ids, String status);
 
     /**
      * 更新不走审核

 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.vo.shipments.order.*;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -72,4 +69,26 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
      * @param orderInfos    数据集合
      */
     void batchAdd(List<ShipmentsOrderInfo> orderInfos);
+
+    /**
+     * 数据补充录入
+     *
+     * @param vo    数据实体
+     */
+    void dataReplenishInput(ShipmentsOrderVo vo);
+
+    /**
+     * 保存签收单据
+     *
+     * @param vo    数据实体
+     */
+    void saveSignInTicket(SignInTicketVo vo);
+
+    /**
+     * 更新状态
+     *
+     * @param id        主键ID
+     * @param status    状态
+     */
+    void updateStatus(String id, String status);
 }

+package com.lframework.xingyun.sc.vo.shipments.order;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class ShipmentsOrderDetailVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty(value = "订货单ID", required = true)
+    @NotBlank(message = "订货单ID不能为空！")
+    private String orderId;
+
+    /**
+     * 实发数
+     */
+    @ApiModelProperty(value = "实发数")
+    @NotNull(message = "实发数不能为空！")
+    @TypeMismatch(message = "实发数格式有误！")
+    private Double actualShipmentQuantity;
+
+    /**
+     * 生产批号
+     */
+    @ApiModelProperty(value = "生产批号")
+    @NotBlank(message = "生产批号不能为空！")
+    private String yieldBatchNo;
+
+    /**
+     * 件数
+     */
+    @ApiModelProperty(value = "件数")
+    @NotNull(message = "件数不能为空！")
+    @TypeMismatch(message = "件数格式有误！")
+    private Double num;
+
+    /**
+     * 需发数量
+     */
+    @ApiModelProperty(value = "需发数量")
+    @NotNull(message = "需发数量不能为空！")
+    @TypeMismatch(message = "需发数量格式有误！")
+    private Double quantity;
+}

+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.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ShipmentsOrderVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+
+    @ApiModelProperty(value = "发货单明细")
+    @NotEmpty(message = "发货单明细不能为空！")
+    @Valid
+    private List<ShipmentsOrderDetailVo> detailList;
+}

+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;
+
+@Data
+public class SignInTicketVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 发货单ID
+     */
+    @ApiModelProperty(value = "发货单ID", required = true)
+    @NotBlank(message = "发货单ID不能为空！")
+    private String shipmentsOrderId;
+
+    /**
+     * 文件ID
+     */
+    @ApiModelProperty(value = "订货单ID", required = true)
+    @NotBlank(message = "文件ID不能为空！")
+    private String fileId;
+
+    /**
+     * 文件名称
+     */
+    @ApiModelProperty(value = "需发数量")
+    private String fileName;
+}

@@ -23,13 +23,13 @@ public class UpdateShipmentsPlanDetailVo implements BaseVo, Serializable {
     /**
      * 发货时间点
      */
-    @ApiModelProperty(value = "发货时间点", required = true)
+    @ApiModelProperty(value = "发货时间点")
     private String shipmentsTime;
 
     /**
      * 是否可以发货
      */
-    @ApiModelProperty(value = "是否可以发货", required = true)
+    @ApiModelProperty(value = "是否可以发货")
     @TypeMismatch(message = "是否可以发货格式有误！")
     private Boolean canShipments;
 

@@ -166,9 +166,11 @@
             o.ordering_unit AS customer_id,
             o.delivery_method,
             o.settlement_terms,
+            o.packaging_fee,
             sc.type as contract_type,
             c.name AS customer_name,
             tb.order_spec_id,
+            ol.brand,
             ol.thickness,
             ol.thickness_tol_pos,
             ol.thickness_tol_neg,
@@ -179,11 +181,15 @@
             ol.length_tol_pos,
             ol.length_tol_neg,
             ol.quantity,
+            ol.sales_price,
             tb.parent_id,
             tb.status,
             tb.shipments_date,
             tb.shipments_time,
             tb.can_shipments,
+            tb.actual_shipment_quantity,
+            tb.num,
+            tb.yield_batch_no,
             tb.del_flag,
             tb.create_by_id,
             tb.update_by_id,