From 5daf7cb9c59d443ac1bcd7e084029ff1774921d9 Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Sat, 23 May 2026 14:55:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StWmsRequestController.java | 20 ++++++------ .../wms/service/impl/StGoodsServiceImpl.java | 32 +++++++++++++++++-- .../service/impl/StWmsRequestServiceImpl.java | 26 +++++++-------- 3 files changed, 53 insertions(+), 25 deletions(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java index e66530c1b..a4ec0e099 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java @@ -100,16 +100,16 @@ public class StWmsRequestController extends BladeController { return R.status(stWmsRequestService.save(stWmsRequest)); } - /** - * 仓库提请记录 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiLog("仓库提请记录 修改") - @Operation(summary = "修改", description = "传入stWmsRequest") - public R update(@Valid @RequestBody StWmsRequest stWmsRequest) { - return R.status(stWmsRequestService.updateByErp(stWmsRequest)); - } +// /** +// * 仓库提请记录 修改 +// */ +// @PostMapping("/update") +// @ApiOperationSupport(order = 5) +// @ApiLog("仓库提请记录 修改") +// @Operation(summary = "修改", description = "传入stWmsRequest") +// public R update(@Valid @RequestBody StWmsRequest stWmsRequest) { +// return R.status(stWmsRequestService.updateByErp(stWmsRequest)); +// } /** * 仓库提请提交 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java index b8c61cda6..724d660d8 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java @@ -71,7 +71,35 @@ public class StGoodsServiceImpl extends BaseServiceImpl public StGoods saveGoodsInfo(List prtnoList) throws Exception { StGoods goods = null; //查询物料信息 - List pdmPartInfo = stHttpRequestService.getPdmPartInfo(prtnoList); +// List pdmPartInfo = stHttpRequestService.getPdmPartInfo(prtnoList); + + List pdmPartInfo = new ArrayList<>(); + + StPdmPartDTO dto1 = new StPdmPartDTO(); + dto1.setPrtno("TEST-MAT-001"); + dto1.setReleaseno("V1.0"); + dto1.setDrwpartno("DWG-TEST-001"); + dto1.setPrtdesc("测试物料_环规"); + dto1.setMtlsgrt(7.85); + dto1.setPrttype("PART"); + dto1.setSource("自制"); + dto1.setMtlspcf("45#钢"); + dto1.setPrtum("PCS"); + dto1.setCavityno("1"); + dto1.setCplb("机械部件"); + dto1.setEcnno("ECN-TEST-001"); + dto1.setEnditem((short) 123); + dto1.setMtltmrk("45#钢"); + dto1.setPartLink("/pdm/part/TEST-MAT-001"); + dto1.setPriority("1"); + dto1.setPrtrevedit("Released"); + dto1.setPrtstd("GB/T 1234-2020"); + dto1.setPrtwt(0.5); + dto1.setRemark("测试物料"); + dto1.setTrademark("测试"); + dto1.setRcdchgdatd(new Date()); + + pdmPartInfo.add(dto1); log.debug("pdmPartInfo:{}", pdmPartInfo); if (CollectionUtils.isEmpty(pdmPartInfo)) { @@ -119,7 +147,7 @@ public class StGoodsServiceImpl extends BaseServiceImpl goods.setGcId(goodsClass.getId()); goods.setGcName("量具"); } - this.save(goods); +// this.save(goods); } } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java index b6176ddd7..5ba7f3ab1 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java @@ -225,19 +225,19 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl exportStWmsRequest(Wrapper queryWrapper) {