From 0c1228234bc183fec1ac4dac35a1a3484aa5d488 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Thu, 18 Sep 2025 10:49:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E9=A2=86=E6=96=99?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialLeaseInfoController.java | 18 ++++++++++++++ .../clz/mapper/MaterialLeaseInfoMapper.java | 4 ++++ .../clz/service/MaterialLeaseInfoService.java | 2 ++ .../impl/MaterialLeaseInfoServiceImpl.java | 24 +++++++++++++++++++ .../material/clz/MaterialLeaseInfoMapper.xml | 18 ++++++++++++-- 5 files changed, 64 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java index 856e0f49..9caf8837 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/MaterialLeaseInfoController.java @@ -66,6 +66,24 @@ public class MaterialLeaseInfoController extends BaseController { return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } + /** + * 领料任务添加备注 + * @param leaseApplyInfo + * @return + */ + @ApiOperation(value = "新增领料任务") + @PreventRepeatSubmit + @SysLog(title = "领料任务", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增领料任务") + @PostMapping("/addRemark") + public AjaxResult addRemark(@NotNull(message = "领料任务不能为空") @RequestBody MaterialLeaseApplyInfo leaseApplyInfo) { + try { + return materialLeaseInfoService.updateLeaseRemark(leaseApplyInfo); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } + + /** * 查询总站点领料详情数据 * @param leaseApplyInfo diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialLeaseInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialLeaseInfoMapper.java index 999499e2..f964dc23 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialLeaseInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/mapper/MaterialLeaseInfoMapper.java @@ -392,4 +392,8 @@ public interface MaterialLeaseInfoMapper { * @return */ List getSltInfoList(Long id); + + void updateLeaseRemarkLY(MaterialLeaseApplyInfo leaseApplyInfo); + + void updateLeaseRemarkLL(MaterialLeaseApplyInfo leaseApplyInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialLeaseInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialLeaseInfoService.java index b45fc5c2..81e2fbbb 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialLeaseInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/MaterialLeaseInfoService.java @@ -158,4 +158,6 @@ public interface MaterialLeaseInfoService { * @return */ AjaxResult getInfoByCode(BmQrcodeInfo bmQrcodeInfo); + + AjaxResult updateLeaseRemark(MaterialLeaseApplyInfo leaseApplyInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java index 0523ed15..6cdeaad4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java @@ -329,6 +329,30 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { return allowedRoles.stream().anyMatch(userRoles::contains); } + /** + * 领料任务添加备注 + * + * @param leaseApplyInfo + * @return + */ + @Override + public AjaxResult updateLeaseRemark(MaterialLeaseApplyInfo leaseApplyInfo) { + try { + + if(leaseApplyInfo.getPublishTask()!=null && !leaseApplyInfo.getPublishTask().isEmpty()){ + //领用修改备注 + materialLeaseInfoMapper.updateLeaseRemarkLY(leaseApplyInfo); + }else{ + //领料修改备注 + materialLeaseInfoMapper.updateLeaseRemarkLL(leaseApplyInfo); + } + return AjaxResult.success(); + } catch (Exception e) { + return AjaxResult.error("添加备注失败"); + } + + } + /** * 查询总站点领料详情数据 * diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml index f0229914..14d05c45 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml @@ -373,6 +373,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" parent_id = #{record.parentId} and type_id = #{record.typeId} + + update lease_publish_details + set remark = #{remark} + where parent_id = #{id} and publish_task = #{publishTask} + + + + update lease_apply_info + set remark = #{remark} + where id = #{id} + + delete from clz_lease_apply_details where parent_id = #{id} @@ -453,7 +465,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tt.task_type as taskType, bp.external_id AS externalId, bu.bzz_idcard AS idCard, - bp.imp_unit AS impUnit + bp.imp_unit AS impUnit, + lai.remark as remark from lease_apply_info lai left join tm_task tt on lai.task_id = tt.task_id @@ -1099,7 +1112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tt.task_type AS taskType, bp.external_id AS externalId, bu.bzz_idcard AS idCard, - bp.imp_unit AS impUnit + bp.imp_unit AS impUnit, + lpd.remark as remark FROM lease_publish_details lpd LEFT JOIN lease_apply_info lai ON lai.id = lpd.parent_id