From d16be6ca4691e2f40f6b23991c41cd828b075e47 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Tue, 26 Mar 2024 13:52:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?int=E5=90=8C=E7=B1=BB=E5=9E=8B=E6=AF=94?= =?UTF-8?q?=E8=BE=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/auth/service/SysPasswordService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysPasswordService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysPasswordService.java index de5a1d8d..97e111b8 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysPasswordService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysPasswordService.java @@ -46,7 +46,7 @@ public class SysPasswordService { retryCount = 0; } - if (retryCount >= Integer.valueOf(maxRetryCount).intValue()) { + if (retryCount >= maxRetryCount) { String errMsg = String.format("密码输入错误%s次，帐户锁定%s分钟", maxRetryCount, lockTime); recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, errMsg); throw new ServiceException(errMsg); From 2881cb0204d2d2b35c744a2b88cf79759fd9105f Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Tue, 26 Mar 2024 13:53:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?int=E7=B1=BB=E5=9E=8B=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java index 216500a5..808e262a 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java @@ -660,7 +660,7 @@ public class DateTimeHelper { Date now = new Date(); System.out.println("当前时间：" + sdf.format(now)); //30分钟 - long time = 30 * 60 * 1000; + int time = 30 * 60 * 1000; //30分钟后的时间 Date afterDate = new Date(now.getTime() + time); System.out.println(sdf.format(afterDate)); From 6dd04121b7008bb4df389f18b63f3ffd34e9f410 Mon Sep 17 00:00:00 2001 From: FrancisHu <2756004617@qq.com> Date: Tue, 26 Mar 2024 16:24:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?3.26=E6=96=B0=E5=A2=9E=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/api/store/putInStore.js | 64 ++ .../views/store/warehousing/putInStore.vue | 583 ++++++++++++++++++ sgzb-ui/vue.config.js | 21 +- 3 files changed, 653 insertions(+), 15 deletions(-) create mode 100644 sgzb-ui/src/api/store/putInStore.js create mode 100644 sgzb-ui/src/views/store/warehousing/putInStore.vue diff --git a/sgzb-ui/src/api/store/putInStore.js b/sgzb-ui/src/api/store/putInStore.js new file mode 100644 index 00000000..ef49fedb --- /dev/null +++ b/sgzb-ui/src/api/store/putInStore.js @@ -0,0 +1,64 @@ +import request from '@/utils/request' + +//机具退料入库 +export function getReturnOfMaterialsInfoAll(query) { + return request({ + url: '/material/returnOfMaterialsInfo/getReturnOfMaterialsInfoAll', + method: 'get', + params: query + }) + } + + +//机具退料入库--机具类型，规格型号下拉数据 +export function getTypeList(query) { + return request({ + url: '/material/returnOfMaterialsInfo/getTypeList', + method: 'get', + params: query + }) + } + + +//修试后入库--列表 +export function getRepairedList(data) { + return request({ + url: '/material/RepairTestInput/getRepairedList', + method: 'get', + params: data + }) + } + +//修试后入库--详情 +export function getRepairedDetailList(data) { + return request({ + url: '/material//RepairTestInput/getRepairedDetailList', + method: 'get', + params: data + }) + } + //修试后入库--审核 +export function inputByType(data) { + return request({ + url: '/material/RepairTestInput/inputByType', + method: 'post', + data: data + }) + } + + + + + + + + + + + + + + + + + diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue new file mode 100644 index 00000000..a6acabf7 --- /dev/null +++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue @@ -0,0 +1,583 @@ + + + + \ No newline at end of file diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index d301597a..7c7f517d 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -35,25 +35,16 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - // target: `http://112.29.103.165:21626`,//线上环境-重庆 - // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由 + // target: `http://112.29.103.165:21626`,//线上环境-重庆 + target: `http://112.29.103.165:21624`,//线上环境-宁夏 // target: `http://192.168.0.14:21624`,//线上环境 // target: `http://1.12.248.179:23028`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - - target: `http://10.40.92.12:8080`,//超 - // target: `http://10.40.92.253:8080`,//韩 - // target: `http://10.40.92.209:8080`,//川/ - - //******** 注意事项 ********* */ - //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址; - //qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=' - //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址，打开大屏项目config/index.js更改请求地址，大屏打包node<16.0.0; - //3.只有南网项目产线gl发布打包时候需要注意： - // 将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/; - //4. 重庆环境的时候需要将新增领料申请跳转地址改为claimAndRefund/receive/receiveApplyAddByCq - //******** 注意事项 ********* */ + + // target: `http://10.40.92.14:8080`,//超 + // target: `http://10.40.92.12:8080`,//韩 + // target: `http://10.40.92.209:8080`,//川 changeOrigin: true, pathRewrite: { From 696380cec65b6f060e6c8039f20f3e9d6dc30765 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 26 Mar 2024 17:31:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/auth/service/SysLoginService.java | 2 +- .../resources/mapper/material/BackApplyMapper.xml | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 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 461d85aa..b78e3d28 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 @@ -268,7 +268,7 @@ public class SysLoginService { } - // 生成一个随时length位数密码 + // 生成一个随机length位数密码 public static String generateRandomPassword(int length) { String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; Random random = new Random(); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index d727237e..8e25b0ef 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -703,7 +703,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bagi.agreement_id as agreementId, bai.`status` as `status`, bad.id as detailsId, - bad.pre_num AS num + bad.pre_num AS num, + IFNULL( aa.num, 0 ) AS useNum FROM back_apply_details bad LEFT JOIN back_apply_info bai ON bai.id = bad.parent_id @@ -713,6 +714,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_project_lot lot ON lot.lot_id = bagi.project_id LEFT JOIN bm_unit_info unit ON unit.unit_id = bagi.unit_id LEFT JOIN ma_type mt ON mt.type_id = bad.type_id + LEFT JOIN ( + SELECT + SUM( sai.num ) AS num, sai.type_id FROM slt_agreement_info sai + WHERE + sai.`status` = '0' + + AND sai.agreement_id = #{agreementId} + + GROUP BY sai.type_id + ) aa ON aa.type_id = mt.type_id LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id From 85cb92670f3531e0078a4d9d659cb9cd108e82ce Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Tue, 26 Mar 2024 18:06:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/domain/SecondaryWarehouse.java | 14 ++- .../sgzb/material/domain/TeamLeaseInfo.java | 16 ++- .../mapper/SecondaryWarehouseMapper.java | 7 ++ .../impl/SecondaryWarehouseServiceImpl.java | 7 ++ .../material/SecondaryWarehouseMapper.xml | 118 +++++++++++------- .../secondStore/secondStore.vue | 68 +++++----- 6 files changed, 148 insertions(+), 82 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondaryWarehouse.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondaryWarehouse.java index 1dbe63dc..2532ce6b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondaryWarehouse.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondaryWarehouse.java @@ -40,6 +40,18 @@ public class SecondaryWarehouse { */ @Excel(name = "单位名称") private String unitName; + + /** + * 工程id + */ + private String proId; + + /** + * 工程名称 + */ + @Excel(name = "工程") + private String proName; + /** * 工程名称 */ @@ -90,5 +102,5 @@ public class SecondaryWarehouse { private String nuitName; private String keyword; - + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfo.java index 52e779be..8472d83e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfo.java @@ -32,15 +32,25 @@ public class TeamLeaseInfo { */ private String startTime; private String endTime; - /** - * - */ private String companyId; + /** + * 协议id + */ + private String agreementId; /** * 单位名称 */ @Excel(name = "单位名称") private String unitName; + /** + * 工程id + */ + private String proId; + /** + * 工程名称 + */ + @Excel(name = "工程名称") + private String proName; /** * 工程名称 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java index 6b01efc9..235750cb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java @@ -25,4 +25,11 @@ public interface SecondaryWarehouseMapper { List getRecordsThree(TeamLeaseInfo bean); List getRecordsFour(TeamLeaseInfo bean); + + /** + * 查看退库操作详情 + * @param bean + * @return + */ + List getRecordsFive(TeamLeaseInfo bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java index 5c6e4f97..9bb8fe77 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java @@ -44,13 +44,20 @@ public class SecondaryWarehouseServiceImpl implements SecondaryWarehouseService public List getRecords(TeamLeaseInfo bean) { List list = new ArrayList<>(); if (STRING_1.equals(bean.getQueryType())){ + //进场数量 list = mapper.getRecordsOne(bean); } else if (STRING_2.equals(bean.getQueryType())) { + //退场数量 list = mapper.getRecordsTwo(bean); } else if (STRING_3.equals(bean.getQueryType())) { + //场内库存 list = mapper.getRecordsThree(bean); } else if (STRING_4.equals(bean.getQueryType())) { + //已出库数量 list = mapper.getRecordsFour(bean); + } else if (STRING_5.equals(bean.getQueryType())) { + //已退库数量 + list = mapper.getRecordsFive(bean); } else { throw new ServiceException("查询出错"); } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml index 106e8f71..488bfbfc 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml @@ -4,36 +4,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - insert into team_lease_info (type_id,team_name,lease_man,phone,num,create_by,create_time,type) - values (#{typeId},#{teamName},#{leaseMan},#{phone},#{num},#{createBy},now(),#{type}); + insert into team_lease_info (agreement_id,type_id,team_name,lease_man,phone,num,create_by,create_time,type) + values (#{agreementId},#{typeId},#{teamName},#{leaseMan},#{phone},#{num},#{createBy},now(),#{type}); +