diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql index ebee7491..28fb4497 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql @@ -160,6 +160,7 @@ PURCHASE.ITEM_ID in 输入.mater_ids ENDOPTION GROUP BY PURCHASE.ITEM_ID,PURCHASE.VBILLCODE, PURCHASE.ITEM_CODE, PURCHASE.ITEM_NAME + ORDER BY PURCHASE.ITEM_CODE, PURCHASE.VBILLCODE ENDSELECT ENDQUERY ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java index ee034b7a..27cf03c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java @@ -337,20 +337,20 @@ public class StatisticalReportServiceImpl implements StatisticalReportService { JSONObject map = new JSONObject(); map.put("flag", "4"); map.put("ext_id", jsonMater.getString("ext_id")); - //JSONObject num_jo = null; +// JSONObject num_jo = null; -// JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0); + JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0); //合同在途 double notqty = 0; -// if (ObjectUtil.isNotEmpty(num_jo)) { -// notqty = num_jo.getDoubleValue("notqty"); -// if (notqty < 0) { -// notqty = 0; -// } -// } + if (ObjectUtil.isNotEmpty(num_jo)) { + notqty = num_jo.getDoubleValue("notqty"); + if (notqty < 0) { + notqty = 0; + } + } jo6.put(material_id, String.format("%.2f", notqty)); //5、库/需差额量 :库存现存量-排产需求量