diff --git a/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java b/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java index abd0e06..c3bd234 100644 --- a/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java +++ b/mmpac/src/public/nccloud/openapi/mmpac/pmo/PmoResource.java @@ -111,10 +111,7 @@ public class PmoResource extends AbstractNCCRestResource { if (paramMap == null || !paramMap.containsKey("vdef8")) { return ResultMessageUtil.exceptionToJSON("传入数据异常,参数要包含vdef8信息", APIErrCodeEnum.BUSINESSEXCCODE.getCode()); } - // 获取vdef8数组 List vdef8List = (List) paramMap.get("vdef8"); - - // 获取limit参数 Integer limit = null; if (paramMap.containsKey("limit")) { Object limitObj = paramMap.get("limit"); @@ -122,7 +119,6 @@ public class PmoResource extends AbstractNCCRestResource { limit = ((Number) limitObj).intValue(); } } - String baseSql; if (MMCollectionUtil.isEmpty(vdef8List)) { // 如果vdef8List为空,查询所有数据 @@ -147,10 +143,7 @@ public class PmoResource extends AbstractNCCRestResource { } else { sql = baseSql; } - - @SuppressWarnings("unchecked") List> rows = (List>) BASE_DAO.executeQuery(sql, new MapListProcessor()); - return ResultMessageUtil.toJSON(rows, "查询生产订单信息成功"); } catch (DAOException e) { diff --git a/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java b/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java index 28bf204..d2dd0b4 100644 --- a/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java +++ b/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java @@ -184,8 +184,6 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { detailItem.put("demandDate", dreceivedate1 != null ? dreceivedate1.toString().substring(0, 10) : null); UFDate dsenddate1 = body.getDsenddate(); detailItem.put("deliveryDate", dsenddate1 != null ? dsenddate1.toString().substring(0, 10) : null); - // 其他非必填字段设为null - detailItem.put("productNum", null); // 传递电缆公司的组织编码 detailItem.put("factoryId", transferCodeByPk(SalesOrgVO.getDefaultTableName(), SalesOrgVO.CODE, SalesOrgVO.PK_SALESORG, head.getPk_org())); detailItem.put("customMtId", null);