删改单申请/ 货物数量查询
This commit is contained in:
+23
-1
@@ -782,7 +782,7 @@ public class OrderWithMaterialDTO {
|
||||
@ApiModelProperty("仓库负责人电话")
|
||||
private String directorPhone;
|
||||
|
||||
@ApiModelProperty("仓库负责人电话")
|
||||
@ApiModelProperty("件数")
|
||||
private BigDecimal CargoNum;
|
||||
|
||||
@ApiModelProperty("币制")
|
||||
@@ -816,4 +816,26 @@ public class OrderWithMaterialDTO {
|
||||
|
||||
@ApiModelProperty("商品类型列表")
|
||||
private List<Integer> productTypeList;
|
||||
|
||||
|
||||
|
||||
@ApiModelProperty("删改单申请类型:0-改单 1-删除 2-作废")
|
||||
private Integer reviseApplyType;
|
||||
|
||||
@ApiModelProperty("删改单申请状态:0-未申请 1-申请成功 2-申请失败")
|
||||
private Integer reviseApplyStatus;
|
||||
|
||||
@ApiModelProperty("删改单申请人")
|
||||
private String reviseApplyBy;
|
||||
|
||||
@ApiModelProperty("删改单申请人姓名")
|
||||
private String reviseApplyByName;
|
||||
|
||||
@ApiModelProperty("删改单申请原因")
|
||||
private String reviseApplyReason;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty("删改单申请时间")
|
||||
private Date reviseApplyTime;
|
||||
}
|
||||
|
||||
+3
-3
@@ -67,11 +67,11 @@ public class OriginalImportExportDocumentApi extends BaseController {
|
||||
|
||||
@ApiOperation("删改单申请")
|
||||
@PostMapping("/reviseApply")
|
||||
public AjaxResult reviseApply(@RequestParam BusinessDocumentOrderDTO businessDocumentOrderDTO) {
|
||||
public AjaxResult reviseApply(@RequestBody BusinessDocumentOrderDTO businessDocumentOrderDTO) {
|
||||
|
||||
businessDocumentOrderApplicationService.reviseApply(businessDocumentOrderDTO);
|
||||
|
||||
return null;
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
@ApiOperation("批量推送")
|
||||
@@ -103,7 +103,7 @@ public class OriginalImportExportDocumentApi extends BaseController {
|
||||
Page<BusinessDocumentOrderPO> page = (Page<BusinessDocumentOrderPO>) orderList;
|
||||
|
||||
List<OrderWithMaterialDTO> resultList = convertToOrderWithMaterialList(orderList);
|
||||
|
||||
//return getDataTable(resultList);
|
||||
TableDataInfo tableDataInfo = new TableDataInfo();
|
||||
tableDataInfo.setData(resultList);
|
||||
tableDataInfo.setTotal(page.getTotal());
|
||||
|
||||
Reference in New Issue
Block a user