From f94470a742d56c596e17eebd6931c5b8e2a5fad0 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Mon, 22 Apr 2024 18:58:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95app=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/auth/service/SysLoginService.java | 2 ++ sgzb-auth/src/main/resources/bootstrap.yml | 6 ++--- sgzb-gateway/src/main/resources/bootstrap.yml | 6 ++--- .../app/controller/BackReceiveController.java | 2 ++ .../bonus/sgzb/app/domain/BackApplyInfo.java | 1 + .../sgzb/app/mapper/BackReceiveMapper.java | 4 ++- .../service/impl/BackReceiveServiceImpl.java | 25 +++++++++--------- .../impl/LeaseOutDetailsServiceImpl.java | 9 ++++++- .../app/service/impl/TmTaskServiceImpl.java | 2 +- .../sgzb/base/mapper/MaLabelBindMapper.java | 4 +++ .../src/main/resources/bootstrap.yml | 6 ++--- .../mapper/app/BackApplyAppMapper.xml | 1 + .../mapper/app/BackReceiveMapper.xml | 10 +++---- .../resources/mapper/app/TmTaskMapper.xml | 26 +++++++++++++++++++ .../mapper/base/MaLabelBindMapper.xml | 10 +++++++ .../material/SgzbMaterialApplication.java | 2 +- .../service/impl/BackApplyServiceImpl.java | 1 + .../impl/SltAgreementInfoServiceImpl.java | 2 ++ .../src/main/resources/bootstrap.yml | 6 ++--- .../src/main/resources/bootstrap.yml | 6 ++--- 20 files changed, 92 insertions(+), 39 deletions(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index b78e3d28..0ff43bbd 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -272,6 +272,8 @@ public class SysLoginService { public static String generateRandomPassword(int length) { String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; Random random = new Random(); + + StringBuilder password = new StringBuilder(); for (int i = 0; i < length; i++) { diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml index 9e325d85..e8b1c5d3 100644 --- a/sgzb-auth/src/main/resources/bootstrap.yml +++ b/sgzb-auth/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9200 + port: 29200 # Spring spring: @@ -14,11 +14,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml index f58aa706..2968520f 100644 --- a/sgzb-gateway/src/main/resources/bootstrap.yml +++ b/sgzb-gateway/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 8080 + port: 28080 # Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问 management: @@ -27,11 +27,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml 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 9ea59c53..01851002 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 @@ -140,6 +140,8 @@ public class BackReceiveController extends BaseController { return AjaxResult.success("接收成功"); } else if (res == -1) { return AjaxResult.error("该编码已接收"); + } else if (res == -2) { + return AjaxResult.error("已超出退料数量！！"); } else { return AjaxResult.error("接收失败"); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index 1e436d51..4ee721dc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -165,6 +165,7 @@ public class BackApplyInfo { private List backApplyDetails; private Integer parentId; private String sdStatus; + private String sdId; /** * 二维码编码 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index 35b375c9..c6f69ca0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -160,7 +160,7 @@ public interface BackReceiveMapper { * @param record * @return List */ - BackApplyInfo backReceiveRecord(BackApplyInfo record); + List backReceiveRecord(BackApplyInfo record); /** * 查询 @@ -194,4 +194,6 @@ public interface BackReceiveMapper { int deleteCheckDetails(BackApplyInfo backApplyInfo); List getMaId(BackApplyInfo backApplyInfo); + + int selectNumByTypeId(@Param("parentId")Integer parentId,@Param("typeId") String typeId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index e55457d6..9a39c3c6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -108,14 +108,20 @@ public class BackReceiveServiceImpl implements BackReceiveService { BackApplyInfo[] arr = record.getArr(); if (arr.length > 0) { for (int i = 0; i < arr.length; i++) { + //判断是否超出审核数量 + int re = backReceiveMapper.selectNumByTypeId(arr[i].getParentId(), arr[i].getTypeId()); + if (re <= 0) { + res = -2; + break; + } //根据maId和taskId查询是否已接收 - int re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId()); + re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId()); if (re > 0) { res = -1; break; } } - if (res == -1) { + if (res < 0) { return res; } } @@ -123,7 +129,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { //修改任务状态 res = updateTaskStatus(taskId, 39); if (res == 0) { - throw new RuntimeException("插入back_check_details异常"); + throw new RuntimeException("修改updateTaskStatus异常"); } //插入back_check_details res = insertBcd(record); @@ -239,16 +245,9 @@ public class BackReceiveServiceImpl implements BackReceiveService { @Override public List backReceiveRecord(BackApplyInfo record) { - String typeId = record.getTypeId(); - String[] split = typeId.split(","); - List backApplyInfoList = new ArrayList<>(); - for (String s : split) { - record.setTypeId(s); - BackApplyInfo backApplyInfo = backReceiveMapper.backReceiveRecord(record); - if (backApplyInfo != null) { - backApplyInfoList.add(backApplyInfo); - } - } + + List backApplyInfoList = backReceiveMapper.backReceiveRecord(record); + return backApplyInfoList; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 7cb5c71f..66052870 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -92,13 +92,17 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { if (CollUtil.isEmpty(maMachineByMaIdAndMaCode)) { maMachine.setCreateTime(new Date()); int i = maMachineMapper.maMachineAdd(maMachine); + String labelCode = maMachine.getQrCode(); MaLabelBind maLabelBinds = maLabelBindMapper.selectMaLabelBindByMaCode(maMachine); if (maLabelBinds != null) { + MaLabelBindVO maLabelBind = new MaLabelBindVO(); maLabelBind.setTypeId(maMachine.getTypeId()); maLabelBind.setBindTime(new Date().toString()); + maLabelBind.setBinder(SecurityUtils.getLoginUser().getUsername()); maLabelBindMapper.updateMaLabelBind(maLabelBind); + return 0; } else { MaLabelBind maLabelBind = new MaLabelBind(); @@ -106,10 +110,13 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { maLabelBind.setMaId(maMachine.getMaId()); maLabelBind.setTypeId(maMachine.getTypeId()); maLabelBind.setBindTime(new Date()); + maLabelBind.setBinder(SecurityUtils.getLoginUser().getUsername()); maLabelBind.setStatus("1"); maLabelBind.setLabelType(9); maLabelBindMapper.insertLabelBind(maLabelBind); + maLabelBindMapper.updateMalableCode(maLabelBind); + maLabelBindMapper.updateMatypeNum(maLabelBind); return 0; } } else { @@ -185,7 +192,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return AjaxResult.error("您已提交，请勿重复点击"); } } catch (Exception e) { - log.error(e.getMessage()); + e.printStackTrace(); return AjaxResult.error("出库失败"); } return AjaxResult.success("出库成功"); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index d8e6a413..54db21d3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -1055,7 +1055,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } catch (Exception e) { log.error(e.getMessage(), e); - e.printStackTrace(); + } return res; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java index 95600b21..736013a4 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java @@ -90,4 +90,8 @@ public interface MaLabelBindMapper int insertLabelBind(MaLabelBind maLabelBind); MaLabelBind selectMaLabelBindByMaCode(MaMachine maMachine); + + void updateMalableCode(MaLabelBind maLabelBind); + + void updateMatypeNum(MaLabelBind maLabelBind); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml index d91e9508..e778cf56 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9301 + port: 29301 # Spring spring: @@ -21,11 +21,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml index 00a9176f..cc6eadb2 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml @@ -483,6 +483,7 @@ - + select count(*) from tm_task where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{date},'%y%m') and task_type = #{taskType}