From 4e86dcc1aff25478af7ef577b5c711a6ec9315e6 Mon Sep 17 00:00:00 2001 From: lihao Date: Fri, 29 Aug 2025 10:26:41 +0800 Subject: [PATCH] =?UTF-8?q?bom=E5=AD=90=E9=A1=B9=E6=9B=BF=E4=BB=A3?= =?UTF-8?q?=E6=96=99=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nccloud/openapi/mmbd/bom/BomResource.java | 194 +++++++++++++++--- 1 file changed, 168 insertions(+), 26 deletions(-) diff --git a/uapbd/src/public/nccloud/openapi/mmbd/bom/BomResource.java b/uapbd/src/public/nccloud/openapi/mmbd/bom/BomResource.java index f6ffdc2..452c234 100644 --- a/uapbd/src/public/nccloud/openapi/mmbd/bom/BomResource.java +++ b/uapbd/src/public/nccloud/openapi/mmbd/bom/BomResource.java @@ -7,28 +7,37 @@ package nccloud.openapi.mmbd.bom; import com.alibaba.fastjson.JSONObject; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; + +import nc.bs.bd.bom.bom0202.bp.BomPubBP; +import nc.bs.bd.bom.bom0202.bp.BomUpdateBP; import nc.bs.framework.common.NCLocator; +import nc.bs.trade.business.HYPubBO; import nc.itf.bd.bom.bom0202.IBomBillMaintainService; import nc.itf.bd.bom.bom0202.IBomBillQueryService; +import nc.jdbc.framework.generator.IdGenerator; import nc.mmbd.utils.factoryparam.MMBDFactoryParameter; +import nc.uif.pub.exception.UifException; +import nc.util.mmf.framework.base.MMArrayUtil; import nc.util.mmf.framework.base.MMValueCheck; +import nc.util.mmf.framework.gc.GCBillTransferTool; import nc.vo.bd.bom.bom0202.entity.AggBomVO; import nc.vo.bd.bom.bom0202.entity.BomItemVO; import nc.vo.bd.bom.bom0202.entity.BomReplVO; +import nc.vo.bd.bom.bom0202.message.MMBDLangConstBom0202; import nc.vo.ml.NCLangRes4VoTransl; import nc.vo.pub.BusinessException; +import nc.vo.pub.VOStatus; +import nc.vo.pub.lang.UFBoolean; import nc.vo.pub.lang.UFDouble; import nccloud.api.mmbd.bom.IAPIBomBusinessService; import nccloud.api.rest.utils.ResultMessageUtil; import nccloud.framework.core.exception.ExceptionUtils; -import nccloud.framework.service.ServiceLocator; +//import nccloud.framework.service.ServiceLocator; import nccloud.ws.rest.resource.AbstractNCCRestResource; import org.json.JSONString; @Path("mmbd/bom") @@ -43,7 +52,7 @@ public class BomResource extends AbstractNCCRestResource { public JSONString insert(JSONObject para) { List> paramList = (List)para.get("data"); if (MMValueCheck.isEmpty(paramList)) { - return ResultMessageUtil.exceptionToJSON("传入数据异常，参数要包含表头信息和表体信息", "1"); + return ResultMessageUtil.exceptionToJSON("쳣ҪͷϢͱϢ", "1"); } else { IAPIBomBusinessService service = (IAPIBomBusinessService)NCLocator.getInstance().lookup(IAPIBomBusinessService.class); JSONString result = service.insert(paramList); @@ -57,7 +66,7 @@ public class BomResource extends AbstractNCCRestResource { @Produces({"application/json"}) public JSONString insert(List> paramList) { if (MMValueCheck.isEmpty(paramList)) { - return ResultMessageUtil.exceptionToJSON("传入数据异常，参数要包含表头信息和表体信息", "1"); + return ResultMessageUtil.exceptionToJSON("쳣ҪͷϢͱϢ", "1"); } else { IAPIBomBusinessService service = (IAPIBomBusinessService)NCLocator.getInstance().lookup(IAPIBomBusinessService.class); JSONString result = service.insert(paramList); @@ -72,7 +81,7 @@ public class BomResource extends AbstractNCCRestResource { public JSONString update(JSONObject para) { List> paramList = (List)para.get("data"); if (MMValueCheck.isEmpty(paramList)) { - return ResultMessageUtil.exceptionToJSON("传入数据异常，参数要包含表头信息和表体信息", "1"); + return ResultMessageUtil.exceptionToJSON("쳣ҪͷϢͱϢ", "1"); } else { IAPIBomBusinessService service = (IAPIBomBusinessService)NCLocator.getInstance().lookup(IAPIBomBusinessService.class); JSONString result = service.update(paramList); @@ -86,7 +95,7 @@ public class BomResource extends AbstractNCCRestResource { @Produces({"application/json"}) public JSONString update(List> paramList) { if (MMValueCheck.isEmpty(paramList)) { - return ResultMessageUtil.exceptionToJSON("传入数据异常，参数要包含表头信息和表体信息", "1"); + return ResultMessageUtil.exceptionToJSON("쳣ҪͷϢͱϢ", "1"); } else { IAPIBomBusinessService service = (IAPIBomBusinessService)NCLocator.getInstance().lookup(IAPIBomBusinessService.class); JSONString result = service.update(paramList); @@ -100,7 +109,7 @@ public class BomResource extends AbstractNCCRestResource { @Produces({"application/json"}) public JSONString query(Map paramMap) { if (MMValueCheck.isEmpty(paramMap)) { - return ResultMessageUtil.exceptionToJSON("传入数据异常，未传入查询条件", "1"); + return ResultMessageUtil.exceptionToJSON("쳣δѯ", "1"); } else { IAPIBomBusinessService service = (IAPIBomBusinessService)NCLocator.getInstance().lookup(IAPIBomBusinessService.class); JSONString result = service.query(paramMap); @@ -114,46 +123,179 @@ public class BomResource extends AbstractNCCRestResource { @Produces({"application/json"}) public JSONString bomReplupdate(List> paramMap) throws BusinessException { if (MMValueCheck.isEmpty(paramMap)) { - return ResultMessageUtil.exceptionToJSON("传入数据异常，未传入更新数据", "1"); + return ResultMessageUtil.exceptionToJSON("쳣δ", "1"); } else { + try{ + + IAPIBomBusinessService service = (IAPIBomBusinessService)NCLocator.getInstance().lookup(IAPIBomBusinessService.class); // List<> IBomBillQueryService qry = (IBomBillQueryService)NCLocator.getInstance().lookup(IBomBillQueryService.class); IBomBillMaintainService bomBillMaintainService = (IBomBillMaintainService)NCLocator.getInstance().lookup(IBomBillMaintainService.class); - List bomReplVOS=new ArrayList<>(); + List bomReplVOS = new ArrayList<>(); for (Map param : paramMap) { - BomReplVO bomReplVO=new BomReplVO(); String cbomid = (String) param.get("cbomid"); + String targetCbomReplaceId = (String) param.get("cbom_replaceid"); // ĿID + String targetCbomBid = (String) param.get("cbombid"); // ĿID + // УҪ + if (MMValueCheck.isEmpty(cbomid) || MMValueCheck.isEmpty(targetCbomBid)) { + ExceptionUtils.wrapBusinessException("cbomidcbombidΪش"); + } + + // ѯBOM AggBomVO[] aggbomvos = qry.queryAggBomByBomID(new String[]{cbomid}); if (MMValueCheck.isEmpty(aggbomvos)) { ExceptionUtils.wrapBusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("bdpub", "0bdpub0057")); } + for (AggBomVO aggBomVO : aggbomvos) { - BomItemVO[] bomItemVOS =aggBomVO.getChildrenVO(); + BomItemVO[] bomItemVOS = aggBomVO.getChildrenVO(); + if (MMValueCheck.isEmpty(bomItemVOS)) { + continue; // + } + for (BomItemVO bomItemVO : bomItemVOS) { - if(bomItemVO.getCbom_bid().equals((String) param.get("cbombid"))){ - BomReplVO[] replVOS=bomItemVO.getRepl(); - for (BomReplVO replVO : replVOS) { - if (replVO.getCbom_replaceid().equals((String) param.get("cbom_replaceid"))){ - replVO.setIreplorder(new UFDouble((Double) param.get("ireplorder")).intValue()); - replVO.setVnote("测试123"); + // ƥĿ + if (targetCbomBid.equals(bomItemVO.getCbom_bid())) { + BomReplVO[] replVOS = bomItemVO.getRepl(); + List replList = MMValueCheck.isEmpty(replVOS) + ? new ArrayList<>() + : new ArrayList<>(Arrays.asList(replVOS)); + + boolean isUpdated = false; + + // cbom_replaceid + if (!MMValueCheck.isEmpty(targetCbomReplaceId)) { + for (BomReplVO replVO : replList) { + if (targetCbomReplaceId.equals(replVO.getCbom_replaceid())) { + // ԣù߷ + setReplVOProperties(replVO, param); + replVO.setStatus(VOStatus.UPDATED); + isUpdated = true; + break; + } } } - bomItemVO.setRepl(replVOS); + + // cbom_replaceid + if (!isUpdated && MMValueCheck.isEmpty(targetCbomReplaceId)) { + BomReplVO newReplVO = new BomReplVO(); + IdGenerator idGenerator = NCLocator.getInstance().lookup(IdGenerator.class); + +// i5ItemVO.setPrimaryKey(idGenerator.generate()); + // Ҫԣɸʵҵ񲹳䣩 + newReplVO.setCbom_replaceid(idGenerator.generate()); // IDķ + newReplVO.setCbom_bid(targetCbomBid); // ǰ + // + setReplVOProperties(newReplVO, param); +// newReplVO.set + newReplVO.setStatus(VOStatus.NEW); + replList.add(newReplVO); + } + + // + bomItemVO.setRepl(replList.toArray(new BomReplVO[0])); } } + + // BOM aggBomVO.setChildrenVO(bomItemVOS); - AggBomVO[] result = bomBillMaintainService.updateBomWithParam(new AggBomVO[]{aggBomVO}, false, false, MMBDFactoryParameter.getMMECN001Value(aggBomVO.getParentVO().getAttributeValue("pk_org").toString()).booleanValue(), true); - bomReplVOS.addAll(List.of(result)); - -// String jsonString=result.toString(); + AggBomVO[] result = this.updateBomWithParam( + new AggBomVO[]{aggBomVO}, + false, + false, + MMBDFactoryParameter.getMMECN001Value( + aggBomVO.getParentVO().getAttributeValue("pk_org").toString() + ).booleanValue(), + true + ); + bomReplVOS.addAll(Arrays.asList(result)); } - } - return ResultMessageUtil.toJSON(bomReplVOS, "BOM更新成功"); + + + return ResultMessageUtil.toJSON(bomReplVOS, "BOM³ɹ"); + }catch (BusinessException e) { + throw new RuntimeException(e); + } } + + } + // ȡΪ߷ + private void setReplVOProperties(BomReplVO replVO, Map param) throws UifException { + HYPubBO hybo = new HYPubBO(); +// if (param.containsKey("pk_group")) { +// replVO.setPk_group((String) param.get("pk_group")); +// } +// if (param.containsKey("pk_org_v")) { +// replVO.setPk_org_v((String) param.get("pk_org_v")); +// } + if (param.containsKey("creplmaterialvid")) { + + String mrlCode= (String) param.get("creplmaterialvid"); + String mrlid=(String) hybo.findColValue("bd_material","pk_material"," code = '" + mrlCode + "' "); + + replVO.setCreplmaterialvid(mrlid); + } + if (param.containsKey("cbomid")) { + replVO.setVprodversion((String) param.get("cbomid")); + } + if (param.containsKey("vreplaceindex")) { + replVO.setVreplaceindex((String) param.get("vreplaceindex")); + } + if (param.containsKey("vrowno")) { + replVO.setVrowno((String) param.get("vrowno")); + } + + // ת + if (param.containsKey("ireplorder")) { + Object ireplorderObj = param.get("ireplorder"); + if (ireplorderObj instanceof Double) { + replVO.setIreplorder(new UFDouble((Double) ireplorderObj).intValue()); + } else if (ireplorderObj instanceof Number) { + replVO.setIreplorder(((Number) ireplorderObj).intValue()); + } + } + + // ת + if (param.containsKey("bisdisplace")) { + Object bisdisplaceObj = param.get("bisdisplace"); + if (bisdisplaceObj instanceof Boolean) { + replVO.setBisdisplace(UFBoolean.valueOf((Boolean) bisdisplaceObj)); + } else if (bisdisplaceObj instanceof UFBoolean) { + replVO.setBisdisplace((UFBoolean) bisdisplaceObj); + } + } + } + public AggBomVO[] updateBomWithParam(AggBomVO[] aggvos, boolean isFromBom, boolean isecn, boolean isCheckEcn, + boolean isOnApprove) throws BusinessException { + if (MMArrayUtil.isEmpty(aggvos)) { + return null; + } + try { + // BOMǷɾΪBOM״άBOMɾˣ޸ĸ¼ + Set bomids = new HashSet(); + for (AggBomVO vo : aggvos) { + bomids.add(vo.getPrimaryKey()); + } + Set checkResult = BomPubBP.getBomID(bomids.toArray(new String[] {})); + if (checkResult != null && checkResult.size() < bomids.size()) { + nc.vo.pubapp.pattern.exception.ExceptionUtils.wrappBusinessException(MMBDLangConstBom0202.getBOM_DELETED()); + } + // + ts + GCBillTransferTool transTool = new GCBillTransferTool(aggvos); + // ȫǰ̨VO + AggBomVO[] fullBills = transTool.getClientFullInfoBill(); + // ޸ǰvo + AggBomVO[] originBills = transTool.getOriginBills(); + BomUpdateBP bp = new BomUpdateBP(); + return bp.update(fullBills, originBills, isCheckEcn, isOnApprove, isFromBom, isecn); + } catch (Exception e) { + nc.vo.pubapp.pattern.exception.ExceptionUtils.marsh(e); + } + return null; } public String getModule() {