|
|
@@ -1088,16 +1088,16 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
String iSN=map.get("iSN").toString();
|
|
|
- Object iMakecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
|
|
|
- if(iMakecode==null){
|
|
|
- oErrMessage = iSN+"无关联工单";
|
|
|
- rmap.put("oErrMessage",oErrMessage);
|
|
|
- return rmap;
|
|
|
- }
|
|
|
+// Object iMakecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
|
|
|
+// if(iMakecode==null){
|
|
|
+// oErrMessage = iSN+"无关联工单";
|
|
|
+// rmap.put("oErrMessage",oErrMessage);
|
|
|
+// return rmap;
|
|
|
+// }
|
|
|
//之前有获取过的
|
|
|
SqlRowList rs=baseDao.queryForRowSet("select * from "+Master+".makeinfodet left join "+Master+".MakeRemark on MID_ORDERCODE=ordernumber " +
|
|
|
"left join "+Master+".aftersaledet on asd_sn=mid_sn left join "+Master+".DeliveryIn on "+Master+".DeliveryIn.sn=mid_sn " +
|
|
|
- "left join "+Master+".Deliveryout on "+Master+".Deliveryout.sn=mid_sn left join "+Master+".remakedet on mid_sn=RMD_SN where mid_ordercode='"+iMakecode+"' and mid_sn='"+iSN+"' and rownum=1");
|
|
|
+ "left join "+Master+".Deliveryout on "+Master+".Deliveryout.sn=mid_sn left join "+Master+".remakedet on mid_sn=RMD_SN where mid_sn='"+iSN+"' and rownum=1");
|
|
|
if(rs.next()){
|
|
|
rmap.put("MID_ID","");
|
|
|
rmap.put("MID_MIID",rs.getString("MID_MIID"));
|
