From 119e8678907b01be5477a2177df9085428e39800 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 11:57:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-776=20=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=93=8D=E4=BD=9C=E6=89=AB=E7=A0=81=E5=90=8E?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OutAssistanceController.java | 1 + .../controller/OutCostCenterController.java | 1 + .../controller/OutProduceController.java | 79 +------------------ .../controller/TransferCompanyController.java | 1 + .../controller/TransferFactoryController.java | 1 + .../common/pojo/qo/OutProduceSubmitQO.java | 2 + 6 files changed, 7 insertions(+), 78 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index 3de88d9e..dfdaacf0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -171,6 +171,7 @@ public class OutAssistanceController extends BaseController { .setItems(datas.stream() .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0) .map(item -> new OutProduceItemVO() + .setId(item.getId()) .setLgort2(order.getLgort1()) .setLgpbe(item.getLgpbe()) .setMaktx2(item.getMaktx1()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index 4c8b6170..8e51ceba 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -166,6 +166,7 @@ public class OutCostCenterController extends BaseController { .setItems(datas.stream() .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0) .map(item -> new OutProduceItemVO() + .setId(item.getId()) .setLgort2(item.getLgort()) .setLgpbe(item.getLgpbe()) .setMaktx2(item.getMaktx()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index 402dcd7b..db618a06 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -91,45 +91,6 @@ public class OutProduceController extends BaseController { List vos = sapService.zwm3a07(request); handleVos(vos); return ApiResult.success(vos); -// List inventories = inventoryService.list(); -// List vos = new ArrayList<>(); -// for (int i = 0, count = inventories.size(); i < count; i++) { -// WmsInventory inventory = inventories.get(i); -// vos.add(new Zwm3a07VO() -// .setInsme(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setDwerk(inventory.getFactoryNo()) -// .setMatnr(inventory.getMaterialNo()) -// .setAufnr(RandomUtil.randomNumbers(10)) -// .setMaktx(RandomUtil.randomString(20)) -// .setLgort2(inventory.getWarehouseNo()) -// .setLgpbe(RandomUtil.randomString(10)) -// .setMeins(RandomUtil.randomString(2)) -// .setName(RandomUtil.randomString(10)) -// .setQlsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setSqsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, inventory.getNum().divide(new BigDecimal("5"), RoundingMode.HALF_UP))) -// .setSqsl2(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setSqsl3(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setBdmng(RandomUtil.randomBigDecimal(new BigDecimal("50"), new BigDecimal("100"))) -// .setLabst(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setKcqls(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setKtext(RandomUtil.randomString(20)) -// .setRsnum(RandomUtil.randomNumbers(10)) -// .setRsnum2(RandomUtil.randomNumbers(10)) -// .setPlnbez(RandomUtil.randomString(20)) -// .setEkgrp(RandomUtil.randomString(10)) -// .setDispo(RandomUtil.randomString(10)) -// .setCusn(RandomUtil.randomNumbers(10)) -// .setBdter(DateUtil.format(DateUtil.date(), "yyyy-MM-dd")) -// .setVornr(RandomUtil.randomNumbers(10)) -// .setSernr(RandomUtil.randomNumbers(10)) -// .setJtsn(RandomUtil.randomNumbers(10)) -// .setRspos(RandomUtil.randomNumbers(10)) -// .setEnmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("50"))) -// .setMaktx2(RandomUtil.randomString(20)) -// .setLeftNum(inventory.getNum()) -// ); -// } -// return ApiResult.success(vos); } private void handleVos(List vos) { @@ -152,45 +113,6 @@ public class OutProduceController extends BaseController { List vos = sapService.zwm3a08(request); handleVos(vos); return ApiResult.success(vos); -// List inventories = inventoryService.list(); -// List vos = new ArrayList<>(); -// for (int i = 0, count = inventories.size(); i < count; i++) { -// WmsInventory inventory = inventories.get(i); -// vos.add(new Zwm3a07VO() -// .setInsme(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setMatnr(inventory.getMaterialNo()) -// .setAufnr(RandomUtil.randomNumbers(10)) -// .setMaktx(RandomUtil.randomString(20)) -// .setLgort2(inventory.getWarehouseNo()) -// .setLgpbe(RandomUtil.randomString(6)) -// .setMeins(RandomUtil.randomString(2)) -// .setName(RandomUtil.randomString(10)) -// .setQlsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setSqsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, inventory.getNum().divide(new BigDecimal("5"), RoundingMode.HALF_UP))) -// .setSqsl2(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setSqsl3(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setBdmng(RandomUtil.randomBigDecimal(new BigDecimal("50"), new BigDecimal("100"))) -// .setLabst(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setKcqls(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) -// .setKtext(RandomUtil.randomString(20)) -// .setDwerk(inventory.getFactoryNo()) -// .setRsnum(RandomUtil.randomNumbers(10)) -// .setRsnum2(RandomUtil.randomNumbers(10)) -// .setPlnbez(RandomUtil.randomString(20)) -// .setEkgrp(RandomUtil.randomString(10)) -// .setDispo(RandomUtil.randomString(10)) -// .setCusn(RandomUtil.randomNumbers(10)) -// .setBdter(DateUtil.format(DateUtil.date(), "yyyy-MM-dd")) -// .setVornr(RandomUtil.randomNumbers(10)) -// .setSernr(RandomUtil.randomNumbers(10)) -// .setJtsn(RandomUtil.randomNumbers(10)) -// .setRspos(RandomUtil.randomNumbers(10)) -// .setEnmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("50"))) -// .setMaktx2(RandomUtil.randomString(20)) -// .setLeftNum(inventory.getNum()) -// ); -// } -// return ApiResult.success(vos); } /** @@ -353,6 +275,7 @@ public class OutProduceController extends BaseController { .setItems(datas.stream() .filter(item -> item.getSqsl().subtract(item.getNum()).compareTo(BigDecimal.ZERO) > 0) .map(item -> new OutProduceItemVO() + .setId(item.getId()) .setLgort2(order.getLgort2()) .setLgpbe(item.getLgpbe()) .setMaktx2(item.getMaktx2()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index fb1a2620..6135bc17 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -187,6 +187,7 @@ public class TransferCompanyController extends BaseController { .setLgort1(order.getLgort()) .setItems(datas.stream() .map(item -> new TransferCompanyPdaItemVO() + .setId(item.getId()) .setEbelp(item.getEbelp()) .setEbeln(order.getEbeln()) .setMatnr(item.getMatnr()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index a1a192a1..927a3fb1 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -194,6 +194,7 @@ public class TransferFactoryController extends BaseController { .setLgort(order.getLgort()) .setItems(datas.stream() .map(item -> new TransferFactoryPdaItemVO() + .setId(item.getId()) .setMatnr(item.getMatnr()) .setMaktx(item.getMaktx()) .setLgort1(order.getUmlgo()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSubmitQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSubmitQO.java index dc1ab135..14104d28 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSubmitQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSubmitQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import lombok.Data; @@ -21,6 +22,7 @@ public class OutProduceSubmitQO { /** * 二维码列表 */ + @Valid @NotEmpty private List qrCodes; }