Browse Source

调试工单删除校验

koul 4 years ago
parent
commit
034a680d4e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/main/java/com/uas/eis/service/Impl/MESServiceImpl.java

+ 2 - 2
src/main/java/com/uas/eis/service/Impl/MESServiceImpl.java

@@ -257,7 +257,7 @@ public class MESServiceImpl implements MESService {
         Object maId = jsonData.get("finterid");
         // 只能删除在录入的单据!
         SqlRowList status =
-                baseDao.queryForRowSet("select ma_statuscode,ma_checkstatuscode from make where ma_id="+maId);
+                baseDao.queryForRowSet("select ma_statuscode,ma_checkstatuscode from make where ma_code="+maId);
         if (status.next()) {
             if (!status.getString("ma_statuscode").equals("ENTERING") && (status.getString("ma_checkstatuscode").equals("APPROVE") || status.getString("ma_checkstatuscode").equals("COMMITED"))) {
                 return ApiResponse.failRsp("10015",request.getHeader("RequestId"),"只能删除在录入且批准状态不等于已批准或已提交的工单");
@@ -265,7 +265,7 @@ public class MESServiceImpl implements MESService {
         }
         // 启用工厂模式 有对应的作业单 制造单不能删除
         if (baseDao.isDBSetting("sys","usingMakeCraft")) {
-            int count = baseDao.getCount("Select count(1) from makecraft left join make on mc_makecode=ma_code where ma_id=" + maId);
+            int count = baseDao.getCount("Select count(1) from makecraft left join make on mc_makecode=ma_code where ma_code=" + maId);
             if (count > 0) {
                 return ApiResponse.failRsp("10016",request.getHeader("RequestId"),"当前工单存在作业单,不能删除");
             }