From fc6d449566fd02245cb6f1fe1e67627c6b2dac90 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 2 Apr 2024 15:15:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=85=A5=E5=BA=93youhua?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InventoryAndWarehousingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java index 88a0a445..2283b043 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java @@ -55,7 +55,7 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi while (codeList.size() < dto.getNum()) { String code = FieldGenerator.generateField(); int count = selectByCode(code); - if (count == 0) { + if (count == 0 && !codeList.contains(code)) { codeList.add(code); } } From d77b56c106c8f5304ec630d669ae4b4293fe7187 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 2 Apr 2024 15:20:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/BackReceiveController.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index d7a430ed..3b0e47f1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -32,7 +32,7 @@ public class BackReceiveController extends BaseController { @GetMapping("getbackReceiveList") public AjaxResult getbackReceiveList(BackApplyInfo record) { try { - List list =backReceiveService.getbackReceiveList(record); + List list = backReceiveService.getbackReceiveList(record); return success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -50,7 +50,7 @@ public class BackReceiveController extends BaseController { @PostMapping("receiveView") public AjaxResult receiveView(@RequestBody BackApplyInfo record) { try { - List list =backReceiveService.receiveView(record); + List list = backReceiveService.receiveView(record); return success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -68,10 +68,10 @@ public class BackReceiveController extends BaseController { @PostMapping("setNumBack") public AjaxResult setNumBack(@RequestBody BackApplyInfo record) { try { - int res =backReceiveService.setNumBack(record); - if (res>0){ + int res = backReceiveService.setNumBack(record); + if (res > 0) { return AjaxResult.success("接收成功"); - }else { + } else { return AjaxResult.error("接收失败"); } } catch (Exception e) { @@ -89,12 +89,12 @@ public class BackReceiveController extends BaseController { @PostMapping("setCodeBack") public AjaxResult setCodeBack(@RequestBody BackApplyInfo record) { try { - int res =backReceiveService.setCodeBack(record); - if (res>0){ + int res = backReceiveService.setCodeBack(record); + if (res > 0) { return AjaxResult.success("接收成功"); - }else if (res==-1){ + } else if (res == -1) { return AjaxResult.error("该编码已接收"); - }else { + } else { return AjaxResult.error("接收失败"); } } catch (Exception e) { @@ -112,12 +112,12 @@ public class BackReceiveController extends BaseController { @PostMapping("setRfidCodeBack") public AjaxResult setRfidCodeBack(@RequestBody BackApplyInfo record) { try { - int res =backReceiveService.setRfidCodeBack(record); - if (res>0){ + int res = backReceiveService.setRfidCodeBack(record); + if (res > 0) { return AjaxResult.success("接收成功"); - }else if (res==-1){ + } else if (res == -1) { return AjaxResult.error("该RFID编码已接收"); - }else { + } else { return AjaxResult.error("接收失败"); } } catch (Exception e) { @@ -129,10 +129,10 @@ public class BackReceiveController extends BaseController { @PostMapping("endBack") public AjaxResult endBack(@RequestBody BackApplyInfo record) { try { - int res =backReceiveService.endBack(record); - if (res>0){ + int res = backReceiveService.endBack(record); + if (res > 0) { return AjaxResult.success("接收成功"); - }else { + } else { return AjaxResult.error("接收失败"); } } catch (Exception e) { @@ -144,8 +144,8 @@ public class BackReceiveController extends BaseController { @PostMapping("codeQuery") public AjaxResult codeQuery(@RequestBody BackApplyInfo record) { try { - List list =backReceiveService.codeQuery(record); - return AjaxResult.success(list); + List list = backReceiveService.codeQuery(record); + return AjaxResult.success(list); } catch (Exception e) { throw new RuntimeException(e); } @@ -155,7 +155,7 @@ public class BackReceiveController extends BaseController { @PostMapping("qrcodeQuery") public AjaxResult qrcodeQuery(@RequestBody BackApplyInfo record) { try { - List list =backReceiveService.qrcodeQuery(record); + List list = backReceiveService.qrcodeQuery(record); return AjaxResult.success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -166,7 +166,7 @@ public class BackReceiveController extends BaseController { @PostMapping("rfidCodeQuery") public AjaxResult rfidCodeQuery(@RequestBody BackApplyInfo record) { try { - List list =backReceiveService.rfidCodeQuery(record); + List list = backReceiveService.rfidCodeQuery(record); return AjaxResult.success(list); } catch (Exception e) { throw new RuntimeException(e); @@ -177,7 +177,7 @@ public class BackReceiveController extends BaseController { @PostMapping("backReceiveRecord") public AjaxResult backReceiveRecord(@RequestBody BackApplyInfo record) { try { - List list =backReceiveService.backReceiveRecord(record); + List list = backReceiveService.backReceiveRecord(record); return AjaxResult.success(list); } catch (Exception e) { throw new RuntimeException(e); From 6fd2b89fe82b29982179f8e26262f4ee7cc19fc4 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 2 Apr 2024 15:23:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/LeaseOutDetailsController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index 4af94772..b0593c71 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.app.controller; +import cn.hutool.core.collection.CollUtil; import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.service.LeaseOutDetailsService; @@ -140,7 +141,11 @@ public class LeaseOutDetailsController extends BaseController { @Log(title = "领料出库", businessType = BusinessType.UPDATE) @PostMapping("/submitOutRfid") public AjaxResult submitOutRfid(@RequestBody List recordList) { - return leaseOutDetailsService.submitOutRfid(recordList); + if (CollUtil.isEmpty(recordList)){ + return AjaxResult.error("请选择要出库的机具"); + }else { + return leaseOutDetailsService.submitOutRfid(recordList); + } }