zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

检验任务任务 

根据id查询主任务及子任务信息
根据类型list以及时间查询主任务分页数据方法
根据参数高级查询不分页
master
songguoqiang 2 years ago
parent
ab88e66caa
commit
0ba7f34841
7 changed files with 116 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java
  2. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java
  3. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java
  4. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainRespVO.java
  5. 46
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java
  6. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java
  7. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

46
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java
View File

@ -4,6 +4,9 @@ import com.win.framework.common.pojo.CustomConditions;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.inspectJob.vo.*;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.module.wms.service.inspectJob.InspectJobDetailService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -39,6 +42,9 @@ public class InspectJobMainController {
@Resource
private InspectJobMainService inspectJobMainService;
@Resource
private InspectJobDetailService inspectJobDetailService;
@Resource
private AdminUserApi userApi;
@ -122,4 +128,44 @@ public class InspectJobMainController {
ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, datas);
}
@GetMapping("/getInspectJobById")
@Operation(summary = "APP获得检验任务主子表明细列表")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
public CommonResult<InspectJobMainRespVO> getInspectJobById(@RequestParam("id") Long id) {
InspectJobMainDO inspectJobMain = inspectJobMainService.getInspectJobMain(id);
InspectJobMainRespVO result = InspectJobMainConvert.INSTANCE.convert(inspectJobMain);
if(result==null) {
return success(result);
};
InspectJobDetailExportReqVO inspectJobDetailExportReqVO = new InspectJobDetailExportReqVO();
inspectJobDetailExportReqVO.setMasterId(result.getId());
List<InspectJobDetailDO> inspectJobDetailList = inspectJobDetailService.getInspectJobDetailList(inspectJobDetailExportReqVO);
List<InspectJobDetailExcelVO> inspectJobDetailExcelVOS = InspectJobDetailConvert.INSTANCE.convertList02(inspectJobDetailList);
result.setSubList(inspectJobDetailExcelVOS);
return success(result);
}
@PostMapping("/getInspectJobPageByStatusAndTime")
@Operation(summary = "APP获得检验任务主任务分页列表")
@Parameter(name = "createTime", description = "今日开始结束时间", required = false, example = "[\"1699200000000\",\"1701878400000\"]")
@Parameter(name = "types", description = "字典类型数组", required = false, example = "\"types\":[\"JOB_PENDING\",\"JOB_COMPLETED\"]")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
public CommonResult<PageResult<InspectJobMainRespVO>> getInspectJobPageByStatusAndTime(@RequestBody InspectJobMainPageReqVO inspectJobMainPageReqVO) {
PageResult<InspectJobMainDO> inspectJobMainByStatusPage = inspectJobMainService.getInspectJobMainPage(inspectJobMainPageReqVO);
PageResult<InspectJobMainRespVO> result = InspectJobMainConvert.INSTANCE.convertPage(inspectJobMainByStatusPage);
return success(result);
}
@PostMapping("/getInspectJobMainSenior")
@Operation(summary = "APP根据发货单号和单据号查询检验任务主任务列表")
@Parameter(name = "asnNumber", description = "发货单号", required = false, example = "100")
@Parameter(name = "number", description = "单据号", required = false, example = "100")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
public CommonResult<List<InspectJobMainRespVO>> getInspectJobMainSenior(@RequestBody InspectJobMainRespVO respVO) {
List<InspectJobMainDO> inspectJobMainSenior = inspectJobMainService.getInspectJobMainSenior(respVO);
List<InspectJobMainRespVO> result = InspectJobMainConvert.INSTANCE.convertList(inspectJobMainSenior);
return success(result);
}
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java
View File

