Browse Source

补料记录

master
陈薪名 2 years ago
parent
commit
c1c6f9ce1a
  1. 22
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java
  2. 77
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java
  3. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailExportReqVO.java
  4. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailPageReqVO.java
  5. 97
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordMainExcelVO.java
  6. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/repleinshRecord/RepleinshRecordMainConvert.java
  7. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordDetailMapper.java
  8. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordMainMapper.java
  9. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailService.java
  10. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailServiceImpl.java
  11. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainService.java
  12. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java

22
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java

@ -50,12 +50,6 @@ public class RepleinshJobMainController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建补料任务主")
@PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:create')")
public CommonResult<Long> createRepleinshJobMain(@Valid @RequestBody RepleinshJobMainCreateReqVO createReqVO) {
return success(repleinshJobMainService.createRepleinshJobMain(createReqVO));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得补料任务主信息分页")
@PreAuthorize("@ss.hasPermission('wms:RepleinshJobMain:query')")
@ -69,22 +63,6 @@ public class RepleinshJobMainController {
}
return success(result);
}
@PutMapping("/update")
@Operation(summary = "更新补料任务主")
@PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:update')")
public CommonResult<Boolean> updateRepleinshJobMain(@Valid @RequestBody RepleinshJobMainUpdateReqVO updateReqVO) {
repleinshJobMainService.updateRepleinshJobMain(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除补料任务主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:delete')")
public CommonResult<Boolean> deleteRepleinshJobMain(@RequestParam("id") Long id) {
repleinshJobMainService.deleteRepleinshJobMain(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得补料任务主")

77
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java

@ -1,8 +1,12 @@
package com.win.module.wms.controller.repleinshRecord;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.dict.core.util.DictFrameworkUtils;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordDetailDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.repleinshRecord.RepleinshRecordDetailService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -37,26 +41,14 @@ import com.win.module.wms.service.repleinshRecord.RepleinshRecordMainService;
@Validated
public class RepleinshRecordMainController {
@Resource
private RepleinshRecordDetailService repleinshRecordDetailService;
@Resource
private RepleinshRecordMainService repleinshRecordMainService;
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建补料记录主")
@PreAuthorize("@ss.hasPermission('wms:repleinsh-record-main:create')")
public CommonResult<Long> createRepleinshRecordMain(@Valid @RequestBody RepleinshRecordMainCreateReqVO createReqVO) {
return success(repleinshRecordMainService.createRepleinshRecordMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新补料记录主")
@PreAuthorize("@ss.hasPermission('wms:repleinsh-record-main:update')")
public CommonResult<Boolean> updateRepleinshRecordMain(@Valid @RequestBody RepleinshRecordMainUpdateReqVO updateReqVO) {
repleinshRecordMainService.updateRepleinshRecordMain(updateReqVO);
return success(true);
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得补料记录主信息分页")
@PreAuthorize("@ss.hasPermission('wms:RepleinshRecordMain:query')")
@ -71,15 +63,6 @@ public class RepleinshRecordMainController {
return success(result);
}
@DeleteMapping("/delete")
@Operation(summary = "删除补料记录主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:repleinsh-record-main:delete')")
public CommonResult<Boolean> deleteRepleinshRecordMain(@RequestParam("id") Long id) {
repleinshRecordMainService.deleteRepleinshRecordMain(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得补料记录主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@ -106,21 +89,55 @@ public class RepleinshRecordMainController {
return success(RepleinshRecordMainConvert.INSTANCE.convertPage(pageResult));
}
private List<RepleinshRecordMainExcelVO> getExcelVo(List<RepleinshRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
mapDropDown.put(15, locationType);
mapDropDown.put(16, locationType);
String[] useOnTheWayLocation = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(20, useOnTheWayLocation);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(26, inventoryStatus);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(41, uom);
List<RepleinshRecordMainExcelVO> resultList = new ArrayList<>();
// 导出
for(RepleinshRecordMainDO mainDO : list) {
List<RepleinshRecordDetailDO> subList = repleinshRecordDetailService.selectList(mainDO.getId());
for(RepleinshRecordDetailDO detailDO : subList) {
RepleinshRecordMainExcelVO vo = RepleinshRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator()));
vo.setCreator(user.getNickname());
resultList.add(vo);
}
}
return resultList;
}
@GetMapping("/export-excel")
@Operation(summary = "导出补料记录主 Excel")
@Operation(summary = "导出补料记录 Excel")
@PreAuthorize("@ss.hasPermission('wms:repleinsh-record-main:export')")
@OperateLog(type = EXPORT)
public void exportRepleinshRecordMainExcel(@Valid RepleinshRecordMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<RepleinshRecordMainDO> list = repleinshRecordMainService.getRepleinshRecordMainList(exportReqVO);
//组装vo
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<RepleinshRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
// 导出 Excel
List<RepleinshRecordMainExcelVO> datas = RepleinshRecordMainConvert.INSTANCE.convertList02(list);
for(RepleinshRecordMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
ExcelUtils.write(response, "补料记录.xlsx", "补料记录", RepleinshRecordMainExcelVO.class, resultList, mapDropDown);
}
ExcelUtils.write(response, "补料记录主.xls", "数据", RepleinshRecordMainExcelVO.class, datas);
@PostMapping("/export-excel-senior")
@Operation(summary = "导出补料记录 Excel")
@PreAuthorize("@ss.hasPermission('wms:repleinsh-record-main:export')")
@OperateLog(type = EXPORT)
public void exportRepleinshRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<RepleinshRecordMainDO> list = repleinshRecordMainService.getRepleinshRecordMainList(conditions);
//组装vo
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<RepleinshRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
// 导出 Excel
ExcelUtils.write(response, "补料记录.xlsx", "补料记录", RepleinshRecordMainExcelVO.class, resultList, mapDropDown);
}
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailExportReqVO.java

@ -103,4 +103,8 @@ public class RepleinshRecordDetailExportReqVO {
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "主表ID")
private String masterId;
}

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailPageReqVO.java

@ -105,4 +105,9 @@ public class RepleinshRecordDetailPageReqVO extends PageParam {
@Schema(description = "到批次")
private String toBatch;
@Schema(description = "主表ID")
private String masterId;
}

97
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordMainExcelVO.java

@ -1,5 +1,6 @@
package com.win.module.wms.controller.repleinshRecord.vo;
import com.win.module.wms.enums.DictTypeConstants;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@ -49,10 +50,6 @@ public class RepleinshRecordMainExcelVO {
@ExcelProperty("部门")
private String departmentCode;
@ExcelProperty(value = "接口类型", converter = DictConvert.class)
@DictFormat("interface_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String interfaceType;
@ExcelProperty("单据号")
private String number;
@ -68,30 +65,106 @@ public class RepleinshRecordMainExcelVO {
@ExcelProperty("创建者Id")
private String creator;
@ExcelProperty("代码")
private String code;
@ExcelProperty("从仓库代码")
private String fromWarehouseCode;
@ExcelProperty(value = "从库位类型范围", converter = DictConvert.class)
@DictFormat("location_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.LOCATION_TYPE)
private String fromLocationTypes;
@ExcelProperty(value = "到库位类型范围", converter = DictConvert.class)
@DictFormat(DictTypeConstants.LOCATION_TYPE)
private String toLocationTypes;
@ExcelProperty("从库区代码范围")
private String fromAreaCodes;
@ExcelProperty("到仓库代码")
private String toWarehouseCode;
@ExcelProperty(value = "到库位类型范围", converter = DictConvert.class)
@DictFormat("location_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String toLocationTypes;
@ExcelProperty("到库区代码范围")
private String toAreaCodes;
@ExcelProperty("是否可用")
@ExcelProperty(value = "是否可用", converter = DictConvert.class)
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String available;
@ExcelProperty("修改时间")
private LocalDateTime updateTime;
@ExcelProperty("修改者")
private String updater;
@ExcelProperty("从包装号")
private String fromPackingNumber;
@ExcelProperty("从器具号")
private String fromContainerNumber;
@ExcelProperty("从批次")
private String fromBatch;
@ExcelProperty(value = "库存状态", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INVENTORY_STATUS)
private String inventoryStatus;
@ExcelProperty("从货主代码")
private String fromOwnerCode;
@ExcelProperty("从库位代码")
private String fromLocationCode;
@ExcelProperty("从库位组代码")
private String fromLocationGroupCode;
@ExcelProperty("从库区代码")
private String fromAreaCode;
@ExcelProperty("到货主代码")
private String toOwnerCode;
@ExcelProperty("到库位代码")
private String toLocationCode;
@ExcelProperty("到库位组代码")
private String toLocationGroupCode;
@ExcelProperty("到库区代码")
private String toAreaCode;
@ExcelProperty("物品代码")
private String itemCode;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itemDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("数量")
private String qty;
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat(DictTypeConstants.UOM)
private String uom;
@ExcelProperty("到包装号")
private String toPackingNumber;
@ExcelProperty("到器具号")
private String toContainerNumber;
@ExcelProperty("到批次")
private String toBatch;
@ExcelProperty("供应商代码")
private String supplierCode;
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/repleinshRecord/RepleinshRecordMainConvert.java

@ -8,7 +8,10 @@ import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainCreat
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainExcelVO;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainRespVO;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordDetailDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordMainDO;
@ -34,4 +37,13 @@ public interface RepleinshRecordMainConvert {
List<RepleinshRecordMainExcelVO> convertList02(List<RepleinshRecordMainDO> list);
@Mappings({
@Mapping(source = "mainDO.number", target = "number"),
@Mapping(source = "mainDO.remark", target = "remark"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
@Mapping(source = "mainDO.updateTime", target = "updateTime"),
@Mapping(source = "mainDO.updater", target = "updater"),
})
RepleinshRecordMainExcelVO convert(RepleinshRecordMainDO mainDO, RepleinshRecordDetailDO detailDO);
}

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordDetailMapper.java

@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailExportReqVO;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailPageReqVO;
import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordDetailDO;
import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordDetailDO;
import org.apache.ibatis.annotations.Mapper;
@ -22,6 +23,7 @@ public interface RepleinshRecordDetailMapper extends BaseMapperX<RepleinshRecord
default PageResult<RepleinshRecordDetailDO> selectPage(RepleinshRecordDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<RepleinshRecordDetailDO>()
.eqIfPresent(RepleinshRecordDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(RepleinshRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
.eqIfPresent(RepleinshRecordDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())
.eqIfPresent(RepleinshRecordDetailDO::getFromBatch, reqVO.getFromBatch())
@ -58,6 +60,7 @@ public interface RepleinshRecordDetailMapper extends BaseMapperX<RepleinshRecord
}
default List<RepleinshRecordDetailDO> selectList(RepleinshRecordDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<RepleinshRecordDetailDO>()
.eqIfPresent(RepleinshRecordDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(RepleinshRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
.eqIfPresent(RepleinshRecordDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())
.eqIfPresent(RepleinshRecordDetailDO::getFromBatch, reqVO.getFromBatch())
@ -90,4 +93,9 @@ public interface RepleinshRecordDetailMapper extends BaseMapperX<RepleinshRecord
.orderByDesc(RepleinshRecordDetailDO::getId));
}
default List<RepleinshRecordDetailDO> selectList(Long masterId) {
return selectList(new LambdaQueryWrapperX<RepleinshRecordDetailDO>()
.eq(RepleinshRecordDetailDO::getMasterId, masterId));
}
}

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordMainMapper.java

@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainExportReqVO;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainPageReqVO;
import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordMainDO;
import org.apache.ibatis.annotations.Mapper;
@ -78,4 +79,8 @@ public interface RepleinshRecordMainMapper extends BaseMapperX<RepleinshRecordMa
.orderByDesc(RepleinshRecordMainDO::getId));
}
default List<RepleinshRecordMainDO> selectSeniorList(CustomConditions conditions) {
return selectList(QueryWrapperUtils.structure(conditions));
}
}

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailService.java

@ -80,4 +80,5 @@ public interface RepleinshRecordDetailService {
*/
List<RepleinshRecordDetailDO> getRepleinshRecordDetailList(RepleinshRecordDetailExportReqVO exportReqVO);
List<RepleinshRecordDetailDO> selectList(Long id);
}

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailServiceImpl.java

@ -87,4 +87,9 @@ public class RepleinshRecordDetailServiceImpl implements RepleinshRecordDetailSe
return repleinshRecordDetailMapper.selectList(exportReqVO);
}
@Override
public List<RepleinshRecordDetailDO> selectList(Long masterId) {
return repleinshRecordDetailMapper.selectList(masterId);
}
}

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainService.java

@ -4,10 +4,7 @@ import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainCreateReqVO;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainExportReqVO;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainPageReqVO;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainUpdateReqVO;
import com.win.module.wms.controller.repleinshRecord.vo.*;
import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordMainDO;
import com.win.framework.common.pojo.PageResult;
@ -79,4 +76,5 @@ public interface RepleinshRecordMainService {
*/
List<RepleinshRecordMainDO> getRepleinshRecordMainList(RepleinshRecordMainExportReqVO exportReqVO);
List<RepleinshRecordMainDO> getRepleinshRecordMainList(CustomConditions conditions);
}

11
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java

@ -1,10 +1,8 @@
package com.win.module.wms.service.repleinshRecord;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainCreateReqVO;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainExportReqVO;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainPageReqVO;
import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainUpdateReqVO;
import com.win.module.wms.controller.repleinshRecord.vo.*;
import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -87,4 +85,9 @@ public class RepleinshRecordMainServiceImpl implements RepleinshRecordMainServic
return repleinshRecordMainMapper.selectList(exportReqVO);
}
@Override
public List<RepleinshRecordMainDO> getRepleinshRecordMainList(CustomConditions conditions) {
return repleinshRecordMainMapper.selectSeniorList(conditions);
}
}

Loading…
Cancel
Save