From 1b576a30a84b8b57f5b7d7a22424f9fc08d08516 Mon Sep 17 00:00:00 2001
From: xjj <xjj@123>
Date: 星期二, 27 二月 2024 13:03:56 +0800
Subject: [PATCH] #

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java
index f617227..02c8b3c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java
@@ -37,6 +37,7 @@
                   @RequestParam(required = false) String timeRange,
                   @RequestParam Map<String, Object> param) {
         LambdaQueryWrapper<BasBarcode> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(BasBarcode::getHostId, getHostId());
         if (!Cools.isEmpty(condition)) {
             wrapper.like(BasBarcode::getId, condition);
         }
@@ -52,6 +53,8 @@
     @RequestMapping(value = "/basBarcode/add/auth")
     @ManagerAuth
     public R add(BasBarcode basBarcode) {
+        basBarcode.setHostId(getHostId());
+        basBarcode.setCreateTime(new Date());
         basBarcodeService.save(basBarcode);
         return R.ok();
     }
@@ -79,6 +82,7 @@
     @ManagerAuth
     public R query(String condition) {
         LambdaQueryWrapper<BasBarcode> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(BasBarcode::getHostId, getHostId());
         wrapper.like(BasBarcode::getId, condition);
         Page<BasBarcode> page = basBarcodeService.page(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +100,7 @@
     public R getDataKV(@RequestParam(required = false) String condition) {
         List<KeyValueVo> vos = new ArrayList<>();
         LambdaQueryWrapper<BasBarcode> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(BasBarcode::getHostId, getHostId());
         if (!Cools.isEmpty(condition)) {
             wrapper.like(BasBarcode::getId, condition);
         }
@@ -108,14 +113,18 @@
     public R generateBarcode(@RequestParam("barcode") String barcode, @RequestParam("num") Integer num) {
         Long hostId = getHostId();
         Date now = new Date();
+        BasBarcode one = basBarcodeService.getOne(new LambdaQueryWrapper<BasBarcode>().eq(BasBarcode::getBarcode, barcode).eq(BasBarcode::getHostId, hostId));
+        if (one != null) {
+            return R.error("鏉$爜璧峰鍊煎凡瀛樺湪");
+        }
         int barcodeInt = Integer.parseInt(barcode);
         for (int i = 0; i < num; i++) {
-            barcodeInt += 1;
             BasBarcode basBarcode = new BasBarcode();
             basBarcode.setBarcode(String.valueOf(barcodeInt));
             basBarcode.setHostId(hostId);
             basBarcode.setCreateTime(now);
             basBarcodeService.save(basBarcode);
+            barcodeInt += 1;
         }
         return R.ok();
     }

--
Gitblit v1.9.1