From c04935f92591dce1c78c7394b477d5af725f3703 Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 17 Nov 2025 11:35:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=B5=81=E7=A8=8B=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A2=E5=8D=95BID=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/mmpac/pmo/PmoResource.java | 54 +++++++++++++------ 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java b/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java index cecb9070..75fff095 100644 --- a/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java +++ b/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java @@ -1,27 +1,17 @@ package nccloud.openapi.mmpac.pmo; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - -import nc.itf.mmpac.pmo.pac0002.IPMOBusinessService; import nc.bs.dao.BaseDAO; import nc.bs.dao.DAOException; import nc.bs.framework.common.NCLocator; import nc.bs.logging.Log; +import nc.itf.mmpac.pmo.pac0002.IPMOBusinessService; import nc.itf.mmpac.pmo.pac0002.IPMOQueryService; import nc.jdbc.framework.SQLParameter; import nc.jdbc.framework.processor.MapListProcessor; import nc.util.mmf.framework.base.MMCollectionUtil; import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOItemVO; -import nc.vo.org.OrgVO; import nc.vo.pub.BusinessException; -import nc.vo.sscivm.invoice.IVMInvoiceHeadVO; import nc.ws.opm.pub.utils.result.APIErrCodeEnum; import nccloud.api.mmpac.pmo.IAPIPmoMaintainService; import nccloud.api.rest.utils.ResultMessageUtil; @@ -29,6 +19,14 @@ import nccloud.pubift.commen.itf.utils.IHttpPostOtherSys; import nccloud.ws.rest.resource.AbstractNCCRestResource; import org.json.JSONString; +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + @Path("mmpac/pmo") public class PmoResource extends AbstractNCCRestResource { private static String HEADTABLE = "mm_pmo"; @@ -120,6 +118,7 @@ public class PmoResource extends AbstractNCCRestResource { return ResultMessageUtil.exceptionToJSON(e); } } + @POST @Path("finish") @Consumes({"application/json"}) @@ -134,9 +133,9 @@ public class PmoResource extends AbstractNCCRestResource { } else { List pkList = new ArrayList<>(); for (Map map : paramList) { - if (!map.containsKey("pks") ) { + if (!map.containsKey("pks")) { return ResultMessageUtil.exceptionToJSON("传入数据异常，参数要包含生产订单id", APIErrCodeEnum.BUSINESSEXCCODE.getCode()); - }else{ + } else { pkList.add((String) map.get("pks")); @@ -164,6 +163,7 @@ public class PmoResource extends AbstractNCCRestResource { /** * 回写行状态（包含从其他状态回到审核通过状态的功能） + * * @param paramMap * @return */ @@ -216,7 +216,7 @@ public class PmoResource extends AbstractNCCRestResource { return ResultMessageUtil.exceptionToJSON("未找到订单: " + pk, APIErrCodeEnum.BUSINESSEXCCODE.getCode()); } for (PMOAggVO vo : currentVOs) { - for(PMOItemVO itemVOS:vo.getChildrenVO()){ + for (PMOItemVO itemVOS : vo.getChildrenVO()) { // 获取当前行状态 int currentStatus = itemVOS.getFitemstatus(); // 假设存在此方法获取当前状态 // 只有审核通过(4)的订单才能修改为其他状态 @@ -274,6 +274,7 @@ public class PmoResource extends AbstractNCCRestResource { /** * 高压mes回写流程生产订单明细计划开工时间 + * * @param paramMap * @return */ @@ -291,11 +292,11 @@ public class PmoResource extends AbstractNCCRestResource { for (Map map : paramList) { String pk = (String) map.get("pk"); String planStartTime = (String) map.get("planStartTime"); - String updatesql="UPDATE mm_mo SET vdef38 = ? WHERE cmoid=?"; + String updatesql = "UPDATE mm_mo SET vdef38 = ? WHERE cmoid=?"; SQLParameter param1 = new SQLParameter(); param1.addParam(planStartTime); param1.addParam(pk); - new BaseDAO().executeUpdate(updatesql,param1); + new BaseDAO().executeUpdate(updatesql, param1); } @@ -305,6 +306,7 @@ public class PmoResource extends AbstractNCCRestResource { return ResultMessageUtil.exceptionToJSON(e); } } + @POST @Path("delete") @Consumes({"application/json"}) @@ -324,6 +326,26 @@ public class PmoResource extends AbstractNCCRestResource { } } + @POST + @Path("findByBids") + @Consumes({"application/json"}) + @Produces({"application/json"}) + public JSONString findByBids(Map paramMap) { + List bidList = (List) paramMap.get("pmobids"); + if (MMCollectionUtil.isEmpty(bidList)) { + return ResultMessageUtil.exceptionToJSON("传入数据异常，参数要包含pmobids信息", APIErrCodeEnum.BUSINESSEXCCODE.getCode()); + } else { + try { + String[] pmobids = bidList.toArray(new String[0]); + IPMOQueryService pmoQuery = NCLocator.getInstance().lookup(IPMOQueryService.class); + PMOAggVO[] pmoAggVOS = pmoQuery.queryPMOAggVOByBid(pmobids); + return ResultMessageUtil.toJSON(pmoAggVOS, "流程生产订单查询成功"); + } catch (BusinessException e) { + return ResultMessageUtil.exceptionToJSON(e); + } + } + } + @POST @Path("queryPmos") @Consumes({"application/json"})