Browse Source

Merge remote-tracking branch 'origin/master'

master
刘忱 2 years ago
parent
commit
bc78e2b8cf
  1. 24
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java
  2. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java
  3. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainRespVO.java
  4. 24
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java
  5. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExportReqVO.java
  6. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainRespVO.java
  7. 24
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java
  8. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExportReqVO.java
  9. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainRespVO.java
  10. 25
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java
  11. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExportReqVO.java
  12. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainRespVO.java
  13. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java
  14. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestDetailMapper.java
  15. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java
  16. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java

24
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java

@ -3,6 +3,9 @@ package com.win.module.wms.controller.customerreturnRequest;
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.convert.customerreturnRequest.CustomerreturnRequestDetailConvert;
import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO;
import com.win.module.wms.service.customerreturnRequest.CustomerreturnRequestDetailService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -39,6 +42,9 @@ public class CustomerreturnRequestMainController {
@Resource
private CustomerreturnRequestMainService customerreturnRequestMainService;
@Resource
private CustomerreturnRequestDetailService customerreturnRequestDetailService;
@Resource
private AdminUserApi userApi;
@ -121,4 +127,22 @@ public class CustomerreturnRequestMainController {
ExcelUtils.write(response, "客户退货申请主.xls", "数据", CustomerreturnRequestMainExcelVO.class, datas);
}
@GetMapping("/getCustomerreturnRequestById")
@Operation(summary = "APP获得客户退货申请主子表明细列表")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:query')")
public CommonResult<CustomerreturnRequestMainRespVO> getCustomerreturnRequestById(@RequestParam("id") Long id) {
CustomerreturnRequestMainDO customerreturnRequestMain = customerreturnRequestMainService.getCustomerreturnRequestMain(id);
CustomerreturnRequestMainRespVO result = CustomerreturnRequestMainConvert.INSTANCE.convert(customerreturnRequestMain);
if(result==null) {
return success(result);
};
CustomerreturnRequestDetailExportReqVO reqVO = new CustomerreturnRequestDetailExportReqVO();
reqVO.setMasterId(result.getId());
List<CustomerreturnRequestDetailDO> list = customerreturnRequestDetailService.getCustomerreturnRequestDetailList(reqVO);
List<CustomerreturnRequestDetailExcelVO> vos = CustomerreturnRequestDetailConvert.INSTANCE.convertList02(list);
result.setSubList(vos);
return success(result);
}
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java

@ -83,4 +83,7 @@ public class CustomerreturnRequestDetailExportReqVO {
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表id")
private Long masterId;
}

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainRespVO.java

@ -3,10 +3,15 @@ package com.win.module.wms.controller.customerreturnRequest.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 CustomerreturnRequestMainRespVO extends CustomerreturnRequestMainBaseVO {
@Schema(description = "客户退货申请子表request_customerreturn_detail", requiredMode = Schema.RequiredMode.REQUIRED)
private List subList;
}

24
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java

@ -3,6 +3,9 @@ package com.win.module.wms.controller.deliverRequest;
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.convert.deliverRequest.DeliverRequestDetailConvert;
import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO;
import com.win.module.wms.service.deliverRequest.DeliverRequestDetailService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -39,6 +42,9 @@ public class DeliverRequestMainController {
@Resource
private DeliverRequestMainService deliverRequestMainService;
@Resource
private DeliverRequestDetailService deliverRequestDetailService;
@Resource
private AdminUserApi userApi;
@ -122,4 +128,22 @@ public class DeliverRequestMainController {
ExcelUtils.write(response, "发货申请主.xls", "数据", DeliverRequestMainExcelVO.class, datas);
}
@GetMapping("/getDeliverRequestById")
@Operation(summary = "APP获得发货申请主子表明细列表")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:deliver-request-main:query')")
public CommonResult<DeliverRequestMainRespVO> getDeliverRequestById(@RequestParam("id") Long id) {
DeliverRequestMainDO deliverRequestMain = deliverRequestMainService.getDeliverRequestMain(id);
DeliverRequestMainRespVO result = DeliverRequestMainConvert.INSTANCE.convert(deliverRequestMain);
if(result==null) {
return success(result);
};
DeliverRequestDetailExportReqVO reqVO = new DeliverRequestDetailExportReqVO();
reqVO.setMasterId(result.getId());
List<DeliverRequestDetailDO> list = deliverRequestDetailService.getDeliverRequestDetailList(reqVO);
List<DeliverRequestDetailExcelVO> vos = DeliverRequestDetailConvert.INSTANCE.convertList02(list);
result.setSubList(vos);
return success(result);
}
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExportReqVO.java

@ -83,4 +83,7 @@ public class DeliverRequestDetailExportReqVO {
@Schema(description = "从货主代码")
private String fromOwnerCode;
@Schema(description = "主表id")
private Long masterId;
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainRespVO.java

@ -3,10 +3,14 @@ package com.win.module.wms.controller.deliverRequest.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 DeliverRequestMainRespVO extends DeliverRequestMainBaseVO {
@Schema(description = "发货申请子表request_deliver_detail", requiredMode = Schema.RequiredMode.REQUIRED)
private List subList;
}

24
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java

@ -8,8 +8,11 @@ import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.productionreturnRequest.vo.*;
import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert;
import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert;
import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO;
import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO;
import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestDetailService;
import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -37,6 +40,9 @@ public class ProductionreturnRequestMainController {
@Resource
private ProductionreturnRequestMainService productionreturnRequestMainService;
@Resource
private ProductionreturnRequestDetailService productionreturnRequestDetailService;
@Resource
private AdminUserApi userApi;
@ -121,4 +127,22 @@ public class ProductionreturnRequestMainController {
return success(result);
}
@GetMapping("/getProductionreturnRequestById")
@Operation(summary = "APP获得生产退料申请主子表明细列表")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:query')")
public CommonResult<ProductionreturnRequestMainRespVO> getProductionreturnRequestById(@RequestParam("id") Long id) {
ProductionreturnRequestMainDO productionreturnRequestMain = productionreturnRequestMainService.getProductionreturnRequestMain(id);
ProductionreturnRequestMainRespVO result = ProductionreturnRequestMainConvert.INSTANCE.convert(productionreturnRequestMain);
if(result==null) {
return success(result);
};
ProductionreturnRequestDetailExportReqVO reqVO = new ProductionreturnRequestDetailExportReqVO();
reqVO.setMasterId(result.getId());
List<ProductionreturnRequestDetailDO> list = productionreturnRequestDetailService.getProductionreturnRequestDetailList(reqVO);
List<ProductionreturnRequestDetailExcelVO> vos = ProductionreturnRequestDetailConvert.INSTANCE.convertList02(list);
result.setSubList(vos);
return success(result);
}
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExportReqVO.java

@ -83,4 +83,7 @@ public class ProductionreturnRequestDetailExportReqVO {
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表id")
private Long masterId;
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainRespVO.java

@ -3,10 +3,14 @@ package com.win.module.wms.controller.productionreturnRequest.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 ProductionreturnRequestMainRespVO extends ProductionreturnRequestMainBaseVO {
@Schema(description = "生产退料子表request_productionreturn_detail", requiredMode = Schema.RequiredMode.REQUIRED)
private List subList;
}

25
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java

@ -8,8 +8,11 @@ import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.productputawayRequest.vo.*;
import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert;
import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert;
import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO;
import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO;
import com.win.module.wms.service.productputawayRequest.ProductputawayRequestDetailService;
import com.win.module.wms.service.productputawayRequest.ProductputawayRequestMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -37,6 +40,9 @@ public class ProductputawayRequestMainController {
@Resource
private ProductputawayRequestMainService productputawayRequestMainService;
@Resource
private ProductputawayRequestDetailService productputawayRequestDetailService;
@Resource
private AdminUserApi userApi;
@ -121,4 +127,23 @@ public class ProductputawayRequestMainController {
return success(result);
}
@GetMapping("/getProductputawayRequestById")
@Operation(summary = "APP获得制品上架申请主子表明细列表")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:productputaway-request-main:query')")
public CommonResult<ProductputawayRequestMainRespVO> getProductputawayRequestById(@RequestParam("id") Long id) {
ProductputawayRequestMainDO productputawayRequestMain = productputawayRequestMainService.getProductputawayRequestMain(id);
ProductputawayRequestMainRespVO result = ProductputawayRequestMainConvert.INSTANCE.convert(productputawayRequestMain);
if(result==null) {
return success(result);
};
ProductputawayRequestDetailExportReqVO reqVO = new ProductputawayRequestDetailExportReqVO();
reqVO.setMasterId(result.getId());
List<ProductputawayRequestDetailDO> list = productputawayRequestDetailService.getProductputawayRequestDetailList(reqVO);
List<ProductputawayRequestDetailExcelVO> vos = ProductputawayRequestDetailConvert.INSTANCE.convertList02(list);
result.setSubList(vos);
return success(result);
}
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExportReqVO.java

@ -83,4 +83,8 @@ public class ProductputawayRequestDetailExportReqVO {
@Schema(description = "到货主代码")
private String toOwnerCode;
@Schema(description = "主表id")
private Long masterId;
}

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainRespVO.java

@ -3,6 +3,8 @@ package com.win.module.wms.controller.productputawayRequest.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.List;
@Schema(description = "管理后台 - 制品上架申请主 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ -12,4 +14,7 @@ public class ProductputawayRequestMainRespVO extends ProductputawayRequestMainBa
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED)
private Long id;
@Schema(description = "制品上架申请子表request_productputaway_detail", requiredMode = Schema.RequiredMode.REQUIRED)
private List subList;
}

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnRequest/CustomerreturnRequestDetailMapper.java

@ -51,6 +51,7 @@ public interface CustomerreturnRequestDetailMapper extends BaseMapperX<Customerr
}
default List<CustomerreturnRequestDetailDO> selectList(CustomerreturnRequestDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<CustomerreturnRequestDetailDO>()
.eqIfPresent(CustomerreturnRequestDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(CustomerreturnRequestDetailDO::getSoNumber, reqVO.getSoNumber())
.eqIfPresent(CustomerreturnRequestDetailDO::getSoLine, reqVO.getSoLine())
.eqIfPresent(CustomerreturnRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestDetailMapper.java

@ -53,6 +53,7 @@ public interface DeliverRequestDetailMapper extends BaseMapperX<DeliverRequestDe
default List<DeliverRequestDetailDO> selectList(DeliverRequestDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<DeliverRequestDetailDO>()
.eqIfPresent(DeliverRequestDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(DeliverRequestDetailDO::getSoNumber, reqVO.getSoNumber())
.eqIfPresent(DeliverRequestDetailDO::getSoLine, reqVO.getSoLine())
.eqIfPresent(DeliverRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java

@ -53,6 +53,7 @@ public interface ProductionreturnRequestDetailMapper extends BaseMapperX<Product
default List<ProductionreturnRequestDetailDO> selectList(ProductionreturnRequestDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<ProductionreturnRequestDetailDO>()
.eqIfPresent(ProductionreturnRequestDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(ProductionreturnRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
.eqIfPresent(ProductionreturnRequestDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
.eqIfPresent(ProductionreturnRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus())

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java

@ -53,6 +53,7 @@ public interface ProductputawayRequestDetailMapper extends BaseMapperX<Productpu
default List<ProductputawayRequestDetailDO> selectList(ProductputawayRequestDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<ProductputawayRequestDetailDO>()
.eqIfPresent(ProductputawayRequestDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(ProductputawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
.eqIfPresent(ProductputawayRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
.eqIfPresent(ProductputawayRequestDetailDO::getBatch, reqVO.getBatch())

Loading…
Cancel
Save