@ -61,4 +61,7 @@ public class InspectJobDetailExportReqVO {
@Schema(description = "计量单位")
private String uom;
@Schema(description = "主表ID", example = "6060")
private Long masterId;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java
View File

@ -162,4 +162,6 @@ public class InspectJobMainPageReqVO extends PageParam {
@Schema(description = "允许修改箱码")
private String allowModifyPackingNumber;
@Schema(description = "任务状态list可以为空", requiredMode = Schema.RequiredMode.REQUIRED)
private List types;
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainRespVO.java
View File

@ -3,10 +3,14 @@ package com.win.module.wms.controller.inspectJob.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.List;
@Schema(description = "管理后台 - 检验任务主 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class InspectJobMainRespVO extends InspectJobMainBaseVO {
@Schema(description = "检验任务任务子表job_inspect_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
private List subList;
}

46
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java
View File

@ -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.inspectJob.vo.InspectJobMainExportReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import org.apache.ibatis.annotations.Mapper;
@ -22,6 +23,7 @@ public interface InspectJobMainMapper extends BaseMapperX<InspectJobMainDO> {
default PageResult<InspectJobMainDO> selectPage(InspectJobMainPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<InspectJobMainDO>()
.inIfPresent(InspectJobMainDO::getStatus, reqVO.getStatus())
.eqIfPresent(InspectJobMainDO::getRequestNumber, reqVO.getRequestNumber())
.eqIfPresent(InspectJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber())
.eqIfPresent(InspectJobMainDO::getSupplierCode, reqVO.getSupplierCode())
@ -126,4 +128,48 @@ public interface InspectJobMainMapper extends BaseMapperX<InspectJobMainDO> {
.orderByDesc(InspectJobMainDO::getId));
}
default List<InspectJobMainDO> getReturnJobMainSenior(InspectJobMainRespVO reqVO) {
return selectList(new LambdaQueryWrapperX<InspectJobMainDO>()
.eqIfPresent(InspectJobMainDO::getRequestNumber, reqVO.getRequestNumber())
.eqIfPresent(InspectJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber())
.eqIfPresent(InspectJobMainDO::getSupplierCode, reqVO.getSupplierCode())
.eqIfPresent(InspectJobMainDO::getWarehouseCode, reqVO.getWarehouseCode())
.eqIfPresent(InspectJobMainDO::getStatus, reqVO.getStatus())
.eqIfPresent(InspectJobMainDO::getUpdater, reqVO.getUpdater())
.eqIfPresent(InspectJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
.eqIfPresent(InspectJobMainDO::getPriority, reqVO.getPriority())
.eqIfPresent(InspectJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
.eqIfPresent(InspectJobMainDO::getDepartmentCode, reqVO.getDepartmentCode())
.eqIfPresent(InspectJobMainDO::getAcceptUserId, reqVO.getAcceptUserId())
.eqIfPresent(InspectJobMainDO::getCompleteUserId, reqVO.getCompleteUserId())
.eqIfPresent(InspectJobMainDO::getFromLocationTypes, reqVO.getFromLocationTypes())
.eqIfPresent(InspectJobMainDO::getToLocationTypes, reqVO.getToLocationTypes())
.eqIfPresent(InspectJobMainDO::getNumber, reqVO.getNumber())
.eqIfPresent(InspectJobMainDO::getBusinessType, reqVO.getBusinessType())
.eqIfPresent(InspectJobMainDO::getRemark, reqVO.getRemark())
.eqIfPresent(InspectJobMainDO::getCreator, reqVO.getCreator())
.eqIfPresent(InspectJobMainDO::getPoUmber, reqVO.getPoUmber())
.eqIfPresent(InspectJobMainDO::getPoLine, reqVO.getPoLine())
.eqIfPresent(InspectJobMainDO::getBatch, reqVO.getBatch())
.eqIfPresent(InspectJobMainDO::getItemCode, reqVO.getItemCode())
.eqIfPresent(InspectJobMainDO::getInspectType, reqVO.getInspectType())
.eqIfPresent(InspectJobMainDO::getNextAction, reqVO.getNextAction())
.eqIfPresent(InspectJobMainDO::getSampleMethod, reqVO.getSampleMethod())
.eqIfPresent(InspectJobMainDO::getUom, reqVO.getUom())
.eqIfPresent(InspectJobMainDO::getReceiveQty, reqVO.getReceiveQty())
.eqIfPresent(InspectJobMainDO::getSampleQty, reqVO.getSampleQty())
.eqIfPresent(InspectJobMainDO::getOwner, reqVO.getOwner())
.eqIfPresent(InspectJobMainDO::getAutoComplete, reqVO.getAutoComplete())
.eqIfPresent(InspectJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation())
.eqIfPresent(InspectJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty())
.eqIfPresent(InspectJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty())
.eqIfPresent(InspectJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty())
.eqIfPresent(InspectJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus())
.eqIfPresent(InspectJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning())
.eqIfPresent(InspectJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete())
.eqIfPresent(InspectJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
.eqIfPresent(InspectJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
.orderByDesc(InspectJobMainDO::getId));
}
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java
View File

@ -4,10 +4,7 @@ import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO;
import com.win.module.wms.controller.inspectJob.vo.*;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import com.win.framework.common.pojo.PageResult;
@ -88,4 +85,11 @@ public interface InspectJobMainService {
* @return 采购订单主列表
*/
public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus);
/**
* 高级搜索不分页
* @param respVO
* @return
*/
List<InspectJobMainDO> getInspectJobMainSenior(InspectJobMainRespVO respVO);
}

11
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java
View File

@ -2,10 +2,8 @@ package com.win.module.wms.service.inspectJob;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO;
import com.win.module.wms.controller.inspectJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -100,4 +98,9 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
throw exception(INSPECT_JOB_MAIN_STATUS_ERROR);
}
}
@Override
public List<InspectJobMainDO> getInspectJobMainSenior(InspectJobMainRespVO respVO) {
return inspectJobMainMapper.getReturnJobMainSenior(respVO);
}
}

Write Preview
Loading…
Cancel
Save