From 5fd5f364116d0035077129876433fb4da3c46d14 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Mon, 1 Apr 2024 10:22:28 +0800 Subject: [PATCH 1/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 --- .../java/com/bonus/sgzb/app/controller/TmTaskController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index d565a1b7..d0c215aa 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -493,6 +493,7 @@ public class TmTaskController extends BaseController { Long userid = SecurityUtils.getLoginUser().getUserid(); task.setUserId(String.valueOf(userid)); } + List leaseAuditList = tmTaskService.getLeaseOutListByUser(task); List tmTaskDtos = Convert.toList(TmTaskDto.class, leaseAuditList); ExcelUtil util = new ExcelUtil(TmTaskDto.class); From 2a649e921e288e84b936a40a1d04f93ec67e15e0 Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Mon, 1 Apr 2024 10:24:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/dashboard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-ui/src/views/dashboard.vue b/sgzb-ui/src/views/dashboard.vue index 007d10cb..4f6f40d3 100644 --- a/sgzb-ui/src/views/dashboard.vue +++ b/sgzb-ui/src/views/dashboard.vue @@ -16,7 +16,7 @@ }, methods: { openNewWindow() { - window.open('http://112.29.103.165:21624/index01.html?token='+localStorage.getItem('token'), '_blank'); + window.open('http://112.29.103.165:21626/index01.html?token='+localStorage.getItem('token'), '_blank'); } } }; From 6b029e51efa82ced748b81a829fc4afe5d3b9558 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Mon, 1 Apr 2024 15:43:18 +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 --- .../com/bonus/sgzb/base/api/domain/LeaseOutDetails.java | 4 +++- .../src/main/java/com/bonus/sgzb/app/domain/TmTask.java | 5 +++++ .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java | 3 +++ .../src/main/resources/mapper/app/TmTaskMapper.xml | 7 +++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java index ba3ec9a2..764b3b95 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java @@ -153,7 +153,9 @@ public class LeaseOutDetails implements Serializable { */ @ApiModelProperty(value = "数据所属组织") private Integer companyId; - @ApiModelProperty(value = "出库类型") + @ApiModelProperty(value = "出库类型 0编码出库 1数量出库") private Integer manageType; + @ApiModelProperty(value = "数量出库-出库数量") + private Integer inputNum; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index 4a91114c..eaab5730 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -59,6 +59,11 @@ public class TmTask implements Serializable { */ @ApiModelProperty(value="已出库数量") private Integer alNum; + /** + * 库存 + */ + @ApiModelProperty(value="库存") + private Integer num; /** * 编号 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 90ff9047..de5a7849 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 @@ -147,6 +147,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { // 1、判断是否重复提交 res = checkRepeatSubmit(record); if (res > 0) { + if (record.getManageType() == 1 && record.getInputNum() != null) { + record.setOutNum(record.getInputNum().doubleValue()); + } //2、判断库存是否足够 res = checkStorageNum(record); if (res > 0) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index fd87eabe..5487ffd8 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -945,6 +945,7 @@ mt2.type_name as typeName, mt.type_name as typeModelName, mt.manage_type as manageType, + mt.num as num, su.user_name as userName, lad.type_id as typeId FROM @@ -959,5 +960,11 @@ and mtk.user_id = #{userId} + + and su.user_name = #{userName} + + + and lad.type_id = #{typeId} +