Merge branch 'dev_lzh_wms_20260120' into wms_dev

2026-02-02 14:53:02 +08:00
parent 99d0e2593d 6af1bd8aa0
commit 56db83a80d
1 changed files with 7 additions and 1 deletions
@@ -129,7 +129,13 @@ public class ShiftManageImpl extends ServiceImpl<ShiftManageMapper, ShiftManage>
            shiftMaterialDetailList.add(shiftMaterialDetail);
        });
        iShiftMaterialDetailService.saveBatch(shiftMaterialDetailList);
-        return this.updateById(shiftManage);
+        Boolean b;
+        if (shiftManage.getShiftManageId() == null){
+            b = this.save(shiftManage);
+        }else {
+            b = this.updateById(shiftManage);
+        }
+        return b;
    }

    /**