入库接口处理

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

@@ -128,14 +128,14 @@ public class MESServiceImpl implements MESService {
                         return ApiResponse.failRsp("10014", requestId, "该收料单已转入过采购验收单,验收单号[" + code + "]");
                     }
                 }
-                /*if ("VerifyApply!ToOtherIn".equals(caller)) {
+                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='采购收料单' and pi_class='其它入库单'");
                     if (code != null && !code.equals("")) {
                         return ApiResponse.failRsp("10014", requestId, "该收料单已转入过其它入库单,单号[" + code + "]");
                     }
-                }*/
+                }
                 if ("VerifyApply!ToOutsideCheckIn".equals(caller)) {
                     // 判断该收料单是否已经转入过委外验收单
                     Object code = baseDao.getFieldDataByCondition("VerifyApply", "va_code", "va_id=" + vaid);
@@ -1435,14 +1435,14 @@ public class MESServiceImpl implements MESService {
                         return ApiResponse.failRsp("10014", requestId, "该收料单已转入过采购验收单,验收单号[" + code + "]");
                     }
                 }
-                /*if ("VerifyApply!ToOtherIn".equals(caller)) {
+                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='采购收料单' and pi_class='其它入库单'");
                     if (code != null && !code.equals("")) {
                         return ApiResponse.failRsp("10014", requestId, "该收料单已转入过其它入库单,单号[" + code + "]");
                     }
-                }*/
+                }
                 if ("VerifyApply!ToOutsideCheckIn".equals(caller)) {
                     // 判断该收料单是否已经转入过委外验收单
                     Object code = baseDao.getFieldDataByCondition("VerifyApply", "va_code", "va_id=" + vaid);