Merge branch 'uat-temp-wj-2412280000-44630' into dev

dev-temp-nht-202502180000-customprint
王杰 5 months ago
commit 5e7541a1cd

@ -48,6 +48,8 @@ public class MesManyCellTriggerJumpProcessStepService extends BaseStepService {
if (StringUtils.isEmpty(reqBean.getScanInfo())) return stepResult; if (StringUtils.isEmpty(reqBean.getScanInfo())) return stepResult;
stepResult.unResetScanInfo();
//所有分屏强制跳过工序密码 //所有分屏强制跳过工序密码
String pwd = fsmCommonService.handleFsmWcpcMapDataForDoScan(reqBean).get(MesPcnExtConstWords.MANY_CELL_TRIGGER_JUMP_PROCESS_PWD); String pwd = fsmCommonService.handleFsmWcpcMapDataForDoScan(reqBean).get(MesPcnExtConstWords.MANY_CELL_TRIGGER_JUMP_PROCESS_PWD);
if (StringUtils.isEmpty(pwd) || !pwd.equals(reqBean.getScanInfo())) return stepResult; if (StringUtils.isEmpty(pwd) || !pwd.equals(reqBean.getScanInfo())) return stepResult;

Loading…
Cancel
Save