增加收料单入库限制条件

src/main/java/com/uas/eis/service/Impl/MESServiceImpl.java

@@ -87,7 +87,7 @@ public class MESServiceImpl implements MESService {
             if ("VerifyApply!ToPurcIn".equals(caller)) {
                 // 判断该收料通知单是否已经转入过采购验收单
                 Object code = baseDao.getFieldDataByCondition("VerifyApply", "va_code", "va_id=" + vaid);
-                code = baseDao.getFieldDataByCondition("ProdInOut", "pi_inoutno", "pi_sourcecode='" + code + "' and PI_REFNO='采购收料单'");
+                code = baseDao.getFieldDataByCondition("ProdInOut", "pi_inoutno", "pi_sourcecode='" + code + "' and " + "PI_REFNO='采购收料单' and pi_class='采购验收单'");
                 if (code != null && !code.equals("")) {
                     return ApiResponse.failRsp("10014", request.getHeader("RequestId"), "该收料单已转入过采购验收单,验收单号[" + code + "]");
                 }
@@ -95,7 +95,7 @@ public class MESServiceImpl implements MESService {
             if ("VerifyApply!ToOtherIn".equals(caller)) {
                 // 判断该收料通知单是否已经转入过采购验收单
                 Object code = baseDao.getFieldDataByCondition("VerifyApply", "va_code", "va_id=" + vaid);
-                code = baseDao.getFieldDataByCondition("ProdInOut", "pi_inoutno", "pi_sourcecode='" + code + "' and PI_REFNO='采购收料单'");
+                code = baseDao.getFieldDataByCondition("ProdInOut", "pi_inoutno", "pi_sourcecode='" + code + "' and PI_REFNO='采购收料单' and pi_class='其它入库单'");
                 if (code != null && !code.equals("")) {
                     return ApiResponse.failRsp("10014", request.getHeader("RequestId"), "该收料单已转入过其它入库单,单号[" + code + "]");
                 }