From 75375a0f68c8b91799482dc1cd2ec7d7f211167f Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期五, 31 五月 2024 09:28:06 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes --- springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java index 3edac09..ed6791b 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java +++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java @@ -67,7 +67,7 @@ // String orderid="A001"; // 鑾峰彇閾濇鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭 - List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode, widths, 400); + List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode, widths, 600); // 鍒ゆ柇閾濇鎸囧畾绌烘牸鏄惁闇�瑕侀棿闅旂┖闂� if (storageCage.size() == 0) { @@ -91,7 +91,7 @@ // 鍒ゆ柇鏄惁鏄浜岀墖闇�瑕佸姞闂撮殧鐗� prctier = spianMapper.selectsum(cage1, storageCage2.getCell());// 浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁� if (prctier > 0) { - cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths + 400); + cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths + 600); } else { cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths); } @@ -413,7 +413,7 @@ spianMapper.UpdateCageOver(glassid.toString(), 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬� spianMapper.UpdateCageadd(glassid.toString(), 1);// 鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬� String barcode = spianMapper.SelectBarcode(glassid.toString());// 鑾峰彇璇ョ幓鐠冪殑閾濇id - spianMapper.UpdateAddQueue(glassid.toString());// 鎶婅繘鐗囩殑鐜荤拑鏇存柊鍒板嚭鐗囬槦鍒椾腑 + //spianMapper.UpdateAddQueue(glassid.toString());// 鎶婅繘鐗囩殑鐜荤拑鏇存柊鍒板嚭鐗囬槦鍒椾腑 } -- Gitblit v1.8.0