From ea3151e1e9378a8454d3119908b47aa72f8869e6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 28 二月 2024 16:33:46 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs
---
src/main/java/com/zy/asrs/controller/PlaController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index e91e410..ba3b843 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -204,7 +204,8 @@
pla.setModifyTime(new Date());
pla.setWeightAnfme(0.0);
plaService.updateById(pla);
- SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),null,pla.getBatch(),pla.getPackageNo());
+ SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
});
return R.ok();
@@ -359,6 +360,7 @@
manPakOut.setStatus(0);
manPakOut.setDocId(plaQty.getOrderDetlId());
manPakOut.setNodeId(plaQty.getId());
+ manPakOut.setCustName(plaQty.getCustomer());
//manPakOut.setNodeId(plaQty.getOrderDetlId());
manPakOutService.insert(manPakOut);
return R.ok();
--
Gitblit v1.9.1