Browse Source

取消有值无值仓限制

koul 3 years ago
parent
commit
09748579aa
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

@@ -784,7 +784,7 @@ public class MESServiceImpl implements MESService {
                 if (count2 <= 0) {
                     return ApiResponse.failRsp("10056", requestId, "MES仓库编号在ERP没有对应关系,请联系管理员新增!");
                 }
-                warehouses2 = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description", "ct_statuscode='AUDITED' and ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode2 + "'");
+                /*warehouses2 = baseDao.getFieldsDataByCondition("customtabledetail left join customtable on cd_ctid=ct_id left join Warehouse on cd_varchar50_3=wh_code", "cd_varchar50_3,wh_description", "ct_statuscode='AUDITED' and ct_caller='MESWarehouse' and cd_varchar50_1='" + whcode2 + "'");
                 //获取领料单拨出仓库
                 int mmdetno = Integer.parseInt(StringUtil.nvl(baseDao.getFieldDataByCondition("MakeMaterial","mm_detno","mm_id in (" + lineId + ")"), "0"));
                 Object data2 = baseDao.getFieldDataByCondition("prodiodetail", "min(pd_batchcode)","pd_piclass='生产领料单' and pd_ordercode='" + macode + "' and pd_orderdetno=" + mmdetno);
@@ -798,7 +798,7 @@ public class MESServiceImpl implements MESService {
                     if (nocost == 0) {
                         return ApiResponse.failRsp("10059", requestId, "工单BOM领料仓是有值仓,不允许退零值仓!");
                     }
-                }
+                }*/
             }
         }
         for (int i = 0; i <jsonArray.size() ; i++) {