From b141c90208b6a82504680d35eacdaecff1cb7e40 Mon Sep 17 00:00:00 2001 From: lsh <lsh123456> Date: 星期日, 14 四月 2024 10:39:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/LocMastController.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java index 58bb6f3..51b0eab 100644 --- a/src/main/java/com/zy/asrs/controller/LocMastController.java +++ b/src/main/java/com/zy/asrs/controller/LocMastController.java @@ -180,6 +180,7 @@ break; } } + Date now = new Date(); LocMast locMast = new LocMast(); locMast.setLocNo(locNo); locMast.setLocSts("O"); @@ -187,20 +188,20 @@ locMast.setBay1(b); // 鍒� locMast.setLev1(l); // 灞� locMast.setCrnNo(crnNo); // 鍫嗗灈鏈� - locMast.setLocType1(param.getLocType1()); + locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1); locMast.setLocType2(param.getLocType2()); locMast.setLocType3(param.getLocType3()); locMast.setAppeUser(getUserId()); - locMast.setAppeTime(new Date()); + locMast.setAppeTime(now); locMast.setModiUser(getUserId()); - locMast.setModiTime(new Date()); + locMast.setModiTime(now); list.add(locMast); } } } - locMastService.delete(new EntityWrapper<>()); - locDetlService.delete(new EntityWrapper<>()); - locMastService.insertBatch(list); +// locMastService.delete(new EntityWrapper<>()); +// locDetlService.delete(new EntityWrapper<>()); +// locMastService.insertBatch(list); return R.ok("鍒濆鍖栨垚鍔�"); } } -- Gitblit v1.9.1