From 84826bfd7776ee4a8b1adde388d01728d01788c3 Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Wed, 22 Apr 2026 11:09:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86pdm?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/pojo/dto/StPdmPartDTO.java | 24 +++++++-------- .../springblade/wms/mapper/StGoodsMapper.java | 2 +- .../springblade/wms/mapper/StGoodsMapper.xml | 2 +- .../wms/service/impl/StGoodsServiceImpl.java | 30 +++++++++---------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java index 190b556c..8e17c1ae 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java @@ -26,24 +26,24 @@ public class StPdmPartDTO implements Serializable { private String prtno; private String prtdesc; private String source; - private String releaseNo; - private String prtType; - private String materialModel; - private Double weight; + private String releaseno; + private String prttype; + private String mtltmrk; + private Double prtwt; private String remark; private String prtum; - private String productCategory; + private String cplb; private String mtlspcf; - private String productTechSpec; - private Double density; - private String partRevisionStatus; + private String prtstd; + private Double mtlsgrt; + private String prtrevedit; private String drwpartno; - private String ecnNo; - private Short endItem; + private String ecnno; + private Short enditem; private String priority; private String partLink; - private String cavityNo; - private String tradeMark; + private String cavityno; + private String trademark; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date rcdchgdatd; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java index bf5e2c61..f232afda 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java @@ -40,7 +40,7 @@ public interface StGoodsMapper extends BaseMapper { */ List exportStGoods(@Param("ew") Wrapper queryWrapper); - StGoods queryByCodeAndVersion(@Param("patno") String prtno, @Param("releaseNo") String releaseNo); + StGoods queryByCodeAndVersion(@Param("prtno") String prtno, @Param("releaseNo") String releaseNo); List selectFindAllGoodsPage(IPage page, StGoodsVO stGoods); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml index 1231c21b..bf9c68b5 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml @@ -97,7 +97,7 @@ FROM ( SELECT * FROM st_goods - WHERE goods_code = #{code} + WHERE goods_code = #{prtno} AND release_no = #{releaseNo} AND is_deleted = 0 AND used = 1 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 05dc392b..b05e2054 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 @@ -72,31 +72,31 @@ public class StGoodsServiceImpl extends BaseServiceImpl if (pdmPartInfo != null) { for (StPdmPartDTO dto : pdmPartInfo) { //保存物料信息 - goods = this.queryByCodeAndVersion(dto.getPrtno(), dto.getReleaseNo()); + goods = this.queryByCodeAndVersion(dto.getPrtno(), dto.getReleaseno()); if (goods == null) { goods = new StGoods(); - // goods.setDept(); +// goods.setDeptId(dto.getPartid()); goods.setDrawingNo(dto.getDrwpartno()); goods.setGoodsCode(dto.getPrtno()); goods.setGoodsName(dto.getPrtdesc()); - goods.setDensity(dto.getDensity()); - goods.setPrtType(dto.getPrtType()); + goods.setDensity(dto.getMtlsgrt()); + goods.setPrtType(dto.getPrttype()); goods.setSourceByStr(dto.getSource()); goods.setSpecifications(dto.getMtlspcf()); - goods.setUnitName(dto.getPrtum()); - goods.setCavityNo(dto.getCavityNo()); - goods.setProductCategory(dto.getProductCategory()); - goods.setEcnNo(dto.getEcnNo()); - goods.setEndItem(dto.getEndItem()); - goods.setMaterialModel(dto.getMaterialModel()); + goods.setPdmUnit(dto.getPrtum()); + goods.setCavityNo(dto.getCavityno()); + goods.setProductCategory(dto.getCplb()); + goods.setEcnNo(dto.getEcnno()); + goods.setEndItem(dto.getEnditem()); + goods.setMaterialModel(dto.getMtltmrk()); goods.setPartLink(dto.getPartLink()); goods.setPriority(dto.getPriority()); - goods.setPartRevisionStatus(dto.getPartRevisionStatus()); - goods.setProductTechSpec(dto.getProductTechSpec()); - goods.setWeight(dto.getWeight()); - goods.setReleaseNo(dto.getReleaseNo()); + goods.setPartRevisionStatus(dto.getPrtrevedit()); + goods.setProductTechSpec(dto.getPrtstd()); + goods.setWeight(dto.getPrtwt()); + goods.setReleaseNo(dto.getReleaseno()); goods.setRemark(dto.getRemark()); - goods.setTradeMark(dto.getTradeMark()); + goods.setTradeMark(dto.getTrademark()); goods.setUsed(Boolean.TRUE); goods.setIsDeleted(0); goods.setCreateTime(new Date()); From 49ff9851be01dcbe487c51962062d0ce9e30b311 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Wed, 22 Apr 2026 13:24:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduling/service/impl/WorkOrderServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index 2304cdd9..6794e63e 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -832,8 +832,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl Date: Wed, 22 Apr 2026 13:30:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduling/service/impl/WorkOrderServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index 6794e63e..c2b69bb5 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -854,10 +854,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl