diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC01.wql
index d775010a..45ce4c8e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC01.wql
@@ -60,7 +60,7 @@
 			    unit.unit_name,
 			    SUBSTR(oder.vbillcode,1,6) AS order_code_1,
 			    SUBSTR(oder.vbillcode,8,10) AS order_code_2,
-			    ( oder.qty - dtl.instor_qty ) AS surplus_qty
+			    ( oder.qty - dtl.receive_qty ) AS surplus_qty
             FROM
             	PCS_IF_PurchaseOrderProc oder
             	LEFT JOIN MD_CS_SUPPLIERBASE supp ON oder.VEND_ID = supp.ext_id
@@ -82,7 +82,7 @@
             	LEFT JOIN PCS_RC_ReceiveMst mst ON mst.receive_id = dtl.receive_id AND mst.is_delete = '0'
             	LEFT JOIN md_pb_measureunit unit ON unit.ext_id = oder.M_UNIT_ID
             WHERE
-            1=1
+                oder.dr = '0'
                 OPTION 输入.begin_time <> ""
                         oder.CREATE_DATE >= 输入.begin_time
                 ENDOPTION
@@ -122,7 +122,7 @@
                 unit.unit_name,
                 SUBSTR(oder.vbillcode,1,6) AS order_code_1,
                 SUBSTR(oder.vbillcode,8,10) AS order_code_2,
-                ( oder.qty - dtl.instor_qty ) AS surplus_qty
+                ( oder.qty - dtl.receive_qty ) AS surplus_qty
             FROM
                 PCS_IF_PurchaseOrderProc oder
                 LEFT JOIN MD_CS_SUPPLIERBASE supp ON oder.VEND_ID = supp.ext_id
@@ -144,7 +144,7 @@
                 LEFT JOIN md_pb_measureunit unit ON unit.ext_id = oder.M_UNIT_ID
                 LEFT JOIN ST_IVT_IOStorInv ivtmst ON ivtmst.iostorinv_id = dtl.iostorinv_id AND ivtmst.bill_type = '000202'
             WHERE
-                1=1
+                oder.dr = '0'
 
                 OPTION 输入.type_id <> ""
                         mater.material_type_id in 输入.type_id
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java
index a6817593..d2f91223 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java
@@ -466,8 +466,8 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
                 if (StrUtil.equals(json.getString("material_type"), "01")) {
                     // 物料：查物料表关联分类表
                     JSONObject jsonDtlMater = materTab.query("material_id = '" + json.getString("material_id") + "'").uniqueResult(0);
-                    JSONObject jsonDtlClass = classTab.query("class_id = '" + jsonDtlMater.getString("material_type_id") + "'").uniqueResult(0);
-                    class_name = jsonDtlClass.getString("class_name");
+//                    JSONObject jsonDtlClass = classTab.query("class_id = '" + jsonDtlMater.getString("material_type_id") + "'").uniqueResult(0);
+                    class_name = jsonDtlMater.getString("material_name");
                 } else {
                     // 分类：直接用明细表的物料标识查基础分类表
                     JSONObject jsonDtlClass = classTab.query("class_id = '" + json.getString("material_id") + "'").uniqueResult(0);