From 3ae8fa4316fe0ac6236c1f2e22462647a4fbd14c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 13 Mar 2024 16:44:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E8=87=AA=E5=B7=B1=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=9A=84=E5=BE=85=E5=A4=8D=E6=A0=B8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=88=E6=9E=81=E7=AB=AF=E6=83=85=E5=86=B5=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E4=BA=BA=E5=91=98=E8=BA=AB=E4=BB=BD=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=86=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=80=8C=E5=90=8E?= =?UTF-8?q?=E5=8F=88=E8=A2=AB=E8=B5=8B=E4=BA=88=E4=BA=86=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=BA=AB=E4=BB=BD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/master/BomNewEbomParentMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 8c3537aa..730b7d42 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -86,7 +86,7 @@ order by created_time desc - select * ,row_id as bomRowId from t_bom_new_ebom_parent where ( (user_root_is= 1 and created_by=#{createdBy} ) or root_is=1) and status=2 + select * ,row_id as bomRowId from t_bom_new_ebom_parent where ((((user_root_is=1 and created_by=#{createdBy}) or root_is=1) and status=2) or (created_by=#{createdBy} and user_root_is=1 and (status=1 or status=3))) order by created_time desc From 820aff2be0af10c2a4361031c36db308c0040ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Wed, 13 Mar 2024 17:28:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81EBOM-=E7=BC=96=E8=BE=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/domain/EBom/EBomEdit.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java index 6101852d..6e8c778c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java @@ -41,7 +41,7 @@ public class EBomEdit { BomNewEbomParentEntity createParentBomInfo(BomNewEbomParentVO vo) { BomNewEbomParentEntity parent = new BomNewEbomParentEntity(); - BeanUtil.copyProperties(parent, vo); + BeanUtil.copyProperties(vo,parent); // BaseMaterialVO material = materialVOMap.get(vo.getMaterialNo()); String batchNo = IdUtil.simpleUUID(); @@ -208,6 +208,9 @@ public class EBomEdit { if (dto.getParent().getBomRowId() == null || dto.getParent().getBomRowId().longValue() == 0) { dto.getParent().setBomRowId(dto.getParent().getRowId()); parent = createParentBomInfo(dto.getParent()); + dto.getDatas().forEach(k->{ + k.setParentRowId(parent.getRowId()); + }); parent.setEditStatus(dto.getOpType()); //工艺人员