#

Junjie

2026-01-15 470718b6f7de2688807a59b4e32f437624c51499

 src/main/java/com/zy/common/service/CommonService.java

@@ -343,6 +343,14 @@
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);

        if (!Cools.isEmpty(param.getBatch())) {
            wrkMast.setBatch(param.getBatch());
        }

        if (!Cools.isEmpty(param.getBatchSeq())) {
            wrkMast.setBatchSeq(param.getBatchSeq());
        }

        if (findCrnResult.getCrnType().equals(SlaveType.Crn)) {
            BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
            if(basCrnp == null) {
@@ -446,7 +454,7 @@
                    break;
                }
            } catch (Exception e) {
                e.printStackTrace();
//                e.printStackTrace();
            }
        }
        return targetStationId;
@@ -478,7 +486,7 @@
                    break;
                }
            } catch (Exception e) {
                e.printStackTrace();
//                e.printStackTrace();
            }
        }
        return finalSourceStationId;