commit

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

@@ -138,4 +138,8 @@ public class DataGetController {
 
         return dataObjects;
     }
+
+    public void repairCollectOrderItemMessage(String orderCode) {
+
+    }
 }

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

@@ -1144,7 +1144,7 @@ public class PddLocalController {
         notifyRequest.getResult().setCode(0);
 
 
-        log.info("derelictionRequest:{}", JSON.toJSONString(notifyRequest));
+//        log.info("derelictionRequest:{}", JSON.toJSONString(notifyRequest));
         JYBaseRequestModel requestModel = new JYBaseRequestModel();
         requestModel.setRequest(JSON.toJSONString(notifyRequest));
         requestModel.setRequest_id("" + new Date().getTime());
@@ -1185,7 +1185,6 @@ public class PddLocalController {
         }
         collectOrderImpl.updateOrderStatus(StatusEnum.FINISHOUTBOUND.getCode(), collectOrderResponse.getUid());
 
-
         return JsonResponse.generateLocalCommonSuccessResponse(outBoundRequest.getOutPackageList());
     }
 
@@ -1245,12 +1244,19 @@ public class PddLocalController {
                 // ---- 开始   修改为不认同前端输入，改为系统自动生成
 //                packageInfo.setOutboundMailNo(outPackage.getMailNo());
 //                packageInfo.setExpressCode(outPackage.getExpressCode());
+                if (notifyRequest.getSegmentCode().equals("RETURNSELLER")) {
+                    packageInfo.setOutboundMailNo(outPackage.getMailNo());
+                    packageInfo.setExpressCode(outPackage.getExpressCode());
+                } else {
+                    // ---- 开始   修改为不认同前端输入，改为系统自动生成
                     WaybillOperator.WaybillInfo waybillInfo = waybillOperator.generateWaybillInfo();
                     packageInfo.setOutboundMailNo(waybillInfo.getMailNo());
                     packageInfo.setExpressCode(waybillInfo.getExpressCode());
                     outPackage.setExpressCode(waybillInfo.getExpressCode());
                     outPackage.setMailNo(waybillInfo.getMailNo());
                     // 结束 ----
+                }
+                // 结束 ----
                 packageInfo.setPackageType(outPackage.getPackageType());
                 packageInfo.setLength(outPackage.getLength());
                 packageInfo.setWidth(outPackage.getWidth());
@@ -1470,7 +1476,13 @@ public class PddLocalController {
     /*通过运单号查询存放区域*/
     @PostMapping("/storageSelect")
     public JSONObject storageSelect(HttpServletRequest request, @RequestBody StorageRequest storageRequest) {
-        return JsonResponse.generateLocalCommonSuccessResponse(storageImpl.storageSelect(storageRequest.getMailNo()));
+        StorageResponse response = storageImpl.storageSelect(storageRequest.getMailNo());
+        if (response != null) {
+            if (response.getPlace() != null && !response.getPlace().isEmpty()) {
+                response.setCode(response.getCode() + '>' + response.getPlace());
+            }
+        }
+        return JsonResponse.generateLocalCommonSuccessResponse(response);
     }
 
     /*确认上架*/

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

@@ -654,7 +654,7 @@ public class PddOpenController {
 
         reverseNotifyImpl.save(reverseNotifyEntity);
         String orderCode = notifyRequest.getOrderCode();
-        if (notifyRequest.getType().toUpperCase().equals("HEBAO")) {
+        if (notifyRequest.getOrderType().toUpperCase().equals("HEBAO")) {
             CollectOrderEntity collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(orderCode);
             if (collectOrderEntity != null) {
                 if (collectOrderEntity.getRemarks() == null) {
@@ -667,7 +667,7 @@ public class PddOpenController {
                 }
                 collectOrderImpl.updateById(collectOrderEntity);
             }
-        } else if (notifyRequest.getType().toUpperCase().equals("JIYUN")) {
+        } else if (notifyRequest.getOrderType().toUpperCase().equals("JIYUN")) {
             LogOrderEntity logOrderEntity = orderImpl.getByOrderCode(orderCode);
             if (logOrderEntity != null) {
                 if (logOrderEntity.getRemarks() == null) {

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

@@ -32,11 +32,14 @@ public interface StorageMapper extends BaseMapper<StorageEntity> {
     @Select("SELECT SUM(IFNULL(`total`, 0) - IFNULL(`num`, 0)) FROM( SELECT `total`, `num` FROM `storage` WHERE `num` <> `total` AND `code` = #{code} GROUP BY `logisticsOrderCode`) t")
     Integer findReNumCount(@Param("code") String code);
 
-    @Select("SELECT `code` FROM  `storage` WHERE `mailNo` = #{mailNo}")
+    @Select("SELECT `code`, `place` FROM  `storage` WHERE `mailNo` = #{mailNo}")
     StorageResponse storageSelect(@Param("mailNo") String mailNo);
 
     @Select("SELECT a.`mailNo`, a.`code` , a.`place` FROM `storage` a, `unpack_mail_detail` b WHERE b.`orderCode` = #{logisticsOrderCode} AND b.`mailNo` = a.`mailNo`")
-    List<StorageListResponse> storageList(@Param("logisticsOrderCode") String logisticsOrderCode);
+    List<StorageListResponse> storageUnpackList(@Param("logisticsOrderCode") String logisticsOrderCode);
+
+    @Select("SELECT a.`mailNo`, a.`code` , a.`place` FROM `storage` a, `collect_mail_detail` b WHERE b.`orderCode` = #{logisticsOrderCode} AND b.`mailNo` = a.`mailNo`")
+    List<StorageListResponse> storageCollectList(@Param("logisticsOrderCode") String logisticsOrderCode);
 
     @Delete("DELETE FROM `storage` WHERE `mailNo` IN ${ids}")
     void storageDel(@Param("ids") String ids);

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

@@ -6,4 +6,6 @@ import lombok.Data;
 public class StorageResponse {
     private String code;
 
+    private String place;
+
 }

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

@@ -47,7 +47,11 @@ public class StorageImpl extends ServiceImpl<StorageMapper, StorageEntity> imple
     }
 
     public List<StorageListResponse> storageList(String logisticsOrderCode) {
-        return baseMapper.storageList(logisticsOrderCode);
+        List<StorageListResponse> list = baseMapper.storageUnpackList(logisticsOrderCode);
+        if (list == null || list.isEmpty()) {
+            list = baseMapper.storageCollectList(logisticsOrderCode);
+        }
+        return list;
     }
 
     public void storageDel(String ids) {

PddServer/src/main/java/org/ta/pddserver/serviceutil/WaybillOperator.java

@@ -47,9 +47,9 @@ public class WaybillOperator {
         }
         waybillInfo.setExpressCode(currentWaybillSea.getExpressCode());
         waybillInfo.setMailNo("" + currentNo + verifyByte);
+        currentWaybillSea.setCurrentNo(currentNo);
         if (this.lotto > 0) {
             // 测试不更新
-            currentWaybillSea.setCurrentNo(currentNo);
             waybillSeaImpl.updateById(currentWaybillSea);
         }
         return waybillInfo;