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

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

Browse Source
This commit is contained in:
张秉卓
2026-03-30 09:48:08 +08:00
parent 1249233b1e 8a8250755a
commit 384471eb7a
7 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryInVo.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;
@ -69,7 +71,7 @@ public class LngInventoryInVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("船期计划主键(type_code=CQ时自动带出来只读；ZN时从代加工的船期计划选)")
private Long ssId;
private String ssNo;
/**
* 采购合同主键（国内/国际）(type_code=CQ时自动带出来只读；ZN时选择)
*/
@ -229,8 +231,10 @@ public class LngInventoryInVo extends com.xjrsoft.common.model.base.BaseModel{
* 结算币种(录入)
*/
@ApiModelProperty("结算币种(录入)")
@Trans(type = TransType.CURRENCY, transToFieldName = "currName")
private String currCode;
private String currName;
/**
* 结算币种单价(/MMBtu)(录入)

9
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryOutVo.java
View File

@ -36,20 +36,21 @@ public class LngInventoryOutVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("公司编码(天然气公司/惠贸)")
private Long comId;
private String comName;
/**
* 接收站
*/
@ApiModelProperty("接收站")
private String staCode;
private String staName;
/**
* 出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点)
*/
@ApiModelProperty("出库类型编码(ZN-销售(站内交易)；可扩展SH-损耗/PD-盘点)")
private String typeCode;
private String typeName;
/**
* 品种
@ -64,14 +65,14 @@ public class LngInventoryOutVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("销售合同主键(type_code=ZN时必须，其他空)")
private Long kId;
private String kName;
/**
* 客户编码(type_code=ZN时必须，从销售合同带；其他空)
*/
@ApiModelProperty("客户编码(type_code=ZN时必须，从销售合同带；其他空)")
private String cuCode;
private String cuName;
/**
* 计量单位
*/