From 0f55c3628ce9d747953c2afe1fdd945baa357e65 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 09 七月 2024 10:18:12 +0800
Subject: [PATCH] erp上报功能

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index dc51731..b606a4e 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -474,6 +474,7 @@
                 User user = new User();
                 user.setUsername("test");
                 mobileService.plaPakin(brand,locNo,batch,packageNo,user);
+                json.put("user",user.getUsername());
             }
         }
         //鍏ュ簱鎴愬姛鍚庝笂鎶RP
@@ -600,7 +601,7 @@
 
             plaService.updateById(pla);
             SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
-                    locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+                    locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
 
         });
 

--
Gitblit v1.9.1