From 907e7e240cf78c46df181c2fd2befa84800323f7 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 21 Jan 2025 15:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E4=BF=9D=E4=B8=8A=E4=BC=A0=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoCollectOrderBackupController.java | 6 +----- .../res/collect/CollectOrderBizResponse.java | 3 +++ .../CollectOrderUploadCountResponse.java | 8 ++++---- .../IoCollectOrderBizBackupService.java | 19 +++++++------------ 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index cdee79aad..4033a20e8 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -6,7 +6,6 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; 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; @@ -21,8 +20,6 @@ import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.service.basic.BasicCollectUserService; import com.glxp.api.service.collect.IoCollectOrderBackupService; import com.glxp.api.service.collect.IoCollectOrderBizBackupService; -import com.glxp.api.service.collect.IoCollectOrderService; -import io.swagger.models.auth.In; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -31,7 +28,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.stream.Collectors; /** @@ -182,7 +178,7 @@ public class IoCollectOrderBackupController extends BaseController { collectOrderUploadCountResponse.setAlreadyUploadingCount(alreadyUploadingCount); collectOrderUploadCountResponse.setUploadingFailCount(uploadingFailCount); // 总上传码数量 获取采购上传率 销售上传率 计算 - ioCollectOrderBizBackupService.CalculatedUploadRate(collectOrderUploadCountRequest, collectOrderUploadCountResponse); + ioCollectOrderBizBackupService.calculatedUploadRate(collectOrderUploadCountRequest, collectOrderUploadCountResponse); return ResultVOUtils.success(collectOrderUploadCountResponse); } diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index c148830c4..7934aa53b 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -166,6 +166,9 @@ public class CollectOrderBizResponse { private String busType; private Integer uploadStatus; + /** + * 赋码方式 1:自动拆零赋码；2:自动整取赋码;3.手动整取赋码，4.手动拆零赋码 + */ private Integer fifoSplit; private Integer billNo; diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java index 2ba17c345..e6fb77b21 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java @@ -29,8 +29,8 @@ public class CollectOrderUploadCountResponse { * 整取赋码数量 */ private Integer fifoSplitTwoCount; - /** - * 手动赋码数量 - */ - private Integer fifoSplitThreeCount; +// /** +// * 手动赋码数量 +// */ +// private Integer fifoSplitThreeCount; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java index 71276fc73..c32e2d5fb 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java @@ -1,25 +1,18 @@ package com.glxp.api.service.collect; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.dao.collect.IoCollectCodeBackMapper; -import com.glxp.api.dao.collect.IoCollectCodeMapper; import com.glxp.api.dao.collect.IoCollectOrderBizBackupMapper; -import com.glxp.api.entity.collect.IoCollectCode; -import com.glxp.api.entity.collect.IoCollectCodeBackup; -import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderBizBackup; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderUploadCountRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.CollectOrderUploadCountResponse; -import io.swagger.models.auth.In; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -53,7 +46,7 @@ public class IoCollectOrderBizBackupService extends ServiceImpl list = ioCollectOrderBizBackupMapper.getList(collectOrderUploadCountRequest); Map buyTypeMap = new HashMap<>(); List buyTypeBuyer = new ArrayList<>(); @@ -68,7 +61,6 @@ public class IoCollectOrderBizBackupService extends ServiceImpl