From ed9a13f65b401ec1140f4669cdb4c1133f662716 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Fri, 6 Dec 2024 15:52:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=80=89=E5=85=A5=E8=8D=AF=E5=93=81b?= =?UTF-8?q?ug=202=E3=80=81=E5=8C=BB=E4=BF=9D=E4=B8=8A=E4=BC=A0=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/collect/CollectOrderBizResponse.java | 3 + .../CollectOrderUploadCountResponse.java | 16 ++- .../api/service/basic/UdiContrastService.java | 28 +++--- .../IoCollectOrderBizBackupService.java | 99 +++++++++++++------ .../collect/IoCollectOrderBizBackupMapper.xml | 15 ++- 5 files changed, 112 insertions(+), 49 deletions(-) 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 58a56a426..99840709d 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; + 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 3392b8bce..2ba17c345 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java @@ -18,5 +18,19 @@ public class CollectOrderUploadCountResponse { private BigDecimal buyerCentage; private BigDecimal salesCentage; private Integer codeCount; - + private Integer buyerScanCount; + private Integer salesScanCount; + private Integer count; + /** + * 拆零赋码数量 + */ + private Integer fifoSplitOneCount; + /** + * 整取赋码数量 + */ + private Integer fifoSplitTwoCount; + /** + * 手动赋码数量 + */ + private Integer fifoSplitThreeCount; } diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index df8582fab..33f3a00c4 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -418,18 +418,7 @@ public class UdiContrastService { for (int i = 0; i < thirdAliDrugList.size(); i++) { ThirdAliDrug thirdAliDrug = thirdAliDrugList.get(i); - List integers = new ArrayList<>(); - if (StrUtil.isNotEmpty(thirdAliDrug.getPackRatio())) { - integers = DimaUtil.calculateLevels(thirdAliDrug.getPackRatio()); - } - udiProductEntity.setPackLevel(thirdAliDrug.getPackLevel()); - try { - udiProductEntity.setBhxjsl(integers.get(IntUtil.value(thirdAliDrug.getPackLevel()) - 1)); - } catch (IndexOutOfBoundsException e) { - e.printStackTrace(); - Log.error("计算包装级别出错" + thirdAliDrug.getPackLevel() + "---" + integers + "-----" + thirdAliDrug.toString()); - udiProductEntity.setBhxjsl(0); - } + udiProductEntity.setNameCode(thirdAliDrug.getNameCode()); @@ -448,13 +437,26 @@ public class UdiContrastService { //设置最小产品数量 // udiProductEntity.setBhxjsl(ybDrug.getFactor()); //设置包装级别 - udiProductEntity.setPackLevel(1 + ""); +// udiProductEntity.setPackLevel(1 + ""); //生产厂家 udiProductEntity.setManufactory(thirdAliDrug.getManufacturer()); //商品条码 essentialDrugMarkName sptm // udiProductEntity.setSptm(ybDrug.getBusinessLicense()); udiProductEntity.setPrepnUnit(thirdAliDrug.getPrepnUnitName()); + List integers = new ArrayList<>(); + if (StrUtil.isNotEmpty(thirdAliDrug.getPackRatio())) { + integers = DimaUtil.calculateLevels(thirdAliDrug.getPackRatio()); + } + udiProductEntity.setPackLevel(thirdAliDrug.getPackLevel()); + try { + udiProductEntity.setBhxjsl(integers.get(IntUtil.value(thirdAliDrug.getPackLevel()) - 1)); + } catch (IndexOutOfBoundsException e) { + e.printStackTrace(); + Log.error("计算包装级别出错" + thirdAliDrug.getPackLevel() + "---" + integers + "-----" + thirdAliDrug.toString()); + udiProductEntity.setBhxjsl(0); + } + if (IntUtil.value(thirdAliDrug.getPackLevel()) == 1) { udiProductEntity.setXjdw(ybDrug.getMinUnit()); if (DimaUtil.trMinCount(thirdAliDrug.getBzgg()) != null) { 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 120ff80bb..5844ab1e3 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java @@ -1,10 +1,16 @@ 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.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.IoCollectOrderBizBackup; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.collect.CollectOrderBizRequest; @@ -27,6 +33,8 @@ public class IoCollectOrderBizBackupService extends ServiceImpl filterList(CollectOrderBizRequest collectOrderRequest) { if (collectOrderRequest == null) { @@ -48,13 +56,20 @@ public class IoCollectOrderBizBackupService extends ServiceImpl buyTypeMap = new HashMap<>(); List buyTypeBuyer = new ArrayList<>(); List buyTypeSales = new ArrayList<>(); - Integer buyerCount = 0; - Integer salesCount = 0; +// Integer buyerCount = 0; +// Integer salesCount = 0; Integer buyerScanCount = 0; Integer salesScanCount = 0; BigDecimal buyerCentage = new BigDecimal(0); BigDecimal salesCentage = new BigDecimal(0); Integer codeCount = 0; + + Integer fifoSplitOneCount = 0; + Integer fifoSplitTwoCount = 0; + Integer fifoSplitThreeCount = 0; + + + if (list != null && list.size() > 0) { BaseResponse> baseResponse = erpBasicClient.getBuyType("thirdId"); if (baseResponse.getCode() == 20000) { @@ -67,47 +82,71 @@ public class IoCollectOrderBizBackupService extends ServiceImpl