commit

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

@@ -13,7 +13,6 @@ import org.ta.pddserver.entity.*;
 import org.ta.pddserver.model.api.request.*;
 import org.ta.pddserver.model.api.response.*;
 import org.ta.pddserver.model.enums.ErrorEnum;
-import org.ta.pddserver.model.enums.OrderRejectCode;
 import org.ta.pddserver.model.enums.StatusEnum;
 import org.ta.pddserver.model.pddjy.request.*;
 import org.ta.pddserver.service.impl.*;
@@ -142,12 +141,18 @@ public class PddLocalController {
     public Map<String, Object> collectMailDetailScan(HttpServletRequest request, @RequestBody CollectMailDetailRequest collectMailDetailRequest) {
 
         Map<String, Object> map = new HashMap<>();
+        CollectMailDetailEntity mailDetailEntity = collectMailDetailImpl.getByMailNo(collectMailDetailRequest.getMailNo());
+        if (mailDetailEntity == null) {
+            return JsonResponse.generateLocalCommonFailedResponse("-1", "未找到需要拣货的包裹信息");
+        }
+
 
-        List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(collectMailDetailRequest.getMailNo());
+        List<CollectMailDetailEntity> list = collectMailDetailImpl.getListByOrderCode(mailDetailEntity.getOrderCode());
 
-        CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(list.get(0).getLogisticsOrderCode());
+        CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(mailDetailEntity.getOrderCode());
 
         map.put("collectOrder", collectOrderResponse);
+        map.put("collectOutMailDetail", mailDetailEntity);
         map.put("list", list);
 
         return JsonResponse.generateLocalCommonSuccessResponse(map);
@@ -363,7 +368,7 @@ public class PddLocalController {
 
         notifyRequest.setProviderCode(PddAPIConfig.PROVIDER_CODE);
         notifyRequest.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
-        notifyRequest.setExecuteTime(timeTool.getNowDate());
+        notifyRequest.setExecuteTime(timeTool.getNowString());
         notifyRequest.setTimeZone("UTC+8");
 
         if (num >= logOrderEntity.getPackageQuantity().intValue()) {
@@ -436,7 +441,7 @@ public class PddLocalController {
         notifyRequest.setProviderCode(PddAPIConfig.PROVIDER_CODE);
         notifyRequest.setOrderCode(finishUnpackRequest.getOrderCode());
         notifyRequest.setBizAction(finishUnpackRequest.getAction());
-        notifyRequest.setExecuteTime(timeTool.getNowDate());
+        notifyRequest.setExecuteTime(timeTool.getNowString());
         notifyRequest.setTimeZone("UTC+8");
 
         LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
@@ -549,7 +554,7 @@ public class PddLocalController {
         if (("begin_pick").equals(finishUnpackRequest.getAction()) || ("finish_pick").equals(finishUnpackRequest.getAction())) {
 
             //更新collect_mail_detail
-            List<CollectMailDetailEntity> collectMailDetailEntityList = collectMailDetailImpl.findListByOrderCode(finishUnpackRequest.getOrderCode());
+            List<CollectMailDetailEntity> collectMailDetailEntityList = collectMailDetailImpl.getListByOrderCode(finishUnpackRequest.getOrderCode());
             for (CollectMailDetailEntity lists : collectMailDetailEntityList) {
                 lists.setStatus(logOrderMailDetailIoEntity.getStatus());
                 collectMailDetailImpl.updateById(lists);
@@ -687,7 +692,7 @@ public class PddLocalController {
         if (action.equals("begin_pick") || action.equals("finish_pick")) {
 
             //更新collect_mail_detail
-            List<CollectMailDetailEntity> collectMailDetailEntityList = collectMailDetailImpl.findListByOrderCode(finishUnpackRequest.getOrderCode());
+            List<CollectMailDetailEntity> collectMailDetailEntityList = collectMailDetailImpl.getListByOrderCode(finishUnpackRequest.getOrderCode());
             for (CollectMailDetailEntity lists : collectMailDetailEntityList) {
                 lists.setStatus(logOrderMailDetailIoEntity.getStatus());
                 collectMailDetailImpl.updateById(lists);
@@ -781,30 +786,39 @@ public class PddLocalController {
 
         List<OutBoundRequest.OutBoundList> outBoundList = outBoundRequest.getOutBound();
 
+        // TODO 此处异常，需要处理
         //获取所有可出库订单
         List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(outBoundRequest.getOrderCode());
 
-        // 存储需要删除的元素
-        List<CollectOutMailDetailResponse> toRemoveList = new ArrayList<>();
-        List<OutBoundRequest.OutBoundList> toRemoveOutBound = new ArrayList<>();
+        if (list != null && !list.isEmpty()) {
+            // 拆单操作
+            // 存储需要删除的元素
+            List<CollectOutMailDetailResponse> toRemoveList = new ArrayList<>();
+            List<OutBoundRequest.OutBoundList> toRemoveOutBound = new ArrayList<>();
 
 
-        for (CollectOutMailDetailResponse lists : list) {
-            for (OutBoundRequest.OutBoundList outBoundLists : outBoundList) {
-                if (lists.getMailNo().equals(outBoundLists.getMailNo())) {
-                    toRemoveList.add(lists);
-                    toRemoveOutBound.add(outBoundLists);
+            for (CollectOutMailDetailResponse lists : list) {
+                for (OutBoundRequest.OutBoundList outBoundLists : outBoundList) {
+                    if (lists.getMailNo().equals(outBoundLists.getMailNo())) {
+                        toRemoveList.add(lists);
+                        toRemoveOutBound.add(outBoundLists);
+                    }
                 }
             }
-        }
 
-        list.removeAll(toRemoveList);
-        outBoundList.removeAll(toRemoveOutBound);
+            list.removeAll(toRemoveList);
+            outBoundList.removeAll(toRemoveOutBound);
+
+            if (list.size() > 0 || outBoundList.size() > 0) {
+                //出库信息与已存信息不匹配，无法出库
+                return JsonResponse.generateLocalCommonFailedResponse("-1", "出库单数异常");
+            }
+        } else {
+            // 非拆单出库
 
-        if (list.size() > 0 || outBoundList.size() > 0) {
-            //出库信息与已存信息不匹配，无法出库
-            return JsonResponse.generateLocalCommonFailedResponse("-1", "出库单数异常");
         }
+
+
         CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(outBoundRequest.getOrderCode());
 
 

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

@@ -34,4 +34,7 @@ public interface CollectMailDetailMapper extends BaseMapper<CollectMailDetailEnt
 
     @Select("SELECT * FROM `collect_mail_detail` WHERE `orderCode` = #{orderCode}")
     List<CollectMailDetailEntity> findListByOrderCode(@Param("orderCode") String orderCode);
+
+    @Select("SELECT * FROM `collect_mail_detail` WHERE `mailNo` = #{mailNo};")
+    CollectMailDetailEntity findByMailNo(String mailNo);
 }

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

@@ -7,7 +7,6 @@ import org.ta.pddserver.entity.CollectMailDetailEntity;
 import org.ta.pddserver.mapper.CollectMailDetailMapper;
 import org.ta.pddserver.model.api.request.CollectMailDetailListRequest;
 import org.ta.pddserver.model.api.response.CollectMailDetailListResponse;
-import org.ta.pddserver.model.api.response.LogOrderListResponse;
 import org.ta.pddserver.service.CollectMailDetailService;
 
 import java.util.HashMap;
@@ -42,7 +41,11 @@ public class CollectMailDetailImpl extends ServiceImpl<CollectMailDetailMapper,
         return map;
     }
 
-    public List<CollectMailDetailEntity> findListByOrderCode(String orderCode) {
+    public List<CollectMailDetailEntity> getListByOrderCode(String orderCode) {
         return baseMapper.findListByOrderCode(orderCode);
     }
+
+    public CollectMailDetailEntity getByMailNo(String mailNo) {
+        return this.baseMapper.findByMailNo(mailNo);
+    }
 }
\ No newline at end of file