项目完善

PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java

@@ -203,7 +203,6 @@ public class PddLocalController {
         ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
         ioEntity.setExpressCode(mailNoResponse.getExpressCode());
         ioEntity.setMailNo(mailNoResponse.getMailNo());
-        ioEntity.setStatus(30);
 
         String action = finishUnpackRequest.getAction();
 
@@ -216,12 +215,18 @@ public class PddLocalController {
 
         PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result();
         if (action == "begin_pick") {
+            ioEntity.setStatus(30);
+
             notifyRequest.setBizActionDesc("开始拣货");
             notifyResult.setCode(0);
         } else if (action == "finish_pick") {
+            ioEntity.setStatus(40);
+
             notifyRequest.setBizActionDesc("拣货完成");
             notifyResult.setCode(0);
         } else if (action == "finish_unpack") {
+            ioEntity.setStatus(50);
+
             notifyRequest.setBizActionDesc("拆包完成");
             notifyRequest.setUnpackRemark("");
             notifyResult.setCode(0);

PddServer/src/main/java/org/ta/pddserver/entity/CollectOutMailDetailIoEntity.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("collect_out_mail_detail_io")
+public class CollectOutMailDetailIoEntity {
+
+
+    @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 Integer status;
+
+    @TableField(value = "logisticsOrderCode")
+    private String logisticsOrderCode;
+
+    @TableField(value = "expressCode")
+    private String expressCode;
+
+    @TableField(value = "mailNo")
+    private String mailNo;
+
+    @TableField(value = "action")
+    private String action;
+
+    @TableField(value = "req")
+    private String req;
+
+    @TableField(value = "resp")
+    private String resp;
+
+}

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.ta.pddserver.entity.CollectOutMailDetailIoEntity;
+import org.ta.pddserver.entity.LogOrderMailDetailIoEntity;
+import org.ta.pddserver.model.api.request.CollectOutMailDetailIoRequest;
+import org.ta.pddserver.model.api.request.LogOrderMailDetailIoRequest;
+import org.ta.pddserver.model.api.response.CollectOutMailDetailIoListResponse;
+import org.ta.pddserver.model.api.response.LogOrderMailDetailIoListResponse;
+
+import java.util.List;
+
+@Mapper
+public interface CollectOutMailDetailIoMapper extends BaseMapper<CollectOutMailDetailIoEntity> {
+
+    @Select("SELECT count(t.uid) FROM ( SELECT a.uid  FROM  `collect_out_mail_detail_io` a WHERE  a.`logisticsOrderCode` LIKE '%${logisticsOrderCode}%'  AND `mailNo` LIKE '%${mailNo}%'  AND `status` = #{status} ) t")
+    Integer countUsable(CollectOutMailDetailIoRequest param);
+
+    @Select("SELECT `uid`, `created`,`status`, `logisticsOrderCode`, `expressCode`, `mailNo`, `action`  FROM `collect_out_mail_detail_io` WHERE  `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' AND `mailNo` LIKE '%${mailNo}%'  AND `status` = #{status} ORDER BY uid DESC LIMIT #{offset}, #{size}; ")
+    List<CollectOutMailDetailIoListResponse> getListByRequest(CollectOutMailDetailIoRequest param);
+
+}

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class CollectOutMailDetailIoRequest extends PageTool {
+    private String mailNo;
+    private String logisticsOrderCode;
+    private Integer status;
+}

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

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class CollectOutMailDetailIoListResponse {
+
+    private String uid;
+    private String created;
+    private int status;
+    private String logisticsOrderCode;
+    private String expressCode;
+    private String mailNo;
+    private String action;
+
+}

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

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

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectOutMailDetailIoImpl.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.CollectOutMailDetailIoEntity;
+import org.ta.pddserver.mapper.CollectOutMailDetailIoMapper;
+import org.ta.pddserver.model.api.request.CollectOutMailDetailIoRequest;
+import org.ta.pddserver.model.api.response.CollectOutMailDetailIoListResponse;
+import org.ta.pddserver.service.CollectOutMailDetailIoService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class CollectOutMailDetailIoImpl extends ServiceImpl<CollectOutMailDetailIoMapper, CollectOutMailDetailIoEntity> implements CollectOutMailDetailIoService {
+
+
+    public Map<String, Object> getListByRequest(CollectOutMailDetailIoRequest param) {
+        Integer count = baseMapper.countUsable(param);
+        param.checkPage(count,20);
+        List<CollectOutMailDetailIoListResponse> 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;
+    }
+
+
+}
\ No newline at end of file