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
8da95baa54
commit
ab88e66caa
7 changed files with 126 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/purchasereturnJob/PurchasereturnJobMainController.java
  2. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExportReqVO.java
  3. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainPageReqVO.java
  4. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java
  5. 45
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java
  6. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java
  7. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java

46
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.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.purchasereturnJob.vo.*;
import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobDetailConvert;
import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobDetailDO;
import com.win.module.wms.service.purchasereturnJob.PurchasereturnJobDetailService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -40,6 +43,9 @@ public class PurchasereturnJobMainController {
@Resource
private PurchasereturnJobMainService purchasereturnJobMainService;
@Resource
private PurchasereturnJobDetailService purchasereturnJobDetailService;
@PostMapping("/create")
@Operation(summary = "创建采购退货任务主")
@PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:create')")
@ -114,4 +120,44 @@ public class PurchasereturnJobMainController {
ExcelUtils.write(response, "采购退货任务主.xls", "数据", PurchasereturnJobMainExcelVO.class, datas);
}
@GetMapping("/getReturnJobById")
@Operation(summary = "APP获得采购退货任务主子表明细列表")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:query')")
public CommonResult<PurchasereturnJobMainRespVO> getReturnJobById(@RequestParam("id") Long id) {
PurchasereturnJobMainDO purchasereturnJobMain = purchasereturnJobMainService.getPurchasereturnJobMain(id);
PurchasereturnJobMainRespVO result = PurchasereturnJobMainConvert.INSTANCE.convert(purchasereturnJobMain);
if(result==null) {
return success(result);
};
PurchasereturnJobDetailExportReqVO purchasereturnJobDetailExportReqVO = new PurchasereturnJobDetailExportReqVO();
purchasereturnJobDetailExportReqVO.setMasterId(result.getId());
List<PurchasereturnJobDetailDO> purchasereturnJobDetailList = purchasereturnJobDetailService.getPurchasereturnJobDetailList(purchasereturnJobDetailExportReqVO);
List<PurchasereturnJobDetailExcelVO> purchasereturnJobDetailExcelVOS = PurchasereturnJobDetailConvert.INSTANCE.convertList02(purchasereturnJobDetailList);
result.setSubList(purchasereturnJobDetailExcelVOS);
return success(result);
}
@PostMapping("/getReturnJobPageByStatusAndTime")
@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:purchasereturn-job-main:query')")
public CommonResult<PageResult<PurchasereturnJobMainRespVO>> getReturnJobPageByStatusAndTime(@RequestBody PurchasereturnJobMainPageReqVO purchasereturnJobMainPageReqVO) {
PageResult<PurchasereturnJobMainDO> purchasereturnJobMainByStatusPage = purchasereturnJobMainService.getPurchasereturnJobMainPage(purchasereturnJobMainPageReqVO);
PageResult<PurchasereturnJobMainRespVO> result = PurchasereturnJobMainConvert.INSTANCE.convertPage(purchasereturnJobMainByStatusPage);
return success(result);
}
@PostMapping("/getReturnJobMainSenior")
@Operation(summary = "APP根据发货单号和单据号查询采购退货任务主任务列表暂无用")
@Parameter(name = "asnNumber", description = "发货单号", required = false, example = "100")
@Parameter(name = "number", description = "单据号", required = false, example = "100")
@PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:query')")
public CommonResult<List<PurchasereturnJobMainRespVO>> getReturnJobMainSenior(@RequestBody PurchasereturnJobMainRespVO respVO) {
List<PurchasereturnJobMainDO> returnJobMainSenior = purchasereturnJobMainService.getReturnJobMainSenior(respVO);
List<PurchasereturnJobMainRespVO> result = PurchasereturnJobMainConvert.INSTANCE.convertList(returnJobMainSenior);
return success(result);
}
}

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

@ -85,4 +85,7 @@ public class PurchasereturnJobDetailExportReqVO {
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表ID", example = "6060")
private Long masterId;
}

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

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

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java
View File

