Merge branch 'master' into master-jxthTV

Administrator

2026-03-29 d3e4c5426920122c5c1bd7162945e45dab7fafa6

Merge branch 'master' into master-jxthTV

 src/main/java/com/zy/asrs/timer/WcsStationTimer.java

@@ -78,6 +78,11 @@
                    wcsStationDto.setBarcode(object.getString("barcode"));
                    wcsStationDto.setErrorMsg(object.getString("errorMsg"));
                    wcsStationDto.setSystemWarning(object.getString("systemWarning"));

                    if (wcsStationDto.getLoading() == 0 || wcsStationDto.getTaskNo().equals("0")) {
                        wcsStationDto.setWrkDetls(null);
                    }

                    stationUtils.stationMap.put(stationId, wcsStationDto);
                }
            }