From 223f737ec3da6e075e71f30a3a91226b20bcad68 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Tue, 21 Jan 2025 16:37:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=8E=9F=E5=9B=A0=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../part/controller/partArrivedController.java | 9 +++++++++ .../part/mapper/PartArrivedMapper.java | 8 ++++++++ .../part/service/IPartArrivedService.java | 8 ++++++++ .../service/impl/PartArrivedServiceImpl.java | 18 ++++++++++++++++++ .../material/scrap/domain/ScrapReason.java | 2 +- .../service/impl/ScrapReasonServiceImpl.java | 6 +++--- .../mapper/material/part/PartArrivedMapper.xml | 13 +++++++++++++ .../material/scrap/ScrapReasonMapper.xml | 12 +++++------- 8 files changed, 65 insertions(+), 11 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/partArrivedController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/partArrivedController.java index e2eb5c65..d8a91865 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/partArrivedController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/controller/partArrivedController.java @@ -162,4 +162,13 @@ public class partArrivedController extends BaseController { return AjaxResult.success(list); } + /** + * 根据任务id查询入库单 + */ + @ApiOperation("根据任务id查询入库单") + //@RequiresPermissions("purchase:info:query") + @GetMapping(value = "/getInBoundForm") + public AjaxResult getInBoundForm( PartTypeQueryDto partTypeQueryDto) { + return success(partArrivedService.getInBoundForm(partTypeQueryDto)); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartArrivedMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartArrivedMapper.java index 0c969e9d..b1209ed2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartArrivedMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/mapper/PartArrivedMapper.java @@ -109,4 +109,12 @@ public interface PartArrivedMapper //删除附件文件相关任务文件 int deleteBmFileList(Long taskId); + + /** + * 获取入库单外层信息数据 + * + * @param partTypeQueryDto 外层信息 + * @return 外层信息 + */ + PartTypeCheckInfo getCheckInfoForm(PartTypeQueryDto partTypeQueryDto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/IPartArrivedService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/IPartArrivedService.java index f427407c..e5e70c7d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/IPartArrivedService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/IPartArrivedService.java @@ -72,4 +72,12 @@ public interface IPartArrivedService { * @return 查询附件列表 */ List getPartFilelist(BmPartFileInfo bmPartFileInfo); + + /** + * 根据任务id查询入库单 + * + * @param partTypeQueryDto 入库单 + * @return 入库单 + */ + PartTypeCheckDto getInBoundForm(PartTypeQueryDto partTypeQueryDto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java index b33d5b63..a4736969 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/part/service/impl/PartArrivedServiceImpl.java @@ -319,4 +319,22 @@ public class PartArrivedServiceImpl implements IPartArrivedService } return list; } + + /** + * 根据任务id查询入库单 + * + * @param partTypeQueryDto 入库单 + * @return 入库单 + */ + @Override + public PartTypeCheckDto getInBoundForm(PartTypeQueryDto partTypeQueryDto) { + PartTypeCheckInfo partTypeCheckInfo = partArrivedMapper.getCheckInfoForm(partTypeQueryDto); + PartTypeCheckDto PartTypeCheckDto = new PartTypeCheckDto(); + PartTypeCheckDto.setPartTypeCheckInfo(partTypeCheckInfo); + if(null != partTypeCheckInfo){ + List partTypeCheckDetailsList = partArrivedMapper.selectPartTypeCheckDetailsListByQueryDto(partTypeQueryDto); + PartTypeCheckDto.setPartTypeCheckDetailsList(partTypeCheckDetailsList); + } + return PartTypeCheckDto; + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapReason.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapReason.java index 069105ff..2d72b06b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapReason.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapReason.java @@ -73,7 +73,7 @@ public class ScrapReason extends BaseEntity { private Date updateTime; /** 备注 */ - @Excel(name = "备注", width = 40) +// @Excel(name = "备注", width = 40) @ApiModelProperty(value = "备注") private String remark; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapReasonServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapReasonServiceImpl.java index 224300f0..7d2b6072 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapReasonServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapReasonServiceImpl.java @@ -71,8 +71,8 @@ public class ScrapReasonServiceImpl implements IScrapReasonService { scrapReason.setCreateTime(DateUtils.getNowDate()); scrapReason.setUpdateTime(DateUtils.getNowDate()); - scrapReason.setCreateBy(SecurityUtils.getUsername()); - scrapReason.setUpdateBy(SecurityUtils.getUsername()); + scrapReason.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + scrapReason.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); try { return scrapReasonMapper.insertScrapReasonInfo(scrapReason); } catch (Exception e) { @@ -106,7 +106,7 @@ public class ScrapReasonServiceImpl implements IScrapReasonService public int updateScrapReasonInfo(ScrapReason scrapReason) { scrapReason.setUpdateTime(DateUtils.getNowDate()); - scrapReason.setUpdateBy(SecurityUtils.getUsername()); + scrapReason.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); try { return scrapReasonMapper.updateScrapReasonInfo(scrapReason); } catch (Exception e) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml index e2da0e4d..a2ce3f5f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/part/PartArrivedMapper.xml @@ -197,4 +197,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from bm_file_info bfi where task_id = #{taskId} and task_type = 13 + + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapReasonMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapReasonMapper.xml index 2504e45a..10d9f824 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapReasonMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapReasonMapper.xml @@ -20,11 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - update scrap_reason set type_id = #{typeId},