From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

---
 src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index a911107..196874a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -24,11 +24,10 @@
 
     @Override
     @Transactional
-    public void createWorkDetail(Integer workNo, List<DetlDto> detlDtos, String barcode, Long userId) {
+    public void createWorkDetail(Integer workNo, List<DetlDto> detlDtos, String barcode, Long userId, Date now) {
         if (detlDtos.isEmpty()){
             return;
         }
-        Date now = new Date();
         for (DetlDto dto : detlDtos) {
             Mat mat = matService.selectByMatnr(dto.getMatnr());
             if (Cools.isEmpty(mat)){

--
Gitblit v1.9.1