From 02e02977fa7ec181ccf9c602023d8f3f31e35dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 9 Oct 2025 16:01:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-788=20=20=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BarcodePrintingController.java | 31 +++++++++++-------- .../common/pojo/qo/BarcodePrintingIdsQO.java | 10 ++++++ 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java index 6b8930fb..eaa94c42 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.wms.admin.util.PdfGeneratorUtil; import com.nflg.wms.admin.util.QRCodeUtil; import com.nflg.wms.admin.util.ThymeleafUtil; @@ -13,18 +12,14 @@ import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.BarcodePrintingAddDTO; import com.nflg.wms.common.pojo.dto.DeliverNormalOrderItemDTO; -import com.nflg.wms.common.pojo.dto.GongZhuangTaiZhangExcelCheckDTO; import com.nflg.wms.common.pojo.qo.BarcodePrintingEditQO; import com.nflg.wms.common.pojo.qo.BarcodePrintingIdsQO; import com.nflg.wms.common.pojo.qo.BarcodePrintingQO; -import com.nflg.wms.common.pojo.qo.SRMOrderSearchQO; import com.nflg.wms.common.pojo.vo.BarcodePrintingVO; -import com.nflg.wms.common.pojo.vo.SrmOrderVO; import com.nflg.wms.common.util.DateTimeUtil; import com.nflg.wms.common.util.EecExcelUtil; +import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.WmsInProduceOrder; -import com.nflg.wms.repository.entity.WmsInProduceOrderItem; import com.nflg.wms.repository.entity.WmsInventoryBarcodePrinting; import com.nflg.wms.repository.service.IWmsInventoryBarcodePrintingService; import com.nflg.wms.starter.BaseController; @@ -50,6 +45,7 @@ import java.math.RoundingMode; import java.net.URL; import java.text.DecimalFormat; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.*; /** @@ -114,7 +110,17 @@ public class BarcodePrintingController extends BaseController { if (CollectionUtil.isEmpty(request)) { VUtil.trueThrowBusinessError(true).throwMessage("没有需要保存的数据"); } - List items = Convert.toList(WmsInventoryBarcodePrinting.class, request); + List items = request.stream().map(item -> { + WmsInventoryBarcodePrinting data = Convert.convert(WmsInventoryBarcodePrinting.class, item); + if (Objects.isNull(data.getId())) { + data.setCreateBy(UserUtil.getUserName()); + data.setCreateTime(LocalDateTime.now()); + } else { + data.setUpdateBy(UserUtil.getUserName()); + data.setUpdateTime(LocalDateTime.now()); + } + return data; + }).toList(); printingService.saveOrUpdateBatch(items); return ApiResult.success(); } @@ -148,7 +154,7 @@ public class BarcodePrintingController extends BaseController { if (item.getPackingNum() == null || item.getPackingNum().compareTo(BigDecimal.ZERO) <= 0) { errorBuild.append("最小包装量必填"); } - if (errorBuild.length() > 0) { + if (!errorBuild.isEmpty()) { item.setError(errorBuild.toString()); } else { codes.add(Convert.convert(WmsInventoryBarcodePrinting.class, item)); @@ -183,11 +189,10 @@ public class BarcodePrintingController extends BaseController { /** * 导出物料条码pdf（整张或者一张一个） - * @param request 打印IDs - * @param type 1：逐个，2：一页 + * @param request 请求参数 */ @PostMapping("exportMaterialsPdf") - public void exportMaterials(HttpServletResponse response, @Valid @RequestParam @NotNull BarcodePrintingIdsQO request, @Valid @RequestParam @NotNull Integer type) throws Exception { + public void exportMaterials(HttpServletResponse response, @Valid @RequestBody @NotNull BarcodePrintingIdsQO request) throws Exception { List codelist = printingService.listByIds(request.getIds()); VUtil.trueThrowBusinessError(Objects.isNull(codelist)).throwMessage("订单不存在"); List datas = new ArrayList<>(); @@ -209,7 +214,7 @@ public class BarcodePrintingController extends BaseController { //i += 1; } } else { - Integer codeNum = item.getQty().divide(item.getPackingNum(), 0, RoundingMode.UP).intValue(); + int codeNum = item.getQty().divide(item.getPackingNum(), 0, RoundingMode.UP).intValue(); for (int j = 0; j < codeNum; j++) { dto.setPrintNo(IdUtil.getSnowflakeNextIdStr()); dto.setPrintNum(item.getPackingNum().toString()); @@ -222,7 +227,7 @@ public class BarcodePrintingController extends BaseController { } Map variables = new HashMap<>(); variables.put("list", datas); - if (Objects.equals(type, 1)) { + if (Objects.equals(request.getType(), 1)) { String html = ThymeleafUtil.generator("/template/qrcode/", "Inv-1", ".html", variables); URL baseUrl = new ClassPathResource("template/qrcode/").getURL(); PdfGeneratorUtil.generatePdf("库存物料条码(逐个)", html, baseUrl.toString(), response); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingIdsQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingIdsQO.java index c6293b8f..fd49d2b7 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingIdsQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingIdsQO.java @@ -1,5 +1,7 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.experimental.Accessors; @@ -8,5 +10,13 @@ import java.util.List; @Data @Accessors(chain = true) public class BarcodePrintingIdsQO { + + @NotEmpty private List ids; + + /** + * 1：逐个，2：一页 + */ + @NotNull + private Integer type; }