diff --git a/mmpac/src/private/nc/pubimpl/mmpac/pmo/wr/PublicPMOService4WrImpl.java b/mmpac/src/private/nc/pubimpl/mmpac/pmo/wr/PublicPMOService4WrImpl.java
index 18b0e823..b5973d20 100644
--- a/mmpac/src/private/nc/pubimpl/mmpac/pmo/wr/PublicPMOService4WrImpl.java
+++ b/mmpac/src/private/nc/pubimpl/mmpac/pmo/wr/PublicPMOService4WrImpl.java
@@ -264,12 +264,12 @@ public class PublicPMOService4WrImpl implements IPublicPMOService4Wr {
                     if (totalWRnum.doubleValue() >= compareplanputnum.doubleValue() && !MMMapUtil.isEmpty(autodonepara)) {
                         BaseDAO dao = new BaseDAO();
 
-// 查询备料计划  如果下游备料计划未出库数量小于0，生产订单自动完工取消
-                        String pickmsql = "select vbdef13 from mm_pickm_b where cpickmid in (  select cpickmid  from mm_pickm  where csourcebillrowid='" + item.getCmoid() + "'  and dr=0) and dr = 0";
+// 查询备料计划  如果下游备料计划未出库数量（计划出库-累计出库）小于0，生产订单自动完工取消 naccoutnum	累计出库数量 nplanoutnum计划出库
+                        String pickmsql = "select nplanoutnum,naccoutnum from mm_pickm_b where cpickmid in (  select cpickmid  from mm_pickm  where csourcebillrowid='" + item.getCmoid() + "'  and dr=0) and dr = 0";
                         List<Map<String,Object>> hmateral = (List<Map<String,Object>>) dao.executeQuery(pickmsql, new MapListProcessor());
                         Boolean l=false;
                         for (Map<String,Object> map : hmateral) {
-                            if(null != map.get("vbdef13") && new UFDouble(String.valueOf(map.get("vbdef13"))).compareTo(UFDouble.ZERO_DBL) <0) {
+                            if(null != map.get("nplanoutnum") && null != map.get("naccoutnum") &&  new UFDouble(String.valueOf(map.get("nplanoutnum"))).sub(new UFDouble(String.valueOf(map.get("naccoutnum")))).compareTo(UFDouble.ZERO_DBL) <0) {
                                 l=true;
                             }
                         }