@ -3,10 +3,16 @@ package com.win.module.wms.controller.purchasereturnJob.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 PurchasereturnJobMainRespVO extends PurchasereturnJobMainBaseVO {
@Schema(description = "退货任务子表job_purchasereceipt_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
private List subList;
}

45
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.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.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainRespVO;
import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO;
import org.apache.ibatis.annotations.Mapper;
@ -22,6 +23,7 @@ public interface PurchasereturnJobMainMapper extends BaseMapperX<PurchasereturnJ
default PageResult<PurchasereturnJobMainDO> selectPage(PurchasereturnJobMainPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereturnJobMainDO>()
.inIfPresent(PurchasereturnJobMainDO::getStatus, reqVO.getTypes())
.eqIfPresent(PurchasereturnJobMainDO::getRequestNumber, reqVO.getRequestNumber())
.eqIfPresent(PurchasereturnJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber())
.eqIfPresent(PurchasereturnJobMainDO::getAsnNumber, reqVO.getAsnNumber())
@ -122,4 +124,47 @@ public interface PurchasereturnJobMainMapper extends BaseMapperX<PurchasereturnJ
.orderByDesc(PurchasereturnJobMainDO::getId));
}
default List<PurchasereturnJobMainDO> getReturnJobMainSenior(PurchasereturnJobMainRespVO reqVO) {
return selectList(new LambdaQueryWrapperX<PurchasereturnJobMainDO>()
.eqIfPresent(PurchasereturnJobMainDO::getRequestNumber, reqVO.getRequestNumber())
.eqIfPresent(PurchasereturnJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber())
.eqIfPresent(PurchasereturnJobMainDO::getAsnNumber, reqVO.getAsnNumber())
.eqIfPresent(PurchasereturnJobMainDO::getPpNumber, reqVO.getPpNumber())
.eqIfPresent(PurchasereturnJobMainDO::getSupplierCode, reqVO.getSupplierCode())
.eqIfPresent(PurchasereturnJobMainDO::getDeliverDock, reqVO.getDeliverDock())
.eqIfPresent(PurchasereturnJobMainDO::getCarrierCode, reqVO.getCarrierCode())
.eqIfPresent(PurchasereturnJobMainDO::getTransferMode, reqVO.getTransferMode())
.eqIfPresent(PurchasereturnJobMainDO::getVehiclePlateNumber, reqVO.getVehiclePlateNumber())
.eqIfPresent(PurchasereturnJobMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode())
.eqIfPresent(PurchasereturnJobMainDO::getToWarehouseCode, reqVO.getToWarehouseCode())
.eqIfPresent(PurchasereturnJobMainDO::getStatus, reqVO.getStatus())
.eqIfPresent(PurchasereturnJobMainDO::getUpdater, reqVO.getUpdater())
.eqIfPresent(PurchasereturnJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
.eqIfPresent(PurchasereturnJobMainDO::getPriority, reqVO.getPriority())
.eqIfPresent(PurchasereturnJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
.eqIfPresent(PurchasereturnJobMainDO::getDepartmentCode, reqVO.getDepartmentCode())
.eqIfPresent(PurchasereturnJobMainDO::getAcceptUserId, reqVO.getAcceptUserId())
.eqIfPresent(PurchasereturnJobMainDO::getCompleteUserId, reqVO.getCompleteUserId())
.eqIfPresent(PurchasereturnJobMainDO::getFromLocationTypes, reqVO.getFromLocationTypes())
.eqIfPresent(PurchasereturnJobMainDO::getToLocationTypes, reqVO.getToLocationTypes())
.eqIfPresent(PurchasereturnJobMainDO::getNumber, reqVO.getNumber())
.eqIfPresent(PurchasereturnJobMainDO::getBusinessType, reqVO.getBusinessType())
.eqIfPresent(PurchasereturnJobMainDO::getRemark, reqVO.getRemark())
.eqIfPresent(PurchasereturnJobMainDO::getCreator, reqVO.getCreator())
.eqIfPresent(PurchasereturnJobMainDO::getFromAreaCodes, reqVO.getFromAreaCodes())
.eqIfPresent(PurchasereturnJobMainDO::getToAreaCodes, reqVO.getToAreaCodes())
.eqIfPresent(PurchasereturnJobMainDO::getFromDockCode, reqVO.getFromDockCode())
.eqIfPresent(PurchasereturnJobMainDO::getAutoComplete, reqVO.getAutoComplete())
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation())
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty())
.eqIfPresent(PurchasereturnJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty())
.eqIfPresent(PurchasereturnJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty())
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus())
.eqIfPresent(PurchasereturnJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning())
.eqIfPresent(PurchasereturnJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete())
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
.orderByDesc(PurchasereturnJobMainDO::getId));
}
}

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.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.purchasereturnJob.vo.PurchasereturnJobMainCreateReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO;
import com.win.framework.common.pojo.PageResult;
@ -86,4 +83,14 @@ public interface PurchasereturnJobMainService {
* @return 采购订单主列表
*/
public PurchasereturnJobMainDO purchasereturnJobMainDoStatusRight(String pnumber, String pstatus);
/**
* 获得采购退货任务主
*
* @param id 编号
* @return 采购退货任务主
*/
PurchasereturnJobMainDO getPurchasereturnJobMain(Long id);
List<PurchasereturnJobMainDO> getReturnJobMainSenior(PurchasereturnJobMainRespVO respVO);
}

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java
View File

@ -2,10 +2,8 @@ package com.win.module.wms.service.purchasereturnJob;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainCreateReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
import org.springframework.stereotype.Service;
@ -119,4 +117,14 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
throw exception(PURCHASERETURN_JOB_MAIN_STATUS_ERROR);
}
}
@Override
public PurchasereturnJobMainDO getPurchasereturnJobMain(Long id) {
return purchasereturnJobMainMapper.selectById(id);
}
@Override
public List<PurchasereturnJobMainDO> getReturnJobMainSenior(PurchasereturnJobMainRespVO respVO) {
return purchasereturnJobMainMapper.getReturnJobMainSenior(respVO);
}
}

Write Preview
Loading…
Cancel
Save