From c5a3725edfdde5d7e850fe7fbf56dda70ea6763e Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 2 Jul 2024 17:21:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=80=80=E6=96=99=E5=8D=95=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api/domain/LeaseOutDetails.java | 15 +++++++++++ .../controller/LeaseOutDetailsController.java | 12 +++++++++ .../sgzb/app/controller/TmTaskController.java | 2 +- .../sgzb/app/domain/LeaseApplyDetails.java | 6 +++++ .../app/mapper/LeaseOutDetailsMapper.java | 2 ++ .../app/service/LeaseOutDetailsService.java | 1 + .../impl/LeaseOutDetailsServiceImpl.java | 5 ++++ .../app/service/impl/TmTaskServiceImpl.java | 17 +++++++++++-- .../mapper/app/LeaseOutDetailsMapper.xml | 25 +++++++++++++++++++ .../resources/mapper/app/TmTaskMapper.xml | 12 ++++++--- 10 files changed, 90 insertions(+), 7 deletions(-) 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 83663a78..415b6cd1 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 @@ -67,6 +67,11 @@ public class LeaseOutDetails implements Serializable { */ @ApiModelProperty(value = "规格名称") private String typeName; + /** + * 规格名称 + */ + @ApiModelProperty(value = "规格型号") + private String typeModelName; /** * maId @@ -79,6 +84,16 @@ public class LeaseOutDetails implements Serializable { */ @ApiModelProperty(value = "机具编号") private String maCode; + /** + * 出库人 + */ + @ApiModelProperty(value = "出库人") + private String outPerson; + /** + * 领料人 + */ + @ApiModelProperty(value = "领料人") + private String leasePerson; /** * 协议ID 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 cc3e6951..827edf08 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 @@ -133,6 +133,18 @@ public class LeaseOutDetailsController extends BaseController { public AjaxResult submitOut(@RequestBody LeaseOutDetails record) { return leaseOutDetailsService.submitOut(record); } + /** + * 领料出库，出库单查询 + * + * @param parentId + */ + @Log(title = "出库单查询", businessType = BusinessType.MATERIAL) + @GetMapping("/getOutboundOrder") + public AjaxResult getOutboundOrder(String parentId) { + startPage(); + List outboundOrder = leaseOutDetailsService.getOutboundOrder(parentId); + return AjaxResult.success(getDataTable(outboundOrder)); + } /** * @param recordList 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 a5bc1629..8eeeb24d 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 @@ -541,7 +541,7 @@ public class TmTaskController extends BaseController { @PostMapping("/outboundCompleted") public AjaxResult outboundCompleted(@RequestBody TmTask task) { int i = tmTaskService.updateLeaseAuditListByOne(task); - if (i == 0) { + if (i > 0) { return AjaxResult.success(); } else { return AjaxResult.error(); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java index 4b943aad..dcbd0575 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java @@ -52,6 +52,12 @@ public class LeaseApplyDetails implements Serializable { @ApiModelProperty(value = "领料出库状态") private String statusName; + /** + * 车牌号 + */ + @ApiModelProperty(value = "领料出库状态") + private String carCode; + /** * 规格型号 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index a509fdaa..fa5c5572 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java @@ -107,4 +107,6 @@ public interface LeaseOutDetailsMapper { LeaseApplyDetails getLeaseApplyDetails(@Param("record") LeaseOutDetails record); int updateLeaseApplyDetails(@Param("record") LeaseOutDetails record); + + List getOutboundOrder(String parentId); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java index 85450ac3..c44c8e1a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java @@ -40,6 +40,7 @@ public interface LeaseOutDetailsService { * @return 结果 */ AjaxResult submitOut(LeaseOutDetails record); + List getOutboundOrder(String parentId); /** * 根据code编码查询设备信息 * @param maCode 机具编码 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 ece9bbc4..54502146 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 @@ -198,6 +198,11 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return AjaxResult.success("出库成功"); } + @Override + public List getOutboundOrder(String parentId) { + return leaseOutDetailsMapper.getOutboundOrder(parentId); + } + private int insertRecords(LeaseOutDetails record) { int res = 0; // 首先更新领料任务详情表的领料数及状态（lease_apply_details） 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 95b132d0..8dc8758d 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 @@ -7,10 +7,12 @@ import com.bonus.sgzb.app.domain.MachinePart; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper; import com.bonus.sgzb.app.mapper.LeaseApplyInfoMapper; +import com.bonus.sgzb.app.mapper.LeaseOutDetailsMapper; import com.bonus.sgzb.app.mapper.TmTaskMapper; import com.bonus.sgzb.app.service.*; import com.bonus.sgzb.base.api.domain.BmFlowRecord; import com.bonus.sgzb.base.api.domain.BmFlowRelation; +import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.common.core.constant.Constants; import com.bonus.sgzb.common.core.domain.R; import com.bonus.sgzb.common.core.enums.TaskStatusEnum; @@ -69,6 +71,8 @@ public class TmTaskServiceImpl implements TmTaskService { @Resource private LeaseUserBookService leaseUserBookService; + @Resource + private LeaseOutDetailsMapper leaseOutDetailsMapper; @Resource private BmFlowRecordService bmFlowRecordService; @@ -665,6 +669,7 @@ public class TmTaskServiceImpl implements TmTaskService { @Override public int updateLeaseAuditListByOne(TmTask task) { int i = tmTaskMapper.updateLeaseAuditListByOne(task); + int res = 0; if (i > 0) { int num = 0; List leaseApplyDetails = tmTaskMapper.getleaseDetailsStatus(task); @@ -680,9 +685,17 @@ public class TmTaskServiceImpl implements TmTaskService { tmTaskMapper.updateTmTaskAuditStatus(task); } } - return 0; + LeaseOutDetails leaseOutDetails = new LeaseOutDetails(); + leaseOutDetails.setParentId(Integer.valueOf(task.getId())); + leaseOutDetails.setTypeId(Integer.valueOf(task.getTypeId())); + leaseOutDetails.setCreateBy(task.getCreateBy()); + leaseOutDetails.setCreateTime(new Date()); + leaseOutDetails.setUpdateTime(new Date()); + leaseOutDetails.setOutNum(0.0); + res = leaseOutDetailsMapper.insertSelective(leaseOutDetails); + return res; } else { - return 1; + return res; } } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index ad3a9044..9cb398f1 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -450,4 +450,29 @@ parennt_id = #{record.parentId} AND type_id = #{record.typeId} + + \ No newline at end of file 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 4298c961..9319aa94 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 @@ -1039,7 +1039,7 @@ bui.unit_name AS unitName, lai.lease_person AS leasePerson, lai.phone AS leasePhone, - tt.create_by AS applyFor, + su.nick_name AS applyFor, d.`name` AS taskName, lai.lease_type AS leaseType, d.id AS examineStatusId, @@ -1051,6 +1051,7 @@ from lease_apply_info lai LEFT JOIN tm_task tt on lai.task_id = tt.task_id + LEFT JOIN sys_user su on lai.create_by = su.user_id LEFT JOIN sys_dic d ON d.id = tt.task_status LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id @@ -1197,7 +1198,7 @@ bui.unit_name AS unitName, lai.lease_person AS leasePerson, lai.phone AS leasePhone, - tt.create_by AS applyFor, + su.nick_name AS applyFor, d.`name` AS taskName, lai.lease_type AS leaseType, d.id AS examineStatusId, @@ -1209,6 +1210,7 @@ from lease_apply_info lai LEFT JOIN tm_task tt on lai.task_id = tt.task_id + LEFT JOIN sys_user su on lai.create_by = su.user_id LEFT JOIN sys_dic d ON d.id = tt.task_status LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id @@ -1302,7 +1304,7 @@ bui.unit_name AS unitName, lai.lease_person AS leasePerson, lai.phone AS leasePhone, - tt.create_by AS applyFor, + su.nick_name AS applyFor, d.`name` AS taskName, lai.lease_type AS leaseType, d.id AS examineStatusId, @@ -1314,6 +1316,7 @@ from lease_apply_info lai LEFT JOIN tm_task tt on lai.task_id = tt.task_id + LEFT JOIN sys_user su on lai.create_by = su.user_id LEFT JOIN sys_dic d ON d.id = tt.task_status LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id @@ -1346,7 +1349,7 @@ bui.unit_name AS unitName, lai.lease_person AS leasePerson, lai.phone AS leasePhone, - tt.create_by AS applyFor, + su.nick_name AS applyFor, d.`name` AS taskName, lai.lease_type AS leaseType, d.id AS examineStatusId, @@ -1358,6 +1361,7 @@ from lease_apply_info lai LEFT JOIN tm_task tt on lai.task_id = tt.task_id + LEFT JOIN sys_user su on lai.create_by = su.user_id LEFT JOIN sys_dic d ON d.id = tt.task_status LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id From e005116d3ecf09bcb7e79878f1783f70ca6f3781 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Wed, 3 Jul 2024 09:55:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=BA=9F=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E7=BB=B4=E4=BF=AE=E9=A1=B5=E9=9D=A2=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/app/BackReceiveMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index d83012e2..84bbf14f 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -1075,7 +1075,6 @@ mt.type_id AS typeId, mm.ma_code AS maCode, mm.ma_id AS maId, - bad.remark AS remark, sd.NAME AS maStatus FROM ma_type mt From e2115c867f66cff1812605b9af992d6bfa6170e7 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 3 Jul 2024 11:26:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E5=8F=91=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E4=BC=98=E5=85=88=E7=BA=A7=E6=9C=AA=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=EF=BC=8C=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A=E9=80=90=E7=BA=A7?= =?UTF-8?q?=E5=8F=91=E7=9F=AD=E4=BF=A1=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/app/controller/TmTaskController.java | 4 ++-- .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 8eeeb24d..e3330cec 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 @@ -271,7 +271,7 @@ public class TmTaskController extends BaseController { } else { return AjaxResult.error("创建任务失败"); } - UrgentProcessingUser urgentProcessingUser = new UrgentProcessingUser(); + /*UrgentProcessingUser urgentProcessingUser = new UrgentProcessingUser(); urgentProcessingUser.setCompanyId(Long.valueOf(task.getCompanyId())); urgentProcessingUser.setTaskTypeId(task.getTaskType()); urgentProcessingUser.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId()); @@ -300,7 +300,7 @@ public class TmTaskController extends BaseController { } } } - } + }*/ return AjaxResult.success("任务创建成功"); } catch (Exception e) { return AjaxResult.error("创建任务失败," + e.getCause().toString() + "," + e.getMessage()); 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 8dc8758d..73233f4b 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 @@ -199,7 +199,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } } - sendMessageToLeader(record); + //sendMessageToLeader(record); } else { // 先审核任务表 result += tmTaskMapper.updateTmTaskAuditStatus(record); @@ -223,7 +223,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } } - sendMessageToLeader(record); + //sendMessageToLeader(record); } } else { return 0; From 9a942b3d874da9a6af6a774130668043a047b6bf Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 3 Jul 2024 17:31:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/largeScreen/LargeScreenMapper.xml | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml index 9051a06f..f293805a 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml @@ -341,12 +341,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt2.type_name AS typeName, mt2.type_id AS typeId, mt.type_name AS typeModelName, - lod.out_num AS num, + SUM( lod.out_num ) AS num, lai.`code` AS materialCode, bui.unit_name AS unitName, bai.unit_id AS unitId, bpl.lot_id AS projectId, - su.user_name AS userName, + mt_full.userName AS userName, bpl.lot_name AS projectName, sd.dept_name AS companyName FROM @@ -354,8 +354,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt ON lod.type_id = mt.type_id AND mt.`level` = '4' LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id + LEFT JOIN ( + SELECT + mt.type_id, + mt.type_name, + GROUP_CONCAT( su.user_name ) AS userName + FROM + ma_type mt LEFT JOIN ma_type_keeper mtk ON mt.type_id = mtk.type_id LEFT JOIN sys_user su ON mtk.user_id = su.user_id + GROUP BY + mt.type_id, + mt.type_name + ) mt_full ON mt.type_id = mt_full.type_id LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id LEFT JOIN lease_apply_info lai ON lod.parent_id = lai.id LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id @@ -379,6 +390,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mt2.type_id = #{typeId} + GROUP BY + mt.type_id, + mt.type_name, + lai.`code`