From 66d8e2eb12b13d33cfafebdfbbb6d896cc9dcb5e Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 12 Dec 2023 19:20:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrapJob/vo/ScrapJobDetailPageReqVO.java | 3 +++ .../vo/ScrapRecordDetailExportReqVO.java | 3 +++ .../vo/ScrapRecordDetailPageReqVO.java | 3 +++ .../ScrapRequestMainController.java | 8 ++++---- .../scrapRequest/vo/ScrapRequestImportVO.java | 7 +++---- .../scrapRequest/ScrapRequestMainConvert.java | 4 +--- .../scrapRecord/ScrapRecordMainDO.java | 4 ++-- .../mysql/scrapJob/ScrapJobDetailMapper.java | 1 + .../scrapRecord/ScrapRecordDetailMapper.java | 2 ++ .../scrapJob/ScrapJobMainServiceImpl.java | 11 +++++++---- .../ScrapRecordMainServiceImpl.java | 19 +++++++++---------- .../ScrapRequestMainServiceImpl.java | 4 ++-- 12 files changed, 40 insertions(+), 29 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailPageReqVO.java index 0c2ccaf4..99205099 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailPageReqVO.java @@ -72,4 +72,7 @@ public class ScrapJobDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; + @Schema(description = "主键ID") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java index 165c1f4c..6483b012 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java @@ -91,4 +91,7 @@ public class ScrapRecordDetailExportReqVO { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主键ID") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailPageReqVO.java index 4ba0b106..8dd62a80 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailPageReqVO.java @@ -93,4 +93,7 @@ public class ScrapRecordDetailPageReqVO extends PageParam { @Schema(description = "任务明细ID") private String jobDetailId; + @Schema(description = "主键ID") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java index eec1c957..73abd2a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java @@ -102,7 +102,7 @@ public class ScrapRequestMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得报废出库分页") @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:query')") public CommonResult> getScrapRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = scrapRequestMainService.getScrapRequestMainSenior(conditions); @@ -116,17 +116,17 @@ public class ScrapRequestMainController { } @GetMapping("/get-import-template") - @Operation(summary = "获得导入制品报废申请信息模板") + @Operation(summary = "获得报废出库基本信息模板") public void importTemplate(HttpServletResponse response) throws IOException { List list = new ArrayList<>(); Map mapDropDown = new HashMap<>(); String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(7, uom); - ExcelUtils.write(response, "制品报废申请信息导入模板.xlsx", "制品报废申请信息列表", ScrapRequestImportVO.class, list,mapDropDown); + ExcelUtils.write(response, "报废出库申请信息导入模板.xlsx", "报废出库申请信息列表", ScrapRequestImportVO.class, list,mapDropDown); } @PostMapping("/import") - @Operation(summary = "导入制品报废申请基本信息") + @Operation(summary = "导入报废出库请基本信息") @Parameters({ @Parameter(name = "file", description = "Excel 文件", required = true), @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"), diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestImportVO.java index 9ba3c599..9b4c296d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestImportVO.java @@ -3,6 +3,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; import com.win.module.wms.enums.DictTypeConstants; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -24,13 +25,12 @@ import java.time.LocalDateTime; @Accessors(chain = false) // 设置 chain = false，避免用户导入有问题 public class ScrapRequestImportVO { - @ExcelProperty("单据号") - private String number; + @ExcelProperty("从仓库代码") + private String fromWarehouseCode; @ExcelProperty("截止时间") private LocalDateTime dueTime; - @ExcelProperty("零件号") @NotBlank(message = "物品代码不能为空") private String itemCode; @@ -44,7 +44,6 @@ public class ScrapRequestImportVO { @ExcelProperty("批次") private String batch; - @ExcelProperty("数量") private BigDecimal qty; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/scrapRequest/ScrapRequestMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/scrapRequest/ScrapRequestMainConvert.java index 215784bb..847722cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/scrapRequest/ScrapRequestMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/scrapRequest/ScrapRequestMainConvert.java @@ -29,9 +29,7 @@ import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO; public interface ScrapRequestMainConvert { ScrapRequestMainConvert INSTANCE = Mappers.getMapper(ScrapRequestMainConvert.class); - @Mappings({ - @Mapping(source = "mainVo.number", target = "number"), - }) + ScrapRequestImportErrorVO convert(ScrapRequestMainCreateReqVO mainVo, ScrapRequestDetailDO detailDo); ScrapRequestMainDO convert(ScrapRequestMainBaseVO bean); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordMainDO.java index e43156e7..b94b307a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordMainDO.java @@ -27,8 +27,8 @@ public class ScrapRecordMainDO extends BaseDO { /** * id */ - @TableId(type = IdType.INPUT) - private String id; + @TableId + private Long id; /** * 申请单号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java index 510a1f33..17155a23 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java @@ -41,6 +41,7 @@ public interface ScrapJobDetailMapper extends BaseMapperX { .eqIfPresent(ScrapJobDetailDO::getRemark, reqVO.getRemark()) .betweenIfPresent(ScrapJobDetailDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(ScrapJobDetailDO::getCreator, reqVO.getCreator()) + .eqIfPresent(ScrapJobDetailDO::getMasterId, reqVO.getMasterId()) .orderByDesc(ScrapJobDetailDO::getId)); } default PageResult selectSenior(CustomConditions conditions) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java index c47d03ca..47ed7bab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java @@ -47,6 +47,7 @@ public interface ScrapRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { @@ -79,6 +80,7 @@ public interface ScrapRecordDetailMapper extends BaseMapperX getScrapJobMainList(ScrapJobMainExportReqVO exportReqVO) { return scrapJobMainMapper.selectList(exportReqVO); } + @Override public ScrapJobMainDO scrapJobMainDoStatusRight(String pnumber, String pstatus) { QueryWrapper queryWrapper = new QueryWrapper(); @@ -159,6 +160,7 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { return map; } + @Transactional @Override public int acceptScrapJobMain(Long id) { ScrapJobMainDO acceptJobMainDO = this.validateScrapJobMainExists(id); @@ -176,6 +178,7 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { return scrapJobMainMapper.updateById(acceptJobMainDO); } + @Transactional @Override public int abandonScrapJobMain(Long id) { ScrapJobMainDO acceptJobMainDO = this.validateScrapJobMainExists(id); @@ -191,6 +194,7 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { return scrapJobMainMapper.updateById(acceptJobMainDO); } + @Transactional @Override public int closeScrapJobMain(Long id) { ScrapJobMainDO acceptJobMainDO = this.validateScrapJobMainExists(id); @@ -203,6 +207,7 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { return scrapJobMainMapper.updateById(acceptJobMainDO); } + @Transactional @Override public String executeScrapJobMain(ScrapJobMainUpdateReqVO updateReqVO) { // 查询任务主表与子表 @@ -248,8 +253,6 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { // 创建报废出库记录明细 List reqSubList = updateReqVO.getSubList(); List scrapRecordDetailDOList = new ArrayList<>(); - - List scrapRequestDetailCreateReqVOList = new ArrayList<>(); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); for(ScrapJobDetailDO scrapJobDetailDO:subList) { @@ -281,7 +284,7 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { BeanUtils.copyProperties(scrapJobDetailDO, transactionCreateReqVO); //增加业务类型 transactionCreateReqVO.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(scrapJobMainDO.getBusinessType()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java index ffa916b7..7328432c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java @@ -1,24 +1,23 @@ package com.win.module.wms.service.scrapRecord; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainPageReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainUpdateReqVO; +import com.win.module.wms.convert.scrapRecord.ScrapRecordMainConvert; +import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordMainDO; +import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordMainMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.scrapRecord.ScrapRecordMainConvert; -import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.SCRAP_RECORD_MAIN_NOT_EXISTS; /** * 报废出库记录主 Service 实现类 @@ -38,7 +37,7 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService { ScrapRecordMainDO scrapRecordMain = ScrapRecordMainConvert.INSTANCE.convert(createReqVO); scrapRecordMainMapper.insert(scrapRecordMain); // 返回 - return scrapRecordMain.getId(); + return String.valueOf(scrapRecordMain.getId()); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java index 9a8e31f5..234e46cb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java @@ -251,7 +251,7 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { for (ScrapRequestDetailDO scrapRequestDetailDO : subDOList) { validateDetailMethod(scrapRequestDetailDO, businesstypeDO, scrapRequestMainDO); } - String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_RECORD.getCode()); + String number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_REQUEST.getCode()); scrapRequestMainDO.setNumber(number); AdminUserRespDTO adminUserRespDTO = userApi.getUser(getLoginUserId()); scrapRequestMainDO.setDepartmentCode(String.valueOf(adminUserRespDTO.getDeptId())); @@ -439,7 +439,7 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { try{ LocationDO locationDO = validatorLocation(detailDo.getFromLocationCode()); mainDo.setFromAreaCodes(locationDO.getAreaCode()); - mainDo.setFromLocationTypes(locationDO.getCode()); + mainDo.setFromLocationTypes(locationDO.getType()); }catch (Exception ex) { message.append(ex.getMessage()).append(","); }