|
|
@@ -190,6 +190,10 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
|
|
|
}
|
|
|
|
|
|
public MesProductRecord findByUpdateCate(String sn,String oprno,String craft,String cate){
|
|
|
+ // 检测NOFORMAT_前缀并去掉(仅影响cate,oprno始终格式化)
|
|
|
+ if(cate != null && cate.startsWith("NOFORMAT_")){
|
|
|
+ cate = cate.substring(9);
|
|
|
+ }
|
|
|
oprno = CommonUitl.formatOprno(oprno);
|
|
|
MesProductRecord mesProductRecord = new MesProductRecord();
|
|
|
mesProductRecord.setSn(sn);
|
|
|
@@ -944,7 +948,13 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
|
|
|
@Transactional
|
|
|
public void updateRecord(String sn, String oprno, String craft, String materielSn, String content,String userCode,String lineSn) {
|
|
|
String oldOprno = oprno;
|
|
|
+
|
|
|
+ // 检测NOFORMAT_前缀并去掉(仅剥离lineSn前缀,oprno始终格式化)
|
|
|
+ if(lineSn != null && lineSn.startsWith("NOFORMAT_")){
|
|
|
+ lineSn = lineSn.substring(9);
|
|
|
+ }
|
|
|
oprno = CommonUitl.formatOprno(oprno);
|
|
|
+
|
|
|
MesProductRecord mesProductRecord = findByUpdateCate(sn,oprno,craft,lineSn);
|
|
|
if(ObjectUtils.isEmpty(mesProductRecord)){
|
|
|
if(oprno.equals("OP230") && craft.equals("400004") && lineSn.equals("XT")){
|