diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PfScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PfScreenServiceImpl.java
index f349f18a..2b42271c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PfScreenServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PfScreenServiceImpl.java
@@ -136,7 +136,7 @@ public class PfScreenServiceImpl implements PfScreenService {
                     scr_jo.put("msg", "投料确认异常！错误码："+err_mark.getString("error"));
                     scr_jo.put("flag", "1");
                 }else {
-                    if (StrUtil.isNotEmpty(err_mark.getString("mes_msg"))){
+                    if (ObjectUtil.isNotEmpty(err_mark) && StrUtil.isNotEmpty(err_mark.getString("mes_msg"))){
                         scr_jo.put("msg", err_mark.getString("mes_msg"));
                         scr_jo.put("flag", "1");
                     }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
index 390b26b4..e7416f14 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
@@ -783,9 +783,10 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
             String material_id = bucketrow.getString("material_id");
             String pcsn = bucketrow.getString("pcsn");
             String ivt_level = bucketrow.getString("ivt_level");
+            String is_active = bucketrow.getString("is_active");
             String quality_scode = bucketrow.getString("quality_scode");
             //查询仓位库存里面的该物料批次的总重量
-            JSONObject ivtjo = inv_table.query("material_id='" + material_id + "' and pcsn='" + pcsn + "' and ivt_level='" + ivt_level + "'  and quality_scode ='" + quality_scode + "' and struct_code='" + point_code + "' ").uniqueResult(0);
+            JSONObject ivtjo = inv_table.query("is_active = '"+is_active+"' and material_id='" + material_id + "' and pcsn='" + pcsn + "' and ivt_level='" + ivt_level + "'  and quality_scode ='" + quality_scode + "' and struct_code='" + point_code + "' ").uniqueResult(0);
             if (ObjectUtil.isEmpty(ivtjo)) {
                 throw new PdaRequestException("物料为【'" + material_id + "'】,批次为【'" + pcsn + "'】,库存等级为【'" + ivt_level + "'】,品质类型为【'" + quality_scode + "'】的物料在仓库未找到！");
             }