From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java
index ac2e6e1..4a278ba 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java
@@ -227,7 +227,7 @@
finishedGlassShelfEmitDetails.getUnit(),
finishedGlassShelfEmitDetails.getGlassShelfName());
finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetails(emitId);
- finishedGlassShelfMapper.updateFinishedGlassShelfEmitDetailsLog(emitId);
+ finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(emitId);
}
}
@@ -268,7 +268,8 @@
finishedGlassShelfEmitDetails.getMaxWeight(),
finishedGlassShelfEmitDetails.getMaxWidth(),
finishedGlassShelfEmitDetails.getMaxHeight(),
- finishedGlassShelfEmitDetails.getGlassShelfName()
+ finishedGlassShelfEmitDetails.getGlassShelfName(),
+ object.get("userName").toString()
);
index++;
}
@@ -416,7 +417,7 @@
finishedGlassShelfWithdrawDetails.getGlassShelfName()
);
finishedGlassShelfMapper.deleteFinishedGlassShelfWithdrawDetails(withdrawId);
- finishedGlassShelfMapper.updateFinishedGlassShelfEmitDetailsLog(withdrawId);
+ finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(withdrawId);
}
}
@@ -460,7 +461,8 @@
finishedGlassShelfWithdrawDetails.getMaxWeight(),
finishedGlassShelfWithdrawDetails.getMaxWidth(),
finishedGlassShelfWithdrawDetails.getMaxHeight(),
- finishedGlassShelfWithdrawDetails.getGlassShelfName()
+ finishedGlassShelfWithdrawDetails.getGlassShelfName(),
+ object.get("userName").toString()
);
index++;
}
--
Gitblit v1.8.0