Merge branch 'dev_temp_xw_202502120000_45071' into dev

3 months ago · 2d2c63a850
parent 0344e04ab1 0bbe272234
commit 2d2c63a850
1 changed files with 3 additions and 1 deletions
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
@ -768,8 +768,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                item.setProductSeq(productSeq + 1);
                item.setWorkOrderSeq(seqList.get(index));
            } else {
+                if (!StringUtil.isEmpty(item.getWorkOrderSeq())) {
                    item.setProductSeq(Long.valueOf(item.getWorkOrderSeq()));
                }
+            }

            item.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
            ConvertBean.serviceModelInitialize(item, item.getCreateUser());