Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java

@@ -0,0 +1,85 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 包条签收明细 实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@TableName("logpm_distribution_packagereceipt")
+@ApiModel(value = "DistributionPackagereceipt对象", description = "包条签收明细")
+@EqualsAndHashCode(callSuper = true)
+public class DistributionPackagereceiptEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 包条表id
+	 */
+	@ApiModelProperty(value = "包条表id")
+	private Long wrapBarId;
+	/**
+	 * 签收状态
+	 */
+	@ApiModelProperty(value = "签收状态")
+	private String state;
+	/**
+	 * 签收明细id
+	 */
+	@ApiModelProperty(value = "签收明细id")
+	private Long receiptDetailsId;
+	/**
+	 * 签收数量
+	 */
+	@ApiModelProperty(value = "签收数量")
+	private Integer receivedQuantity;
+
+}

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java

@@ -0,0 +1,140 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 签收明细 实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@TableName("logpm_distribution_signdetail")
+@ApiModel(value = "DistributionSigndetail对象", description = "签收明细")
+@EqualsAndHashCode(callSuper = true)
+public class DistributionSigndetailEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 签收表id
+	 */
+	@ApiModelProperty(value = "签收表id")
+	private Integer masterId;
+	/**
+	 * 服务号
+	 */
+	@ApiModelProperty(value = "服务号")
+	private String serviceNumber;
+	/**
+	 * 配送/自提单号
+	 */
+	@ApiModelProperty(value = "配送/自提单号")
+	private String deliveryNumber;
+	/**
+	 * 配送车次号
+	 */
+	@ApiModelProperty(value = "配送车次号")
+	private String trainNumber;
+	/**
+	 * 服务类型
+	 */
+	@ApiModelProperty(value = "服务类型")
+	private String serveType;
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderId;
+	/**
+	 * 商城名称
+	 */
+	@ApiModelProperty(value = "商城名称")
+	private String mallName;
+	/**
+	 * 货物名称
+	 */
+	@ApiModelProperty(value = "货物名称")
+	private String goodsName;
+	/**
+	 * 仓库
+	 */
+	@ApiModelProperty(value = "仓库")
+	private String warehouse;
+	/**
+	 * 入库时间
+	 */
+	@ApiModelProperty(value = "入库时间")
+	private Date warehousingTime;
+	/**
+	 * 备货时间
+	 */
+	@ApiModelProperty(value = "备货时间")
+	private Date leadTime;
+	/**
+	 * 在库时长;(天)
+	 */
+	@ApiModelProperty(value = "在库时长;(天)")
+	private Integer durationInStock;
+	/**
+	 * 签收件数
+	 */
+	@ApiModelProperty(value = "签收件数")
+	private Integer signedNumber;
+	/**
+	 * 是否齐套
+	 */
+	@ApiModelProperty(value = "是否齐套")
+	private String isKitting;
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	private String brand;
+
+}

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java

