geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

船期管理

Browse Source
This commit is contained in:
shunyi.kuang
2026-03-05 15:40:26 +08:00
parent 13100387f0
commit 729eda76cf
8 changed files with 90 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java
View File

@ -38,7 +38,7 @@ public class LngMeaPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("计量类型(L-装载计量/U-卸载计量)")
private String typeCode;
private String typeName;
/**
* 计量时间
*/
@ -171,7 +171,7 @@ public class LngMeaPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("部门id")
private Long deptId;
private Long deptName;
/**
* 数据权限id
*/

29
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsPurIntVo.java
View File

@ -12,6 +12,8 @@ import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import com.xjrsoft.module.ship.dto.AddLngMeaPurIntDto;
import com.xjrsoft.module.system.vo.LngFileUploadVo;
@ -51,21 +53,21 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("交易主体编码(根据船期计划带出来)")
private Long comId;
private String comName;
/**
* 合同-主信息主键
*/
@ApiModelProperty("合同-主信息主键")
private Long kId;
private String kName;
/**
* 长协/现货(长协/现货……；未关联合同时用，关联合同后以合同为准)
*/
@ApiModelProperty("长协/现货(长协/现货……；未关联合同时用，关联合同后以合同为准)")
private String longSpotCode;
private String longSpotName;
/**
* 供应商(国际采购合同的供应商)
*/
@ -93,14 +95,15 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("业务类型编码(进口船货、纯转口船货、窗口转让船货、到岸交付船货)")
private String ssTypeCode;
private String ssTypeName;
/**
* 接收站
*/
@ApiModelProperty("接收站")
//@Trans(type = TransType.LNG_STATION, transToFieldName = "staName")
private String staCode;
private String staName;
/**
* 国际气源地
*/
@ -112,16 +115,20 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
* 销售区域
*/
@ApiModelProperty("销售区域")
@Trans(type = TransType.REGION, transToFieldName = "salesAreaName")
private String salesAreaCode;
private String salesAreaName;
/**
* 我方联系人(缺省登录人编码)
*/
@ApiModelProperty("我方联系人(缺省登录人编码)")
@Trans(type = TransType.USER, transToFieldName = "empName")
private Long empId;
private String empName;
/**
* 我方联系人电话(根据联系人获取)
*/
@ -133,9 +140,10 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
* 我方联系人所在部门(缺省登录人所在部门)
*/
@ApiModelProperty("我方联系人所在部门(缺省登录人所在部门)")
@Trans(type = TransType.DEPT, transToFieldName = "empDeptName")
private Long empDeptId;
private String empDeptName;
/**
* 执行日期
*/
@ -217,9 +225,10 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
* 币种
*/
@ApiModelProperty("币种")
@Trans(type = TransType.CURRENCY, transToFieldName = "curName")
private String curCode;
private String curName;
/**
* 汇率
*/
@ -310,6 +319,8 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("装港")
private String portLoading1Code;
private String portLoading1Name;
/**
* 替代装港
@ -324,7 +335,7 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("卸港")
private String portUnloading1Code;
private String portUnloading1Name;
/**
* 替代卸港
*/

29
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntVo.java
View File

@ -4,6 +4,8 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import com.xjrsoft.module.system.vo.LngFileUploadVo;
import io.swagger.annotations.ApiModelProperty;
@ -45,6 +47,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("交易主体编码(根据船期计划带出来)")
private Long comId;
private String comName;
/**
* 合同-主信息主键
@ -52,6 +55,8 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("合同-主信息主键")
private Long kId;
private String kName;
/**
* 长协/现货(长协/现货……；未关联合同时用，关联合同后以合同为准)
@ -59,7 +64,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("长协/现货(长协/现货……；未关联合同时用，关联合同后以合同为准)")
private String longSpotCode;
private String longSpotName;
/**
* 客户(国际销售合同的客户)
*/
@ -87,14 +92,14 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("业务类型编码(进口船货、纯转口船货、窗口转让船货、到岸交付船货)")
private String ssTypeCode;
private String ssTypeName;
/**
* 接收站(财务报表需要)
*/
@ApiModelProperty("接收站(财务报表需要)")
private String staCode;
private String staName;
/**
* 国际气源地
*/
@ -106,16 +111,18 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{
* 销售区域
*/
@ApiModelProperty("销售区域")
@Trans(type = TransType.REGION, transToFieldName = "salesAreaName")
private String salesAreaCode;
private String salesAreaName;
/**
* 我方联系人(缺省登录人编码)
*/
@ApiModelProperty("我方联系人(缺省登录人编码)")
@Trans(type = TransType.USER, transToFieldName = "empName")
private Long empId;
private String empName;
/**
* 我方联系人电话(根据联系人获取)
*/
@ -127,9 +134,10 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{
* 我方联系人所在部门(缺省登录人所在部门)
*/
@ApiModelProperty("我方联系人所在部门(缺省登录人所在部门)")
@Trans(type = TransType.DEPT, transToFieldName = "empDeptName")
private Long empDeptId;
private String empDeptName;
/**
* 执行日期(录入执行时必须)
*/
@ -211,8 +219,11 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{
* 币种
*/
@ApiModelProperty("币种")
@Trans(type = TransType.CURRENCY, transToFieldName = "curName")
private String curCode;
private String curName;
/**
* 汇率
@ -304,7 +315,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("装港")
private String portLoading1Code;
private String portLoading1Name;
/**
* 替代装港
*/
@ -318,7 +329,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("卸港")
private String portUnloading1Code;
private String portUnloading1Name;
/**
* 替代卸港
*/
@ -451,7 +462,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("审批状态(待提交/审批中/已审批/已驳回；审批之后发送接收站)")
private String approCode;
private String approName;
/**
* 备注
*/