Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z

src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java

@@ -7,6 +7,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoCollectOrderBackup;
+import com.glxp.api.entity.collect.IoCollectOrderCodeMan;
 import com.glxp.api.req.basic.BasicCollectUserRequest;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
@@ -103,4 +104,19 @@ public class IoCollectOrderBackupController extends BaseController {
         return ResultVOUtils.success();
     }
 
+
+    /**
+     * 通过业务外键获取码明细
+     * @param collectOrderBizRequest
+     * @return
+     */
+    @GetMapping("/udiwms/basic/collect/orderFinish/codeDetail")
+    public BaseResponse codeDetail(CollectOrderBizRequest collectOrderBizRequest) {
+        if (collectOrderBizRequest.getId() == null) {
+            return ResultVOUtils.error(500, "业务外键不能为空");
+        }
+        List<IoCollectOrderCodeMan> list = ioCollectOrderBackupService.codeDetail(collectOrderBizRequest.getId());
+        return ResultVOUtils.success(list);
+    }
+
 }

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -191,7 +191,7 @@ public class IoCodeTempController extends BaseController {
                     return response;
                 } else {
                     BaseResponse baseResponse2 = collectOrderService.importSpmsUdi(collectOrderRequest);
-                    if (ResultEnum.SUCCESS.getCode() == baseResponse2.getCode()) {
+                    if (baseResponse2.getCode() == 20000) {
                         collectOrder = collectOrderService.unionSearch(null, null, code);
                         //=============================================//
                         if (collectOrder != null) {
@@ -211,7 +211,7 @@ public class IoCodeTempController extends BaseController {
                 return response;
             }
 
-        }else  {
+        } else {
             BaseResponse response = ResultVOUtils.error(601, code);
             response.setData(collectOrder);
             return response;

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -812,10 +812,10 @@ public class IoOrderController extends BaseController {
             codeTempService.deleteByBillNo(billNo);
             codeService.deleteCodeByOrderId(billNo);
         }
-        ThreadUtil.execAsync(() -> {
+//        ThreadUtil.execAsync(() -> {
-            BaseResponse response = spGetHttpClient.postDelOrder(deleteRequest);
+//            BaseResponse response = spGetHttpClient.postDelOrder(deleteRequest);
-            log.info("删除单据：" + "结果：" + response.getMessage());
+//            log.info("删除单据：" + "结果：" + response.getMessage());
-        });
+//        });
         return ResultVOUtils.success("删除成功！");
     }
 

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.collect;
 
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -281,4 +282,26 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
         }
         return true;
     }
+
+    public List<IoCollectOrderCodeMan> codeDetail(Integer bizIdFk) {
+        List<IoCollectOrderCodeMan> reList = new ArrayList<>();
+
+        List<IoCollectOrderCodeAuto> splitCodes = collectOrderCodeAutoService.list(new LambdaQueryWrapper<IoCollectOrderCodeAuto>().eq(IoCollectOrderCodeAuto::getBizIdFk,bizIdFk));
+        List<IoCollectOrderCodeMan> manList = collectOrderCodeManService.list(new LambdaQueryWrapper<IoCollectOrderCodeMan>().eq(IoCollectOrderCodeMan::getBizIdFk,bizIdFk));
+
+        if (CollUtil.isNotEmpty(splitCodes)){
+            splitCodes.forEach( item -> {
+                IoCollectOrderCodeMan ioCollectOrderCodeMan = new IoCollectOrderCodeMan();
+                BeanUtils.copyProperties(item,ioCollectOrderCodeMan);
+                reList.add(ioCollectOrderCodeMan);
+            });
+        }
+
+        if (CollUtil.isNotEmpty(manList)){
+            manList.forEach( item -> {
+                reList.add(item);
+            });
+        }
+        return reList;
+    }
 }