commit

PddServer/src/main/java/org/ta/pddserver/entity/LogOrderMailDetailEntity.java

@@ -26,7 +26,7 @@ public class LogOrderMailDetailEntity {
     private String remarks;
 
     @TableField(value = "status")
-    private String status;
+    private int status;
 
     @TableField(value = "logisticsOrderCode")
     private String logisticsOrderCode;

PddServer/src/main/java/org/ta/pddserver/entity/LogOrderPackageEntity.java

+package org.ta.pddserver.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("log_order_package")
+public class LogOrderPackageEntity {
+
+
+    @TableId(value = "uid")
+    private String uid;
+
+    @TableField(value = "created")
+    private String created;
+
+    @TableField(value = "updated")
+    private String updated;
+
+    @TableField(value = "state")
+    private Integer state;
+
+    @TableField(value = "remarks")
+    private String remarks;
+
+    @TableField(value = "status")
+    private String status;
+
+    @TableField(value = "logisticsOrderCode")
+    private String logisticsOrderCode;
+
+    @TableField(value = "packageType")
+    private String packageType;
+
+    @TableField(value = "expressCode")
+    private String expressCode;
+
+    @TableField(value = "mailNo")
+    private String mailNo;
+
+    @TableField(value = "length")
+    private int length;
+
+    @TableField(value = "width")
+    private int width;
+
+    @TableField(value = "height")
+    private int height;
+
+    @TableField(value = "weight")
+    private int weight;
+
+    @TableField(value = "enterTime")
+    private String enterTime;
+}

PddServer/src/main/java/org/ta/pddserver/mapper/LogOrderMailDetailMapper.java

@@ -37,6 +37,9 @@ public interface LogOrderMailDetailMapper extends BaseMapper<LogOrderMailDetailE
     @Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` ,`mailNo`, `updated`, `status` FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} ;")
     MailNoResponse getInfoByMailNo(@Param("mailNo") String mailNo);
 
+    @Select("SELECT * FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} ;")
+    LogOrderMailDetailEntity getAllInfoByMailNo(@Param("mailNo") String mailNo);
+
     @Update("UPDATE `log_order_mail_detail` SET `status` = ${status} WHERE `mailNo` = #{mailNo};")
     Boolean updateByMailNo(@Param("mailNo")String mailNo, @Param("status") int status);
 

PddServer/src/main/java/org/ta/pddserver/mapper/LogOrderPackageMapper.java

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import org.ta.pddserver.entity.LogOrderPackageEntity;
+import org.ta.pddserver.model.api.request.LogOrderPackageListRequest;
+import org.ta.pddserver.model.api.response.CollectMailDetailListResponse;
+
+import java.util.List;
+
+@Mapper
+public interface LogOrderPackageMapper extends BaseMapper<LogOrderPackageEntity> {
+
+
+
+
+    @Select("SELECT count(*) FROM `log_order_package` WHERE `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' AND `packageType` LIKE '%${packageType}%';")
+    Integer countUsable(LogOrderPackageListRequest logOrderPackageListRequest);
+
+    @Select("SELECT `uid`, `logisticsOrderCode`, `packageType`, `length`, `width`, `height`, `weight`, `created` FROM `log_order_package` WHERE `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' AND `packageType` LIKE '%${packageType}%' ORDER BY uid DESC LIMIT #{offset}, #{size}; ")
+    List<CollectMailDetailListResponse> getListByRequest(LogOrderPackageListRequest logOrderPackageListRequest);
+
+    @Select("SELECT * FROM `log_order_package` WHERE `logisticsOrderCode` = #{logisticsOrderCode}")
+    LogOrderPackageEntity getInfoByCode(@Param("logisticsOrderCode") String logisticsOrderCode);
+}

PddServer/src/main/java/org/ta/pddserver/model/api/request/FinishUnpackRequest.java

@@ -7,6 +7,8 @@ public class FinishUnpackRequest {
 
     private String mailNo;
 
+    private String logisticsOrderCode;
+
     private String status;
 
     private String action;

PddServer/src/main/java/org/ta/pddserver/model/api/request/LogOrderPackageListRequest.java

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class LogOrderPackageListRequest extends PageTool {
+
+    private String logisticsOrderCode;
+
+    private String packageType;
+
+    private int length;
+
+    private int width;
+
+    private int height;
+
+    private int weight;
+}

PddServer/src/main/java/org/ta/pddserver/model/api/request/ReceiveRequest.java

@@ -11,4 +11,17 @@ public class ReceiveRequest {
 
     private int status;
 
+    private String desc;
+
+    private String remark;
+
+    private Long weight;
+
+    private Long length;
+
+    private Long width;
+
+    private Long height;
+
+    private Long actualWeight;
 }

PddServer/src/main/java/org/ta/pddserver/model/api/response/CollectMailDetailListResponse.java

@@ -5,14 +5,18 @@ import lombok.Data;
 @Data
 public class CollectMailDetailListResponse {
 
-    private String uid;
+    private String logisticsOrderCode;
 
-    private String orderCode;
+    private String packageType;
 
-    private int status;
+    private int length;
 
-    private String expressCode;
+    private int width;
 
-    private String mailNo;
+    private int height;
+
+    private int weight;
+
+    private String created;
 
 }

PddServer/src/main/java/org/ta/pddserver/service/LogOrderPackageService.java

+package org.ta.pddserver.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.ta.pddserver.entity.LogOrderPackageEntity;
+
+public interface LogOrderPackageService extends IService<LogOrderPackageEntity> {
+
+}

PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderMailDetailImpl.java

@@ -55,6 +55,10 @@ public class LogOrderMailDetailImpl extends ServiceImpl<LogOrderMailDetailMapper
         return baseMapper.getInfoByMailNo(mailNo);
     }
 
