oms业务单修改
This commit is contained in:
赵辉
+98
@@ -0,0 +1,98 @@
|
||||
package com.mhd.oms.interfaces.assembler.businessDocumentCargoInfo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author: brb
|
||||
* @description:
|
||||
* @create: 2026-03-30 17:15
|
||||
*/
|
||||
@Data
|
||||
public class BusinessDocumentCargoInfo {
|
||||
|
||||
@ApiModelProperty(value = "ID")
|
||||
private String id;
|
||||
@ApiModelProperty(value = "组织表ID")
|
||||
private Long organizationId;
|
||||
@ApiModelProperty(value = "组织名称")
|
||||
private String organizationName;
|
||||
@ApiModelProperty(value = "一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private Date createTime;
|
||||
@ApiModelProperty(value = "创建人用户ID")
|
||||
private Long createBy;
|
||||
@ApiModelProperty(value = "创建人姓名")
|
||||
private String createByName;
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private Date updateTime;
|
||||
// @ApiModelProperty(value = "修改人用户ID")
|
||||
// private Long updateBy;
|
||||
@ApiModelProperty(value = "修改人姓名")
|
||||
private String updateByName;
|
||||
@ApiModelProperty(value = "删除标记：0-无状态，1-正常，2-已删除")
|
||||
private Integer delFlag;
|
||||
@ApiModelProperty(value = "货单号")
|
||||
private String orderId;
|
||||
@ApiModelProperty(value = "货物类型ID")
|
||||
private String goodsTypeId;
|
||||
@ApiModelProperty(value = "货物类型")
|
||||
private String goodsType;
|
||||
@ApiModelProperty(value = "货物名称ID")
|
||||
private String goodsNameId;
|
||||
@ApiModelProperty(value = "货物名称")
|
||||
private String goodsName;
|
||||
@ApiModelProperty(value = "货物数量")
|
||||
private BigDecimal cargoNum;
|
||||
@ApiModelProperty(value = "货物重量")
|
||||
private BigDecimal cargoWeight;
|
||||
|
||||
@ApiModelProperty("体积")
|
||||
private BigDecimal cargoVolume;
|
||||
|
||||
@ApiModelProperty("内容")
|
||||
private String cargoContent;
|
||||
@ApiModelProperty(value = "重量单位ID")
|
||||
private String weightUnitId;
|
||||
@ApiModelProperty(value = "重量单位名称")
|
||||
private String weightUnit;
|
||||
@ApiModelProperty(value = "数量单位ID")
|
||||
private String quantityUnitId;
|
||||
@ApiModelProperty(value = "数量单位名称")
|
||||
private String quantityUnit;
|
||||
|
||||
@ApiModelProperty("货物名称")
|
||||
private String cargoName;
|
||||
|
||||
@ApiModelProperty("货物单位ID")
|
||||
private String cargoUnitId;
|
||||
|
||||
@ApiModelProperty("货物单位名字")
|
||||
private String cargoUnitName;
|
||||
|
||||
@ApiModelProperty("整机表编号")
|
||||
private String machineCode;
|
||||
|
||||
@ApiModelProperty("是否为库存")
|
||||
private boolean stockFlag;
|
||||
|
||||
@ApiModelProperty("货物重量 罐车运输专有字段")
|
||||
private BigDecimal cargoTonnage;
|
||||
|
||||
@ApiModelProperty("价格")
|
||||
private BigDecimal unitPrice;
|
||||
|
||||
@ApiModelProperty("货物类型标识：STOCK-库存，MATERIAL-物料，MANUAL-手动输入")
|
||||
private String cargoType;
|
||||
|
||||
@ApiModelProperty(value = "删除标记：0-无状态，1-正常，2-已删除")
|
||||
private Integer inventoryStatus;
|
||||
|
||||
@ApiModelProperty("货物备注")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
+1
@@ -59,6 +59,7 @@ public class BusinessDocumentOrderAssembler {
|
||||
businessDocumentOrderDO.setUpdateTime(new Date());
|
||||
businessDocumentOrderDO.setDelFlag(1);
|
||||
}
|
||||
// businessDocumentOrderDO.setBusinessDocumentCargoMultiList(businessDocumentOrderDTO.getBusinessDocumentCargoMultiDTOList());
|
||||
return businessDocumentOrderDO;
|
||||
}
|
||||
|
||||
|
||||
+53
-1
@@ -5,6 +5,7 @@ import com.mhd.oms.domain.businessDocumentAddressMulti.entity.BusinessDocumentAd
|
||||
import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO;
|
||||
import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti;
|
||||
import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO;
|
||||
import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
@@ -42,6 +43,16 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String createCompanyId;
|
||||
|
||||
@ApiModelProperty(value = "创建开始日期")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private Date createStartTime;
|
||||
|
||||
@ApiModelProperty(value = "创建结束日期")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private Date createEndTime;
|
||||
|
||||
@ApiModelProperty("$column.columnComment")
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String goodsNumber;
|
||||
@@ -706,11 +717,52 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
|
||||
@ApiModelProperty("预约单号")
|
||||
private String reservationOrderNumber;
|
||||
|
||||
@ApiModelProperty("执行单id")
|
||||
private String executeOrderId;
|
||||
|
||||
@ApiModelProperty("执行单号")
|
||||
private String executeOrderNumber;
|
||||
|
||||
@ApiModelProperty("收款账户id")
|
||||
private String paymentAccountId;
|
||||
|
||||
@ApiModelProperty("收款账户信息")
|
||||
private String accountInformation;
|
||||
|
||||
@ApiModelProperty("业务类型")
|
||||
private Integer businessCategory;
|
||||
|
||||
@ApiModelProperty(value = "组织地址")
|
||||
private String companyAddress;
|
||||
|
||||
@ApiModelProperty(value = "组织公司名称")
|
||||
private String companyName;
|
||||
|
||||
@ApiModelProperty(value = "组织公司名称英文")
|
||||
private String companyNameEn;
|
||||
|
||||
@ApiModelProperty(value = "负责人姓名")
|
||||
private String contact;
|
||||
|
||||
@ApiModelProperty(value = "组织负责人id")
|
||||
private String contactPhone;
|
||||
|
||||
@ApiModelProperty(value = "账户名称")
|
||||
private String accountName;
|
||||
|
||||
@ApiModelProperty(value = "开户银行")
|
||||
private String accountBank;
|
||||
|
||||
@ApiModelProperty("业务单地址集合")
|
||||
private List<BusinessDocumentAddressMultiDTO> businessDocumentAddressMultiDTOList;
|
||||
|
||||
|
||||
@ApiModelProperty("业务单货物集合")
|
||||
private List<BusinessDocumentCargoMulti> businessDocumentCargoMultiList;
|
||||
private List<BusinessDocumentCargoMulti> businessDocumentCargoMultiList1;
|
||||
|
||||
@ApiModelProperty("业务单货物集合")
|
||||
private List<BusinessDocumentCargoMultiDTO> businessDocumentCargoMultiList;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "装货地址集合")
|
||||
private List<BusinessDocumentAddressMultiDTO> loadingAddressList;
|
||||
|
||||
+6
-2
@@ -10,6 +10,7 @@ import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocument
|
||||
import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO;
|
||||
import com.mhd.oms.application.service.businessDocumentOrder.BusinessDocumentOrderApplicationService;
|
||||
import com.mhd.oms.interfaces.assembler.businessDocumentOrder.BusinessDocumentOrderAssembler;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import javax.annotation.Resource;
|
||||
import com.mhd.common.core.web.controller.BaseController;
|
||||
import com.mhd.common.core.web.domain.AjaxResult;
|
||||
@@ -35,11 +36,14 @@ public class BusinessDocumentOrderApi extends BaseController{
|
||||
*/
|
||||
@ApiOperation("查询【业务单】列表")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BusinessDocumentOrderDTO businessDocumentOrderDTO)
|
||||
public TableDataInfo list(BusinessDocumentOrderDTO businessDocumentOrderDTO,
|
||||
@RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize)
|
||||
{
|
||||
//转换实体
|
||||
BusinessDocumentOrderDO businessDocumentOrderDO = businessDocumentOrderAssembler.toDO(businessDocumentOrderDTO);
|
||||
startPage();
|
||||
// 使用 PageHelper 手动分页，支持 pageNo 参数
|
||||
PageHelper.startPage(pageNo, pageSize);
|
||||
List<BusinessDocumentOrderPO> list = businessDocumentOrderApplicationService.queryList(businessDocumentOrderDO);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
+2
-1
@@ -56,7 +56,8 @@ public class ExecuteOrderApi extends BaseController{
|
||||
if(executeOrderDTO.getId() != null){
|
||||
return toAjax(executeOrderApplicationService.update(executeOrderDO));
|
||||
}else {
|
||||
return toAjax(executeOrderApplicationService.insert(executeOrderDO));
|
||||
Long executeOrderId = executeOrderApplicationService.insert(executeOrderDO);
|
||||
return executeOrderId != null ? success() : error();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user