@@ -0,0 +1,170 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 签收管理 实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@TableName("logpm_distribution_signfor")
+@ApiModel(value = "DistributionSignfor对象", description = "签收管理")
+@EqualsAndHashCode(callSuper = true)
+public class DistributionSignforEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 订单自编号;订单关联id
+	 */
+	@ApiModelProperty(value = "订单自编号;订单关联id")
+	private String orderId;
+	/**
+	 * 预约关联Id;预约关联id
+	 */
+	@ApiModelProperty(value = "预约关联Id;预约关联id")
+	private Long reservationId;
+	/**
+	 * 收货人
+	 */
+	@ApiModelProperty(value = "收货人")
+	private String consignee;
+	/**
+	 * 收货地址
+	 */
+	@ApiModelProperty(value = "收货地址")
+	private String deliveryAddress;
+	/**
+	 * 服务类型
+	 */
+	@ApiModelProperty(value = "服务类型")
+	private String serveType;
+	/**
+	 * 配送仓库
+	 */
+	@ApiModelProperty(value = "配送仓库")
+	private String distributingWarehouse;
+	/**
+	 * 配送车次
+	 */
+	@ApiModelProperty(value = "配送车次")
+	private String trainNumber;
+	/**
+	 * 订单总数
+	 */
+	@ApiModelProperty(value = "订单总数")
+	private Integer orderTotal;
+	/**
+	 * 总件数
+	 */
+	@ApiModelProperty(value = "总件数")
+	private Integer total;
+	/**
+	 * 装车件数
+	 */
+	@ApiModelProperty(value = "装车件数")
+	private Integer loadedNumber;
+	/**
+	 * 签收数
+	 */
+	@ApiModelProperty(value = "签收数")
+	private Integer receivedQuantity;
+	/**
+	 * 送货司机
+	 */
+	@ApiModelProperty(value = "送货司机")
+	private String deliveryDriver;
+	/**
+	 * 送货司机手机号
+	 */
+	@ApiModelProperty(value = "送货司机手机号")
+	private String deliveryDriverPhone;
+	/**
+	 * 签收时间
+	 */
+	@ApiModelProperty(value = "签收时间")
+	private Date signingTime;
+	/**
+	 * 签收人
+	 */
+	@ApiModelProperty(value = "签收人")
+	private String signee;
+	/**
+	 * 签收状态;1-未签收,2-司机签收,3-文员签收
+	 */
+	@ApiModelProperty(value = "签收状态;1-未签收,2-司机签收,3-文员签收")
+	private String signingStatus;
+	/**
+	 * 签收类型;1-签收,2-代签收
+	 */
+	@ApiModelProperty(value = "签收类型;1-签收,2-代签收")
+	private String signingType;
+	/**
+	 * 文员复核图片
+	 */
+	@ApiModelProperty(value = "文员复核图片")
+	private String clerkSignPictures;
+	/**
+	 * 司机签收图片
+	 */
+	@ApiModelProperty(value = "司机签收图片")
+	private String deliverySignPictures;
+	/**
+	 * 服务号
+	 */
+	@ApiModelProperty(value = "服务号")
+	private String serviceNumber;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String notes;
+
+}

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionPackagereceiptClient.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 包条签收明细 Feign接口类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME
+)
+public interface IDistributionPackagereceiptClient {
+
+    String API_PREFIX = "packagereceipt/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取包条签收明细列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<DistributionPackagereceiptEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSigndetailClient.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.distribution.entity.DistributionSigndetailEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 签收明细 Feign接口类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME
+)
+public interface IDistributionSigndetailClient {
+
+    String API_PREFIX = "signdetail/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取签收明细列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<DistributionSigndetailEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.distribution.entity.DistributionSignforEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 签收管理 Feign接口类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME
+)
+public interface IDistributionSignforClient {
+
+    String API_PREFIX = "signfor/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取签收管理列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<DistributionSignforEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackagereceiptVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.vo;
+
+import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 包条签收明细 视图实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DistributionPackagereceiptVO extends DistributionPackagereceiptEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.vo;
+
+import com.logpm.distribution.entity.DistributionSigndetailEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 签收明细 视图实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DistributionSigndetailVO extends DistributionSigndetailEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.vo;
+
+import com.logpm.distribution.entity.DistributionSignforEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 签收管理 视图实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DistributionSignforVO extends DistributionSignforEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionPackagereceiptController.java

@@ -0,0 +1,151 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.controller;
+
+import com.logpm.distribution.dto.DistributionPackagereceiptDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
+import com.logpm.distribution.vo.DistributionPackagereceiptVO;
+import com.logpm.distribution.excel.DistributionPackagereceiptExcel;
+import com.logpm.distribution.service.IDistributionPackagereceiptService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 包条签收明细 控制器
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/packagereceipt")
+@Api(value = "包条签收明细", tags = "包条签收明细接口")
+public class DistributionPackagereceiptController extends BladeController {
+
+	private final IDistributionPackagereceiptService distributionPackagereceiptService;
+
+	/**
+	 * 包条签收明细 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入distributionPackagereceipt")
+	public R<DistributionPackagereceiptEntity> detail(DistributionPackagereceiptEntity distributionPackagereceipt) {
+		DistributionPackagereceiptEntity detail = distributionPackagereceiptService.getOne(Condition.getQueryWrapper(distributionPackagereceipt));
+		return R.data(detail);
+	}
+	/**
+	 * 包条签收明细 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionPackagereceipt")
+	public R<IPage<DistributionPackagereceiptEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionPackagereceipt, Query query) {
+		IPage<DistributionPackagereceiptEntity> pages = distributionPackagereceiptService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionPackagereceipt, DistributionPackagereceiptEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 包条签收明细 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入distributionPackagereceipt")
+	public R<IPage<DistributionPackagereceiptVO>> page(DistributionPackagereceiptDTO distributionPackagereceipt, Query query) {
+		IPage<DistributionPackagereceiptVO> pages = distributionPackagereceiptService.selectDistributionPackagereceiptPage(Condition.getPage(query), distributionPackagereceipt);
+		return R.data(pages);
+	}
+
+	/**
+	 * 包条签收明细 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入distributionPackagereceipt")
+	public R save(@Valid @RequestBody DistributionPackagereceiptEntity distributionPackagereceipt) {
+		return R.status(distributionPackagereceiptService.save(distributionPackagereceipt));
+	}
+
+	/**
+	 * 包条签收明细 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入distributionPackagereceipt")
+	public R update(@Valid @RequestBody DistributionPackagereceiptEntity distributionPackagereceipt) {
+		return R.status(distributionPackagereceiptService.updateById(distributionPackagereceipt));
+	}
+
+	/**
+	 * 包条签收明细 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入distributionPackagereceipt")
+	public R submit(@Valid @RequestBody DistributionPackagereceiptEntity distributionPackagereceipt) {
+		return R.status(distributionPackagereceiptService.saveOrUpdate(distributionPackagereceipt));
+	}
+
+	/**
+	 * 包条签收明细 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(distributionPackagereceiptService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-distributionPackagereceipt")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入distributionPackagereceipt")
+	public void exportDistributionPackagereceipt(@ApiIgnore @RequestParam Map<String, Object> distributionPackagereceipt, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<DistributionPackagereceiptEntity> queryWrapper = Condition.getQueryWrapper(distributionPackagereceipt, DistributionPackagereceiptEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(DistributionPackagereceipt::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(DistributionPackagereceiptEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<DistributionPackagereceiptExcel> list = distributionPackagereceiptService.exportDistributionPackagereceipt(queryWrapper);
+		ExcelUtil.export(response, "包条签收明细数据" + DateUtil.time(), "包条签收明细数据表", list, DistributionPackagereceiptExcel.class);
+	}
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.entity.DistributionSigndetailEntity;
+import com.logpm.distribution.vo.DistributionSigndetailVO;
+import com.logpm.distribution.excel.DistributionSigndetailExcel;
+import com.logpm.distribution.service.IDistributionSigndetailService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 签收明细 控制器
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/signdetail")
+@Api(value = "签收明细", tags = "签收明细接口")
+public class DistributionSigndetailController extends BladeController {
+
+	private final IDistributionSigndetailService distributionSigndetailService;
+
+	/**
+	 * 签收明细 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入distributionSigndetail")
+	public R<DistributionSigndetailEntity> detail(DistributionSigndetailEntity distributionSigndetail) {
+		DistributionSigndetailEntity detail = distributionSigndetailService.getOne(Condition.getQueryWrapper(distributionSigndetail));
+		return R.data(detail);
+	}
+	/**
+	 * 签收明细 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionSigndetail")
+	public R<IPage<DistributionSigndetailEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionSigndetail, Query query) {
+		IPage<DistributionSigndetailEntity> pages = distributionSigndetailService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionSigndetail, DistributionSigndetailEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 签收明细 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入distributionSigndetail")
+	public R<IPage<DistributionSigndetailVO>> page(DistributionSigndetailVO distributionSigndetail, Query query) {
+		IPage<DistributionSigndetailVO> pages = distributionSigndetailService.selectDistributionSigndetailPage(Condition.getPage(query), distributionSigndetail);
+		return R.data(pages);
+	}
+
+	/**
+	 * 签收明细 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入distributionSigndetail")
+	public R save(@Valid @RequestBody DistributionSigndetailEntity distributionSigndetail) {
+		return R.status(distributionSigndetailService.save(distributionSigndetail));
+	}
+
+	/**
+	 * 签收明细 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入distributionSigndetail")
+	public R update(@Valid @RequestBody DistributionSigndetailEntity distributionSigndetail) {
+		return R.status(distributionSigndetailService.updateById(distributionSigndetail));
+	}
+
+	/**
+	 * 签收明细 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入distributionSigndetail")
+	public R submit(@Valid @RequestBody DistributionSigndetailEntity distributionSigndetail) {
+		return R.status(distributionSigndetailService.saveOrUpdate(distributionSigndetail));
+	}
+
+	/**
+	 * 签收明细 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(distributionSigndetailService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-distributionSigndetail")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入distributionSigndetail")
+	public void exportDistributionSigndetail(@ApiIgnore @RequestParam Map<String, Object> distributionSigndetail, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<DistributionSigndetailEntity> queryWrapper = Condition.getQueryWrapper(distributionSigndetail, DistributionSigndetailEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(DistributionSigndetail::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(DistributionSigndetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<DistributionSigndetailExcel> list = distributionSigndetailService.exportDistributionSigndetail(queryWrapper);
+		ExcelUtil.export(response, "签收明细数据" + DateUtil.time(), "签收明细数据表", list, DistributionSigndetailExcel.class);
+	}
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -0,0 +1,161 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.controller;
+
+import com.logpm.distribution.dto.DistributionSignforDTO;
+import com.logpm.distribution.entity.ReservationEntity;
+import com.logpm.distribution.service.IReservationService;
+import com.logpm.distribution.vo.ReservationVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.entity.DistributionSignforEntity;
+import com.logpm.distribution.vo.DistributionSignforVO;
+import com.logpm.distribution.excel.DistributionSignforExcel;
+import com.logpm.distribution.service.IDistributionSignforService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 签收管理 控制器
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/signfor")
+@Api(value = "签收管理", tags = "签收管理接口")
+public class DistributionSignforController extends BladeController {
+
+	private final IDistributionSignforService distributionSignforService;
+
+	private final IReservationService reservationService;
+
+	/**
+	 * 签收管理 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入distributionSignfor")
+	public R<DistributionSignforVO> detail(DistributionSignforDTO distributionSignfor) {
+		DistributionSignforEntity detail = distributionSignforService.getOne(Condition.getQueryWrapper(distributionSignfor));
+		DistributionSignforVO distributionSignforVO = new DistributionSignforVO();
+		BeanUtils.copyProperties(detail,distributionSignforVO);
+		//查询预约单号及服务
+
+		return R.data(distributionSignforVO);
+	}
+	/**
+	 * 签收管理 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionSignfor")
+	public R<IPage<DistributionSignforEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionSignfor, Query query) {
+		IPage<DistributionSignforEntity> pages = distributionSignforService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionSignfor, DistributionSignforEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 签收管理 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入distributionSignfor")
+	public R<IPage<DistributionSignforVO>> page(DistributionSignforVO distributionSignfor, Query query) {
+		IPage<DistributionSignforVO> pages = distributionSignforService.selectDistributionSignforPage(Condition.getPage(query), distributionSignfor);
+		return R.data(pages);
+	}
+
+	/**
+	 * 签收管理 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入distributionSignfor")
+	public R save(@Valid @RequestBody DistributionSignforEntity distributionSignfor) {
+		return R.status(distributionSignforService.save(distributionSignfor));
+	}
+
+	/**
+	 * 签收管理 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入distributionSignfor")
+	public R update(@Valid @RequestBody DistributionSignforEntity distributionSignfor) {
+		return R.status(distributionSignforService.updateById(distributionSignfor));
+	}
+
+	/**
+	 * 签收管理 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入distributionSignfor")
+	public R submit(@Valid @RequestBody DistributionSignforEntity distributionSignfor) {
+		return R.status(distributionSignforService.saveOrUpdate(distributionSignfor));
+	}
+
+	/**
+	 * 签收管理 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(distributionSignforService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-distributionSignfor")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入distributionSignfor")
+	public void exportDistributionSignfor(@ApiIgnore @RequestParam Map<String, Object> distributionSignfor, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<DistributionSignforEntity> queryWrapper = Condition.getQueryWrapper(distributionSignfor, DistributionSignforEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(DistributionSignfor::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(DistributionSignforEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<DistributionSignforExcel> list = distributionSignforService.exportDistributionSignfor(queryWrapper);
+		ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "签收管理数据表", list, DistributionSignforExcel.class);
+	}
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionPackagereceiptDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.dto;
+
+import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 包条签收明细 数据传输对象实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DistributionPackagereceiptDTO extends DistributionPackagereceiptEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.dto;
+
+import com.logpm.distribution.entity.DistributionSigndetailEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 签收明细 数据传输对象实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DistributionSigndetailDTO extends DistributionSigndetailEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSignforDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.dto;
+
+import com.logpm.distribution.entity.DistributionSignforEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 签收管理 数据传输对象实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DistributionSignforDTO extends DistributionSignforEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionPackagereceiptExcel.java

@@ -0,0 +1,111 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 包条签收明细 Excel实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class DistributionPackagereceiptExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 包条表id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包条表id")
+	private Long wrapBarId;
+	/**
+	 * 签收状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收状态")
+	private String state;
+	/**
+	 * 签收明细id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收明细id")
+	private Long receiptDetailsId;
+	/**
+	 * 签收数量
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收数量")
+	private Integer receivedQuantity;
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSigndetailExcel.java

@@ -0,0 +1,177 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 签收明细 Excel实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class DistributionSigndetailExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 签收表id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收表id")
+	private Integer masterId;
+	/**
+	 * 服务号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("服务号")
+	private String serviceNumber;
+	/**
+	 * 配送/自提单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送/自提单号")
+	private String deliveryNumber;
+	/**
+	 * 配送车次号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送车次号")
+	private String trainNumber;
+	/**
+	 * 服务类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("服务类型")
+	private String serveType;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderId;
+	/**
+	 * 商城名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商城名称")
+	private String mallName;
+	/**
+	 * 货物名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("货物名称")
+	private String goodsName;
+	/**
+	 * 仓库
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("仓库")
+	private String warehouse;
+	/**
+	 * 入库时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("入库时间")
+	private Date warehousingTime;
+	/**
+	 * 备货时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备货时间")
+	private Date leadTime;
+	/**
+	 * 在库时长;(天)
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("在库时长;(天)")
+	private Integer durationInStock;
+	/**
+	 * 签收件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收件数")
+	private Integer signedNumber;
+	/**
+	 * 是否齐套
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否齐套")
+	private String isKitting;
+	/**
+	 * 品牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brand;
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java

@@ -0,0 +1,213 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 签收管理 Excel实体类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class DistributionSignforExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 订单自编号;订单关联id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号;订单关联id")
+	private String orderId;
+	/**
+	 * 预约关联Id;预约关联id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约关联Id;预约关联id")
+	private Long reservationId;
+	/**
+	 * 收货人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货人")
+	private String consignee;
+	/**
+	 * 收货地址
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货地址")
+	private String deliveryAddress;
+	/**
+	 * 服务类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("服务类型")
+	private String serveType;
+	/**
+	 * 配送仓库
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送仓库")
+	private String distributingWarehouse;
+	/**
+	 * 配送车次
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送车次")
+	private String trainNumber;
+	/**
+	 * 订单总数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单总数")
+	private Integer orderTotal;
+	/**
+	 * 总件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("总件数")
+	private Integer total;
+	/**
+	 * 装车件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("装车件数")
+	private Integer loadedNumber;
+	/**
+	 * 签收数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收数")
+	private Integer receivedQuantity;
+	/**
+	 * 送货司机
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("送货司机")
+	private String deliveryDriver;
+	/**
+	 * 送货司机手机号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("送货司机手机号")
+	private String deliveryDriverPhone;
+	/**
+	 * 签收时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收时间")
+	private Date signingTime;
+	/**
+	 * 签收人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收人")
+	private String signee;
+	/**
+	 * 签收状态;1-未签收,2-司机签收,3-文员签收
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收状态;1-未签收,2-司机签收,3-文员签收")
+	private String signingStatus;
+	/**
+	 * 签收类型;1-签收,2-代签收
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收类型;1-签收,2-代签收")
+	private String signingType;
+	/**
+	 * 文员复核图片
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("文员复核图片")
+	private String clerkSignPictures;
+	/**
+	 * 司机签收图片
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("司机签收图片")
+	private String deliverySignPictures;
+	/**
+	 * 服务号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("服务号")
+	private String serviceNumber;
+	/**
+	 * 备注
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备注")
+	private String notes;
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionPackagereceiptClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
+import com.logpm.distribution.service.IDistributionPackagereceiptService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 包条签收明细 Feign实现类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class DistributionPackagereceiptClient implements IDistributionPackagereceiptClient {
+
+    private final IDistributionPackagereceiptService distributionPackagereceiptService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<DistributionPackagereceiptEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<DistributionPackagereceiptEntity> page = distributionPackagereceiptService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSigndetailClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.distribution.entity.DistributionSigndetailEntity;
+import com.logpm.distribution.service.IDistributionSigndetailService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 签收明细 Feign实现类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class DistributionSigndetailClient implements IDistributionSigndetailClient {
+
+    private final IDistributionSigndetailService distributionSigndetailService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<DistributionSigndetailEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<DistributionSigndetailEntity> page = distributionSigndetailService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.distribution.entity.DistributionSignforEntity;
+import com.logpm.distribution.service.IDistributionSignforService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 签收管理 Feign实现类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class DistributionSignforClient implements IDistributionSignforClient {
+
+    private final IDistributionSignforService distributionSignforService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<DistributionSignforEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<DistributionSignforEntity> page = distributionSignforService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackagereceiptMapper.java

@@ -0,0 +1,55 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.mapper;
+
+import com.logpm.distribution.dto.DistributionPackagereceiptDTO;
+import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
+import com.logpm.distribution.vo.DistributionPackagereceiptVO;
+import com.logpm.distribution.excel.DistributionPackagereceiptExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 包条签收明细 Mapper 接口
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+public interface DistributionPackagereceiptMapper extends BaseMapper<DistributionPackagereceiptEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param distributionPackagereceipt
+	 * @return
+	 */
+	List<DistributionPackagereceiptVO> selectDistributionPackagereceiptPage(IPage page,@Param("param") DistributionPackagereceiptDTO distributionPackagereceipt);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<DistributionPackagereceiptExcel> exportDistributionPackagereceipt(@Param("ew") Wrapper<DistributionPackagereceiptEntity> queryWrapper);
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackagereceiptMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.distribution.mapper.DistributionPackagereceiptMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="distributionPackagereceiptResultMap" type="com.logpm.distribution.entity.DistributionPackagereceiptEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="wrap_bar_id" property="wrapBarId"/>
+        <result column="state" property="state"/>
+        <result column="receipt_details_id" property="receiptDetailsId"/>
+        <result column="received_quantity" property="receivedQuantity"/>
+    </resultMap>
+
+
+    <select id="selectDistributionPackagereceiptPage" resultMap="distributionPackagereceiptResultMap">
+        select * from logpm_distribution_packagereceipt where is_deleted = 0
+    </select>
+
+
+    <select id="exportDistributionPackagereceipt" resultType="com.logpm.distribution.excel.DistributionPackagereceiptExcel">
+        SELECT * FROM logpm_distribution_packagereceipt ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.mapper;
+
+import com.logpm.distribution.entity.DistributionSigndetailEntity;
+import com.logpm.distribution.vo.DistributionSigndetailVO;
+import com.logpm.distribution.excel.DistributionSigndetailExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 签收明细 Mapper 接口
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+public interface DistributionSigndetailMapper extends BaseMapper<DistributionSigndetailEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param distributionSigndetail
+	 * @return
+	 */
+	List<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage page, DistributionSigndetailVO distributionSigndetail);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<DistributionSigndetailExcel> exportDistributionSigndetail(@Param("ew") Wrapper<DistributionSigndetailEntity> queryWrapper);
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.distribution.mapper.DistributionSigndetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="distributionSigndetailResultMap" type="com.logpm.distribution.entity.DistributionSigndetailEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="master_id" property="masterId"/>
+        <result column="service_number" property="serviceNumber"/>
+        <result column="delivery_number" property="deliveryNumber"/>
+        <result column="train_number" property="trainNumber"/>
+        <result column="serve_type" property="serveType"/>
+        <result column="order_id" property="orderId"/>
+        <result column="mall_name" property="mallName"/>
+        <result column="goods_name" property="goodsName"/>
+        <result column="warehouse" property="warehouse"/>
+        <result column="warehousing_time" property="warehousingTime"/>
+        <result column="lead_time" property="leadTime"/>
+        <result column="duration_in_stock" property="durationInStock"/>
+        <result column="signed_number" property="signedNumber"/>
+        <result column="is_kitting" property="isKitting"/>
+        <result column="brand" property="brand"/>
+    </resultMap>
+
+
+    <select id="selectDistributionSigndetailPage" resultType="com.logpm.distribution.vo.DistributionSigndetailVO">
+        select * from logpm_distribution_signdetail where is_deleted = 0
+    </select>
+
+
+    <select id="exportDistributionSigndetail" resultType="com.logpm.distribution.excel.DistributionSigndetailExcel">
+        SELECT * FROM logpm_distribution_signdetail ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.mapper;
+
+import com.logpm.distribution.entity.DistributionSignforEntity;
+import com.logpm.distribution.vo.DistributionSignforVO;
+import com.logpm.distribution.excel.DistributionSignforExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 签收管理 Mapper 接口
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+public interface DistributionSignforMapper extends BaseMapper<DistributionSignforEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param distributionSignfor
+	 * @return
+	 */
+	List<DistributionSignforVO> selectDistributionSignforPage(IPage page, DistributionSignforVO distributionSignfor);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<DistributionSignforExcel> exportDistributionSignfor(@Param("ew") Wrapper<DistributionSignforEntity> queryWrapper);
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.distribution.mapper.DistributionSignforMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="distributionSignforResultMap" type="com.logpm.distribution.entity.DistributionSignforEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="order_id" property="orderId"/>
+        <result column="reservation_id" property="reservationId"/>
+        <result column="consignee" property="consignee"/>
+        <result column="delivery_address" property="deliveryAddress"/>
+        <result column="serve_type" property="serveType"/>
+        <result column="distributing_warehouse" property="distributingWarehouse"/>
+        <result column="train_number" property="trainNumber"/>
+        <result column="order_total" property="orderTotal"/>
+        <result column="total" property="total"/>
+        <result column="loaded_number" property="loadedNumber"/>
+        <result column="received_quantity" property="receivedQuantity"/>
+        <result column="delivery_driver" property="deliveryDriver"/>
+        <result column="delivery_driver_phone" property="deliveryDriverPhone"/>
+        <result column="signing_time" property="signingTime"/>
+        <result column="signee" property="signee"/>
+        <result column="signing_status" property="signingStatus"/>
+        <result column="signing_type" property="signingType"/>
+        <result column="clerk_sign_pictures" property="clerkSignPictures"/>
+        <result column="delivery_sign_pictures" property="deliverySignPictures"/>
+        <result column="service_number" property="serviceNumber"/>
+        <result column="notes" property="notes"/>
+    </resultMap>
+
+
+    <select id="selectDistributionSignforPage" resultMap="distributionSignforResultMap">
+        select * from logpm_distribution_signfor where is_deleted = 0
+    </select>
+
+
+    <select id="exportDistributionSignfor" resultType="com.logpm.distribution.excel.DistributionSignforExcel">
+        SELECT * FROM logpm_distribution_signfor ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionPackagereceiptService.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.distribution.dto.DistributionPackagereceiptDTO;
+import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
+import com.logpm.distribution.vo.DistributionPackagereceiptVO;
+import com.logpm.distribution.excel.DistributionPackagereceiptExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 包条签收明细 服务类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+public interface IDistributionPackagereceiptService extends BaseService<DistributionPackagereceiptEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param distributionPackagereceipt
+	 * @return
+	 */
+	IPage<DistributionPackagereceiptVO> selectDistributionPackagereceiptPage(IPage<DistributionPackagereceiptVO> page, DistributionPackagereceiptDTO distributionPackagereceipt);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<DistributionPackagereceiptExcel> exportDistributionPackagereceipt(Wrapper<DistributionPackagereceiptEntity> queryWrapper);
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSigndetailService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.distribution.entity.DistributionSigndetailEntity;
+import com.logpm.distribution.vo.DistributionSigndetailVO;
+import com.logpm.distribution.excel.DistributionSigndetailExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 签收明细 服务类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+public interface IDistributionSigndetailService extends BaseService<DistributionSigndetailEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param distributionSigndetail
+	 * @return
+	 */
+	IPage<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage<DistributionSigndetailVO> page, DistributionSigndetailVO distributionSigndetail);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<DistributionSigndetailExcel> exportDistributionSigndetail(Wrapper<DistributionSigndetailEntity> queryWrapper);
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.distribution.entity.DistributionSignforEntity;
+import com.logpm.distribution.vo.DistributionSignforVO;
+import com.logpm.distribution.excel.DistributionSignforExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 签收管理 服务类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+public interface IDistributionSignforService extends BaseService<DistributionSignforEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param distributionSignfor
+	 * @return
+	 */
+	IPage<DistributionSignforVO> selectDistributionSignforPage(IPage<DistributionSignforVO> page, DistributionSignforVO distributionSignfor);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<DistributionSignforExcel> exportDistributionSignfor(Wrapper<DistributionSignforEntity> queryWrapper);
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPackagereceiptServiceImpl.java

@@ -0,0 +1,55 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.service.impl;
+
+import com.logpm.distribution.dto.DistributionPackagereceiptDTO;
+import com.logpm.distribution.entity.DistributionPackagereceiptEntity;
+import com.logpm.distribution.vo.DistributionPackagereceiptVO;
+import com.logpm.distribution.excel.DistributionPackagereceiptExcel;
+import com.logpm.distribution.mapper.DistributionPackagereceiptMapper;
+import com.logpm.distribution.service.IDistributionPackagereceiptService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 包条签收明细 服务实现类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Service
+public class DistributionPackagereceiptServiceImpl extends BaseServiceImpl<DistributionPackagereceiptMapper, DistributionPackagereceiptEntity> implements IDistributionPackagereceiptService {
+
+	@Override
+	public IPage<DistributionPackagereceiptVO> selectDistributionPackagereceiptPage(IPage<DistributionPackagereceiptVO> page, DistributionPackagereceiptDTO distributionPackagereceipt) {
+		return page.setRecords(baseMapper.selectDistributionPackagereceiptPage(page, distributionPackagereceipt));
+	}
+
+
+	@Override
+	public List<DistributionPackagereceiptExcel> exportDistributionPackagereceipt(Wrapper<DistributionPackagereceiptEntity> queryWrapper) {
+		List<DistributionPackagereceiptExcel> distributionPackagereceiptList = baseMapper.exportDistributionPackagereceipt(queryWrapper);
+		//distributionPackagereceiptList.forEach(distributionPackagereceipt -> {
+		//	distributionPackagereceipt.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionPackagereceipt.getType()));
+		//});
+		return distributionPackagereceiptList;
+	}
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.service.impl;
+
+import com.logpm.distribution.entity.DistributionSigndetailEntity;
+import com.logpm.distribution.vo.DistributionSigndetailVO;
+import com.logpm.distribution.excel.DistributionSigndetailExcel;
+import com.logpm.distribution.mapper.DistributionSigndetailMapper;
+import com.logpm.distribution.service.IDistributionSigndetailService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 签收明细 服务实现类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Service
+public class DistributionSigndetailServiceImpl extends BaseServiceImpl<DistributionSigndetailMapper, DistributionSigndetailEntity> implements IDistributionSigndetailService {
+
+	@Override
+	public IPage<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage<DistributionSigndetailVO> page, DistributionSigndetailVO distributionSigndetail) {
+		return page.setRecords(baseMapper.selectDistributionSigndetailPage(page, distributionSigndetail));
+	}
+
+
+	@Override
+	public List<DistributionSigndetailExcel> exportDistributionSigndetail(Wrapper<DistributionSigndetailEntity> queryWrapper) {
+		List<DistributionSigndetailExcel> distributionSigndetailList = baseMapper.exportDistributionSigndetail(queryWrapper);
+		//distributionSigndetailList.forEach(distributionSigndetail -> {
+		//	distributionSigndetail.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionSigndetail.getType()));
+		//});
+		return distributionSigndetailList;
+	}
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.service.impl;
+
+import com.logpm.distribution.entity.DistributionSignforEntity;
+import com.logpm.distribution.vo.DistributionSignforVO;
+import com.logpm.distribution.excel.DistributionSignforExcel;
+import com.logpm.distribution.mapper.DistributionSignforMapper;
+import com.logpm.distribution.service.IDistributionSignforService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 签收管理 服务实现类
+ *
+ * @author lmy
+ * @since 2023-06-13
+ */
+@Service
+public class DistributionSignforServiceImpl extends BaseServiceImpl<DistributionSignforMapper, DistributionSignforEntity> implements IDistributionSignforService {
+
+	@Override
+	public IPage<DistributionSignforVO> selectDistributionSignforPage(IPage<DistributionSignforVO> page, DistributionSignforVO distributionSignfor) {
+		return page.setRecords(baseMapper.selectDistributionSignforPage(page, distributionSignfor));
+	}
+
+
+	@Override
+	public List<DistributionSignforExcel> exportDistributionSignfor(Wrapper<DistributionSignforEntity> queryWrapper) {
+		List<DistributionSignforExcel> distributionSignforList = baseMapper.exportDistributionSignfor(queryWrapper);
+		//distributionSignforList.forEach(distributionSignfor -> {
+		//	distributionSignfor.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionSignfor.getType()));
+		//});
+		return distributionSignforList;
+	}
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java

@@ -2,13 +2,17 @@ package com.logpm.factory.snm.service.impl;
 
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.alibaba.nacos.shaded.com.google.gson.GsonBuilder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.factory.props.PanFactoryProperties;
 import com.logpm.factory.snm.dto.OrderInfoDTO;
 import com.logpm.factory.snm.dto.OrderStatusDTO;
 import com.logpm.factory.snm.entity.PanFactoryOrder;
 import com.logpm.factory.snm.entity.PanOrderStatusLog;
-import com.logpm.factory.snm.service.*;
+import com.logpm.factory.snm.service.IPanFactoryDataService;
+import com.logpm.factory.snm.service.IPanFactoryOrderService;
+import com.logpm.factory.snm.service.IPanOrderStatusLogService;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -105,17 +109,24 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 
 		//拼接参数
 		Map<String,Object> map = new HashMap<>();
-		map.put("payload",JSONObject.toJSONString(orderStatusDTO));
+//		map.put("payload",JSONObject.toJSONString(orderStatusDTO));
+//		map.put("payload", CommonUtil.formatJson(orderStatusDTO));
+		map.put("payload", JSONObject.toJSONString(orderStatusDTO));
+
+		Gson gson = new GsonBuilder().setPrettyPrinting().create();
+		String s = gson.toJson(map);
 
 		//先获取token
 		String panToken = getPanToken();
+
+		//请求参数
+		logger.info("##############handleStatusData: 推送包件状态请求参数 {}",s);
 		//处理逻辑
 		String result =  HttpRequest.post(panFactoryProperties.getUrl()+"/hitf/v1/rest/invoke?namespace=HZERO&serverCode=OPEN&interfaceCode=HUITONG_RECEIVE")
 			.header("Authorization","Bearer "+panToken)
-//			.header("Content-Type","application/json")
+			.header("Content-Type","application/json")
-			.form(map).timeout(5 * 1000)
+			.body(s).timeout(5 * 1000)
-			.execute()
+			.execute().body();
-			.body();
 
 		logger.info("##############handleStatusData: 推送包件状态返回参数 {}",result);
 

doc/dpm/物流租户系统.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.5.1",
   "createdTime": "2023-3-27 13:32:56",
-  "updatedTime": "2023-6-13 17:31:58",
+  "updatedTime": "2023-6-14 09:55:38",
   "dbConns": [],
   "profile": {
     "default": {
@@ -44156,6 +44156,23 @@
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
           "id": "4988A583-CC21-41BF-8ED9-E76EA6E11B6D"
         },
+        {
+          "defKey": "remarks",
+          "defName": "备注",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "99BE5CC9-8A7B-4751-8FBB-71FF7DF10B65"
+        },
         {
           "defKey": "reserve1",
           "defName": "预留1",
@@ -44733,6 +44750,23 @@
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
           "id": "5BDCE03E-8408-46F7-9E23-E6C5D78C7E84"
         },
+        {
+          "defKey": "reservation_id",
+          "defName": "预约信息编号",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "1026FD1C-F69F-4F10-9850-36E2A1A81503"
+        },
         {
           "defKey": "distance",
           "defName": "距离",
@@ -44755,15 +44789,15 @@
       "indexes": []
     },
     {
-      "id": "65D3906C-B183-4149-807E-2ED207C658E0",
+      "id": "074062AB-331E-4F79-9C53-D6DC66E6E4A5",
       "env": {
         "base": {
           "nameSpace": "",
           "codeRoot": ""
         }
       },
-      "defKey": "logpm_distribution_reservation_addvalue",
+      "defKey": "logpm_distribution_stockup",
-      "defName": "预约增值服务中间表",
+      "defName": "备货信息表",
       "comment": "",
       "properties": {
         "partitioned by": "(date string)",
@@ -44917,7 +44951,7 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "refDict": "",
           "uiHint": "",
-          "id": "9A7E5CB1-E37F-4055-85E5-185CBECCA892"
+          "id": "3CDD9068-971D-458A-B3C6-F9BAC7E28DB5"
         },
         {
           "defKey": "create_user",
@@ -44934,7 +44968,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "EEB09E27-90F6-4011-8312-ACD881BB5012"
+          "id": "9F10416D-8592-4EF1-86AA-9E67BBD7DCAC"
         },
         {
           "defKey": "create_time",
@@ -44951,7 +44985,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "9231EB3A-F059-40FE-85EA-FD64D16BE2C4"
+          "id": "0F3BA301-58FF-476F-8D6A-B560B6C2D674"
         },
         {
           "defKey": "update_user",
@@ -44968,7 +45002,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "335CDFC3-8824-4A84-891E-2593D973A4B4"
+          "id": "7A871CAF-5037-4B7A-9FB4-41270694B1F2"
         },
         {
           "defKey": "update_time",
@@ -44985,7 +45019,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "91B95982-9EA3-499D-BD15-AF17DAE5BFCB"
+          "id": "E88DF621-DD16-4398-97A8-E402993FB98B"
         },
         {
           "defKey": "status",
@@ -45002,7 +45036,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "",
-          "id": "14C46613-5A42-4B4F-8A0B-F4AC47BC5DBF"
+          "id": "11160A61-1454-49CE-8DA8-9D325EE5D0E8"
         },
         {
           "defKey": "is_deleted",
@@ -45019,7 +45053,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "",
-          "id": "AEA5C392-B9C7-48D6-8DC8-6E9527FE9514"
+          "id": "0F7FB170-9E88-4809-9937-A9B8158663E8"
         },
         {
           "defKey": "create_dept",
@@ -45036,7 +45070,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "5C1640E0-9FAD-4B0C-8F11-E53425D8DFED"
+          "id": "AD8B819A-063D-46F4-8C3B-E3D07BFA86CF"
         },
         {
           "defKey": "id",
@@ -45053,11 +45087,28 @@
           "refDict": "",
           "extProps": {},
           "domain": "",
-          "id": "71867FD2-575E-41D6-AC22-56D74385B4EC"
+          "id": "A19EAC7E-30D0-434B-85C7-6EB3159EC8B5"
         },
         {
-          "defKey": "reservation_id",
+          "defKey": "stockup_date",
-          "defName": "预约信息编号",
+          "defName": "备货时间",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "id": "D5FCCB30-6293-4AD2-BBE7-1D2FE4C98FB0"
+        },
+        {
+          "defKey": "stockup_user",
+          "defName": "备货人",
           "comment": "",
           "type": "",
           "len": "",
@@ -45070,11 +45121,62 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "F43C15F9-F70B-41A9-8700-418F916168D8"
+          "id": "6CA57D63-BFC0-4A49-A286-79A656A7790B"
         },
         {
-          "defKey": "addvalue_id",
+          "defKey": "stockup_status",
-          "defName": "增值服务编号",
+          "defName": "备货状态",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "87CBFA68-F1B7-41CF-98E1-4BBEF7167074"
+        },
+        {
+          "defKey": "stockup_area",
+          "defName": "备货区",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "E31DC76B-B753-476E-A523-743C733D4508"
+        },
+        {
+          "defKey": "assign_status",
+          "defName": "指派状态",
+          "comment": "1-未指派、2-已指派",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "D91750B2-3001-42BF-94BC-C7222AC7069E"
+        },
+        {
+          "defKey": "stockip_allocation",
+          "defName": "备货库位",
           "comment": "",
           "type": "",
           "len": "",
@@ -45087,7 +45189,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "A8AD1970-A77E-4C6E-A133-9523677E671F"
+          "id": "917DDAF8-4CDA-4145-A155-3B5DF78032AC"
         },
         {
           "defKey": "reserve1",
@@ -45104,7 +45206,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "88EE4882-2307-447D-9570-B5830BD09746"
+          "id": "60FDB599-362C-4D85-AAA2-BF05F989F3EB"
         },
         {
           "defKey": "reserve2",
@@ -45121,7 +45223,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "3471B393-F4A0-4D70-89DD-BE3E4D642207"
+          "id": "C883C4FC-C8E0-454F-AD82-8B20036D8E1A"
         },
         {
           "defKey": "reserve3",
@@ -45138,7 +45240,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "FB5113D4-AD99-4599-8A7B-0649F86ED44C"
+          "id": "86A44EE7-AC69-458C-9C7D-0BAC364D4ABA"
         },
         {
           "defKey": "reserve4",
@@ -45155,7 +45257,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "9A27FA56-6F24-4E52-B38F-65DA2DB6DC14"
+          "id": "26F5A4F0-668E-4CA7-86BA-7FB9992E641A"
         },
         {
           "defKey": "reserve5",
@@ -45172,22 +45274,22 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "D93473B0-40C1-4E21-8EAF-A12959439F53"
+          "id": "B3F35371-7DA4-4AE7-902B-7632AF8D778C"
         }
       ],
       "correlations": [],
       "indexes": []
     },
     {
-      "id": "074062AB-331E-4F79-9C53-D6DC66E6E4A5",
+      "id": "036E112B-AD9A-454A-A5DD-0D6BE631F049",
       "env": {
         "base": {
           "nameSpace": "",
           "codeRoot": ""
         }
       },
-      "defKey": "logpm_distribution_stockup",
+      "defKey": "logpm_distribution_reservation_driver",
-      "defName": "备货信息表",
+      "defName": "预约配送表",
       "comment": "",
       "properties": {
         "partitioned by": "(date string)",
@@ -45326,6 +45428,23 @@
         }
       ],
       "fields": [
+        {
+          "defKey": "id",
+          "defName": "主键",
+          "comment": "",
+          "type": "INT",
+          "len": 20,
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "6F0360B8-5C73-4638-94CD-D3C41F9FAB2A"
+        },
         {
           "defKey": "tenant_id",
           "defName": "租户号",
@@ -45341,7 +45460,7 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "refDict": "",
           "uiHint": "",
-          "id": "3CDD9068-971D-458A-B3C6-F9BAC7E28DB5"
+          "id": "1C6DA34A-AF43-4492-96A1-094BDB1FA0DD"
         },
         {
           "defKey": "create_user",
@@ -45358,7 +45477,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "9F10416D-8592-4EF1-86AA-9E67BBD7DCAC"
+          "id": "6B850C06-D329-4391-AFB3-41AA689E8540"
         },
         {
           "defKey": "create_time",
@@ -45375,7 +45494,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "0F3BA301-58FF-476F-8D6A-B560B6C2D674"
+          "id": "E0DE3083-1F30-4586-A373-660C6063F7F3"
         },
         {
           "defKey": "update_user",
@@ -45392,7 +45511,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "7A871CAF-5037-4B7A-9FB4-41270694B1F2"
+          "id": "F93FE345-F16E-4D81-8CC7-61345968DD77"
         },
         {
           "defKey": "update_time",
@@ -45409,7 +45528,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "E88DF621-DD16-4398-97A8-E402993FB98B"
+          "id": "E8416CF2-1E86-425C-8435-50258345E3A4"
         },
         {
           "defKey": "status",
@@ -45426,7 +45545,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "",
-          "id": "11160A61-1454-49CE-8DA8-9D325EE5D0E8"
+          "id": "D21C9C62-A18F-4151-A65D-EA288F9957A3"
         },
         {
           "defKey": "is_deleted",
@@ -45443,7 +45562,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "",
-          "id": "0F7FB170-9E88-4809-9937-A9B8158663E8"
+          "id": "8C545D24-321A-4C65-87E2-141C7103382B"
         },
         {
           "defKey": "create_dept",
@@ -45460,28 +45579,28 @@
           "refDict": "",
           "extProps": {},
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "AD8B819A-063D-46F4-8C3B-E3D07BFA86CF"
+          "id": "969BB958-D33C-4234-B258-0D387A9A5BD5"
         },
         {
-          "defKey": "id",
+          "defKey": "reserve1",
-          "defName": "主键",
+          "defName": "预留1",
           "comment": "",
-          "type": "INT",
+          "type": "",
-          "len": 20,
+          "len": "",
           "scale": "",
-          "primaryKey": true,
+          "primaryKey": false,
-          "notNull": true,
+          "notNull": false,
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "",
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "A19EAC7E-30D0-434B-85C7-6EB3159EC8B5"
+          "id": "233DD1A8-EA0E-457D-A971-AE8D423EC208"
         },
         {
-          "defKey": "stockup_date",
+          "defKey": "reserve2",
-          "defName": "备货时间",
+          "defName": "预留2",
           "comment": "",
           "type": "",
           "len": "",
@@ -45493,12 +45612,12 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "D5FCCB30-6293-4AD2-BBE7-1D2FE4C98FB0"
+          "id": "D8B8C7FB-DF2F-49E4-8EB9-BC824050DE28"
         },
         {
-          "defKey": "stockup_user",
+          "defKey": "reserve3",
-          "defName": "备货人",
+          "defName": "预留3",
           "comment": "",
           "type": "",
           "len": "",
@@ -45511,11 +45630,11 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "6CA57D63-BFC0-4A49-A286-79A656A7790B"
+          "id": "FDD48A32-DF6E-4AC8-9674-5DE0503DF716"
         },
         {
-          "defKey": "stockup_status",
+          "defKey": "reserve4",
-          "defName": "备货状态",
+          "defName": "预留4",
           "comment": "",
           "type": "",
           "len": "",
@@ -45528,12 +45647,12 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "87CBFA68-F1B7-41CF-98E1-4BBEF7167074"
+          "id": "40DE8BD8-6392-4DD2-95B5-75FA18240DF1"
         },
         {
-          "defKey": "stockup_area",
+          "defKey": "driver_id",
-          "defName": "备货区",
+          "defName": "司机编号",
-          "comment": "",
+          "comment": "司机编号，仅对自主配送有效，外请司机使用其他字段",
           "type": "",
           "len": "",
           "scale": "",
@@ -45545,12 +45664,12 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "E31DC76B-B753-476E-A523-743C733D4508"
+          "id": "F0F85483-BB8A-45DD-926A-CFCE90F83FD5"
         },
         {
-          "defKey": "assign_status",
+          "defKey": "vehicle_id",
-          "defName": "指派状态",
+          "defName": "车辆编号",
-          "comment": "1-未指派、2-已指派",
+          "comment": "车辆编号，仅对自主配送有效",
           "type": "",
           "len": "",
           "scale": "",
@@ -45562,11 +45681,11 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "D91750B2-3001-42BF-94BC-C7222AC7069E"
+          "id": "797D2DED-606E-4CF2-B829-DFDAF0CEC2FD"
         },
         {
-          "defKey": "stockip_allocation",
+          "defKey": "reservation_id",
-          "defName": "备货库位",
+          "defName": "预约编号",
           "comment": "",
           "type": "",
           "len": "",
@@ -45579,12 +45698,12 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "917DDAF8-4CDA-4145-A155-3B5DF78032AC"
+          "id": "706A4C26-E728-41D4-82C7-DFEBA81F0268"
         },
         {
-          "defKey": "reserve1",
+          "defKey": "driver_source",
-          "defName": "预留1",
+          "defName": "司机来源",
-          "comment": "",
+          "comment": "外请司机来源，如：货拉拉",
           "type": "",
           "len": "",
           "scale": "",
@@ -45596,11 +45715,11 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "60FDB599-362C-4D85-AAA2-BF05F989F3EB"
+          "id": "8CF33FEE-CEB5-442F-ACF2-130459B25B2F"
         },
         {
-          "defKey": "reserve2",
+          "defKey": "vehicle_plate",
-          "defName": "预留2",
+          "defName": "车牌",
           "comment": "",
           "type": "",
           "len": "",
@@ -45613,11 +45732,11 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "C883C4FC-C8E0-454F-AD82-8B20036D8E1A"
+          "id": "CAD2CB0B-68A7-4ABE-8A48-599A91BAF394"
         },
         {
-          "defKey": "reserve3",
+          "defKey": "team_staff_id",
-          "defName": "预留3",
+          "defName": "班组编号",
           "comment": "",
           "type": "",
           "len": "",
@@ -45630,11 +45749,28 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "86A44EE7-AC69-458C-9C7D-0BAC364D4ABA"
+          "id": "9A85290E-811B-4489-A988-31AF72F20681"
         },
         {
-          "defKey": "reserve4",
+          "defKey": "team_staff_way",
-          "defName": "预留4",
+          "defName": "班组装卸",
+          "comment": "码表；1-装、2-卸（对于配送而言只有装）",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "68831D5F-81F5-483D-B671-FB257B1ACC2F"
+        },
+        {
+          "defKey": "remarks",
+          "defName": "备注",
           "comment": "",
           "type": "",
           "len": "",
@@ -45647,7 +45783,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "26F5A4F0-668E-4CA7-86BA-7FB9992E641A"
+          "id": "CD48966B-F261-4279-B50B-6F676D05E07D"
         },
         {
           "defKey": "reserve5",
@@ -45664,22 +45800,22 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "B3F35371-7DA4-4AE7-902B-7632AF8D778C"
+          "id": "A8D99683-51F3-4E9E-90F6-9B33A350E30E"
         }
       ],
       "correlations": [],
       "indexes": []
     },
     {
-      "id": "036E112B-AD9A-454A-A5DD-0D6BE631F049",
+      "id": "BC8D88ED-39FD-4C74-9064-3712A7403300",
       "env": {
         "base": {
           "nameSpace": "",
           "codeRoot": ""
         }
       },
-      "defKey": "logpm_distribution_reservation_driver",
+      "defKey": "logpm_distribution_reservation_stockup",
-      "defName": "预约司机表",
+      "defName": "预约备货中间表",
       "comment": "",
       "properties": {
         "partitioned by": "(date string)",
@@ -45818,23 +45954,6 @@
         }
       ],
       "fields": [
-        {
-          "defKey": "id",
-          "defName": "主键",
-          "comment": "",
-          "type": "INT",
-          "len": 20,
-          "scale": "",
-          "primaryKey": true,
-          "notNull": true,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "",
-          "id": "6F0360B8-5C73-4638-94CD-D3C41F9FAB2A"
-        },
         {
           "defKey": "tenant_id",
           "defName": "租户号",
@@ -45850,7 +45969,7 @@
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "refDict": "",
           "uiHint": "",
-          "id": "1C6DA34A-AF43-4492-96A1-094BDB1FA0DD"
+          "id": "84C99215-7369-4DCC-A9EF-686DB3874C83"
         },
         {
           "defKey": "create_user",
@@ -45867,7 +45986,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "6B850C06-D329-4391-AFB3-41AA689E8540"
+          "id": "F991AAF1-E2C1-4F35-82E0-88D31B15A1EE"
         },
         {
           "defKey": "create_time",
@@ -45884,7 +46003,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "E0DE3083-1F30-4586-A373-660C6063F7F3"
+          "id": "03692A04-7BEE-4D87-86AB-D1D30CE510EA"
         },
         {
           "defKey": "update_user",
@@ -45901,7 +46020,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "F93FE345-F16E-4D81-8CC7-61345968DD77"
+          "id": "2BFD6B5F-C76B-4307-8D07-BEBA3173C753"
         },
         {
           "defKey": "update_time",
@@ -45918,7 +46037,7 @@
           "hideInGraph": true,
           "refDict": "",
           "uiHint": "",
-          "id": "E8416CF2-1E86-425C-8435-50258345E3A4"
+          "id": "D0D99CDE-2234-4A12-BE71-4E3705C1E36D"
         },
         {
           "defKey": "status",
@@ -45935,7 +46054,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "",
-          "id": "D21C9C62-A18F-4151-A65D-EA288F9957A3"
+          "id": "846478DB-2085-4DFE-9B41-CAAFB52E2CC4"
         },
         {
           "defKey": "is_deleted",
@@ -45952,7 +46071,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "",
-          "id": "8C545D24-321A-4C65-87E2-141C7103382B"
+          "id": "A807B5C0-B510-421F-8D14-2931E5DE1D33"
         },
         {
           "defKey": "create_dept",
@@ -45969,109 +46088,24 @@
           "refDict": "",
           "extProps": {},
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "969BB958-D33C-4234-B258-0D387A9A5BD5"
+          "id": "D8A8F8C6-1607-4C13-B6CA-C84A1D88C24A"
-        },
-        {
-          "defKey": "reserve1",
-          "defName": "预留1",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "233DD1A8-EA0E-457D-A971-AE8D423EC208"
         },
         {
-          "defKey": "reserve2",
+          "defKey": "id",
-          "defName": "预留2",
+          "defName": "主键",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "D8B8C7FB-DF2F-49E4-8EB9-BC824050DE28"
-        },
-        {
-          "defKey": "reserve3",
-          "defName": "预留3",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "FDD48A32-DF6E-4AC8-9674-5DE0503DF716"
-        },
-        {
-          "defKey": "reserve4",
-          "defName": "预留4",
           "comment": "",
-          "type": "",
+          "type": "INT",
-          "len": "",
+          "len": 20,
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "40DE8BD8-6392-4DD2-95B5-75FA18240DF1"
-        },
-        {
-          "defKey": "driver_id",
-          "defName": "司机编号",
-          "comment": "司机编号，仅对自主配送有效，外请司机使用其他字段",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "F0F85483-BB8A-45DD-926A-CFCE90F83FD5"
-        },
-        {
-          "defKey": "vehicle_id",
-          "defName": "车辆编号",
-          "comment": "车辆编号，仅对自主配送有效",
-          "type": "",
-          "len": "",
           "scale": "",
-          "primaryKey": false,
+          "primaryKey": true,
-          "notNull": false,
+          "notNull": true,
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "domain": "",
-          "id": "797D2DED-606E-4CF2-B829-DFDAF0CEC2FD"
+          "id": "6A240695-BED1-451A-8C6A-8C8821858642"
         },
         {
           "defKey": "reservation_id",
@@ -46088,12 +46122,12 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "706A4C26-E728-41D4-82C7-DFEBA81F0268"
+          "id": "C1CA806D-94BB-4F5B-AC47-21C9AF64466D"
         },
         {
-          "defKey": "driver_source",
+          "defKey": "stockup_id",
-          "defName": "司机来源",
+          "defName": "备货编号",
-          "comment": "外请司机来源，如：货拉拉",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -46105,11 +46139,11 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "8CF33FEE-CEB5-442F-ACF2-130459B25B2F"
+          "id": "164DE169-7C68-4A0A-ABA0-148E58EB40E6"
         },
         {
-          "defKey": "vehicle_plate",
+          "defKey": "reserve1",
-          "defName": "车牌",
+          "defName": "预留1",
           "comment": "",
           "type": "",
           "len": "",
@@ -46122,11 +46156,11 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "CAD2CB0B-68A7-4ABE-8A48-599A91BAF394"
+          "id": "14A900F2-4345-4FFC-9F43-BD7CD9C89A01"
         },
         {
-          "defKey": "team_staff_id",
+          "defKey": "reserve2",
-          "defName": "班组编号",
+          "defName": "预留2",
           "comment": "",
           "type": "",
           "len": "",
@@ -46139,12 +46173,12 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "9A85290E-811B-4489-A988-31AF72F20681"
+          "id": "943825A9-153B-44C8-9E5D-BEB3F875F654"
         },
         {
-          "defKey": "team_staff_way",
+          "defKey": "reserve3",
-          "defName": "班组装卸",
+          "defName": "预留3",
-          "comment": "码表；1-装、2-卸（对于配送而言只有装）",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -46156,11 +46190,11 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "68831D5F-81F5-483D-B671-FB257B1ACC2F"
+          "id": "BBB5E05C-7AAA-4282-B4ED-190E50B1786B"
         },
         {
-          "defKey": "remarks",
+          "defKey": "reserve4",
-          "defName": "备注",
+          "defName": "预留4",
           "comment": "",
           "type": "",
           "len": "",
@@ -46173,7 +46207,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "CD48966B-F261-4279-B50B-6F676D05E07D"
+          "id": "EF5AE310-3707-4827-BCE2-FD81CCDCB8C7"
         },
         {
           "defKey": "reserve5",
@@ -46190,7 +46224,7 @@
           "refDict": "",
           "extProps": {},
           "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "A8D99683-51F3-4E9E-90F6-9B33A350E30E"
+          "id": "47085211-B0B0-499E-BD4B-8E1F934643F7"
         }
       ],
       "correlations": [],
@@ -46321,9 +46355,9 @@
         "3FA48972-F152-4F26-B43C-584C8BB5FC19",
         "4E0BBE6C-9974-43BE-8DD0-718288D2A476",
         "49DFA587-DA84-4CC3-A8B0-063A2A7CF89B",
-        "65D3906C-B183-4149-807E-2ED207C658E0",
         "074062AB-331E-4F79-9C53-D6DC66E6E4A5",
-        "036E112B-AD9A-454A-A5DD-0D6BE631F049"
+        "036E112B-AD9A-454A-A5DD-0D6BE631F049",
+        "BC8D88ED-39FD-4C74-9064-3712A7403300"
       ],
       "refViews": [],
       "refDiagrams": [],