+    public LogOrderMailDetailEntity getAllInfoByMailNo(String mailNo) {
+        return baseMapper.getAllInfoByMailNo(mailNo);
+    }
+
 
 
     public Long getSumByCodeStatus(String logisticsOrderCode, Long status) {

PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderPackageImpl.java

+package org.ta.pddserver.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.ta.pddserver.entity.LogOrderPackageEntity;
+import org.ta.pddserver.mapper.LogOrderPackageMapper;
+import org.ta.pddserver.model.api.request.CollectMailDetailListRequest;
+import org.ta.pddserver.model.api.request.LogOrderPackageListRequest;
+import org.ta.pddserver.model.api.response.CollectMailDetailListResponse;
+import org.ta.pddserver.service.LogOrderPackageService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class LogOrderPackageImpl extends ServiceImpl<LogOrderPackageMapper, LogOrderPackageEntity> implements LogOrderPackageService {
+
+
+
+    public Object getList(LogOrderPackageListRequest param) {
+
+        Integer count = baseMapper.countUsable(param);
+        param.checkPage(count,20);
+        List<CollectMailDetailListResponse> list = baseMapper.getListByRequest(param);
+        Map<String, Object> map = new HashMap<>();
+        map.put("total", count);
+        map.put("list", list);
+        map.put("page", param.getPage());
+        return map;
+    }
+
+    public LogOrderPackageEntity getInfoByCode(String logisticsOrderCode) {
+        return baseMapper.getInfoByCode(logisticsOrderCode);
+    }
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/utils/StatusEnum.java

-//package org.ta.pddserver.utils;
-//
-//import org.springframework.stereotype.Component;
-//
-//@Component
-//public enum StatusEnum {
-//    ORDERCREATE(1, "创建订单"),
-//    SIGNED(10, "签收"),
-//    REJECTED(11, "拒签"),
-//    DESTROY(12, "销毁"),
-//    UNINBOUND(19, "未入库"),
-//    INBOUND(20, "入库"),
-//    PARTINBOUND(21, "部分入库"),
-//    FULLINBOUND(22, "全部入库"),
-//    UNPACK(30, "通知拆包"),
-//    FINISHUNPACK(39, "拆包完成"),
-//    OUTBOUND(40, "通知出库"),
-//    BEGINPICK(50, "开始拣货"),
-//    FINISHPICK(59, "拣货完成"),
-//    FINISHOUTBOUND(60, "出库"),
-//    UNKNOWN(-1, "未知");
-//
-//    private final int code;
-//    private final String desc;
-//
-//    // 枚举构造方法默认私有，无需 Spring 注入
-//    StatusEnum(int code, String desc) {
-//        this.code = code;
-//        this.desc = desc;
-//    }
-//
-//    // 仅保留 Getter，无 Setter
-//    public int getCode() {
-//        return code;
-//    }
-//
-//    public String getDesc() {
-//        return desc;
-//    }
-//
-//    // 根据状态码查询枚举（核心业务方法）
-//    public static StatusEnum getByCode(int code) {
-//        for (StatusEnum status : StatusEnum.values()) {
-//            if (status.getCode() == code) {
-//                return status;
-//            }
-//        }
-//        return UNKNOWN;
-//    }
-//
-//}
+package org.ta.pddserver.utils;
+
+public enum StatusEnum {
+    ORDERCREATE(1, "创建订单"),
+    SIGNED(10, "签收"),
+    REJECTED(11, "拒签"),
+    DESTROY(12, "销毁"),
+    UNINBOUND(19, "未入库"),
+    INBOUND(20, "入库"),
+    PARTINBOUND(21, "部分入库"),
+    FULLINBOUND(22, "全部入库"),
+    UNPACK(30, "通知拆包"),
+    UNPACKBEGINPICK(31, "开始拣货"),
+    UNPACKFINISHPICK(32, "拣货完成"),
+    FINISHUNPACK(39, "拆包完成"),
+    OUTBOUND(40, "通知出库"),
+    BEGINPICK(50, "开始拣货"),
+    FINISHPICK(59, "拣货完成"),
+    FINISHOUTBOUND(60, "出库"),
+    UNKNOWN(-1, "未知");
+
+    private final int code;
+    private final String desc;
+
+    // 枚举构造方法默认私有，无需 Spring 注入
+    StatusEnum(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    // 仅保留 Getter，无 Setter
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    // 根据状态码查询枚举（核心业务方法）
+    public static StatusEnum getByCode(int code) {
+        for (StatusEnum status : StatusEnum.values()) {
+            if (status.getCode() == code) {
+                return status;
+            }
+        }
+        return UNKNOWN;
+    }
+
+}

PddServer/src/main/java/org/ta/pddserver/utils/TimeTool.java

@@ -15,4 +15,10 @@ public class TimeTool {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return sdf.format(date);
     }
+
+    public String getNowDate() {
+        Date date = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(date);
+    }
 }
\ No newline at end of file