zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
chenbowen
2025-11-25 18:56:51 +08:00
parent 0a178dc3f5 75341ca6a9
commit d212a14840
6 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@@ -179,8 +179,8 @@
<config.server-addr>172.16.46.63:30848</config.server-addr>
<config.namespace>dev</config.namespace>
<config.group>DEFAULT_GROUP</config.group>
<config.username/>
<config.password/>
<config.username>nacos</config.username>
<config.password>P@ssword25</config.password>
<config.version>1.0.0</config.version>
</properties>
</profile>
@@ -192,8 +192,8 @@
<config.server-addr>172.16.46.63:30848</config.server-addr>
<config.namespace>prod</config.namespace>
<config.group>DEFAULT_GROUP</config.group>
<config.username/>
<config.password/>
<config.username>nacos</config.username>
<config.password>P@ssword25</config.password>
<config.version>1.0.0</config.version>
</properties>
</profile>
@@ -205,8 +205,8 @@
<config.server-addr>172.16.46.63:30848</config.server-addr>
<config.namespace>local</config.namespace>
<config.group>DEFAULT_GROUP</config.group>
<config.username/>
<config.password/>
<config.username>nacos</config.username>
<config.password>P@ssword25</config.password>
<config.version>1.0.0</config.version>
</properties>
</profile>

1
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java
View File

@@ -231,6 +231,7 @@ public class OrderApiImpl implements OrderApi {
ordDtlDTO.setIsEnable(s.getIsEnable());
ordDtlDTO.setTaxNum(s.getTaxAcctasscat());
ordDtlDTO.setTrfQty(s.getTrfQty());
ordDtlDTO.setRmk(s.getRemark());
}
return ordDtlDTO;
}

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/DownOrUpOrderRespVO.java
View File

@@ -1,7 +1,5 @@
package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SaleOrderDetailsRespVO;
import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailRespVO.java
View File

@@ -119,4 +119,6 @@ public class SalesOrderDetailRespVO {
@Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED)
private String unt;
@Schema(description = "备注")
private String remark;
}

3
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailSaveReqVO.java
View File

@@ -99,4 +99,7 @@ public class SalesOrderDetailSaveReqVO {
@Schema(description = "税率")
private String taxRte;
@Schema(description = "备注")
private String remark;
}

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java
View File

@@ -157,4 +157,10 @@ public class SalesOrderDetailDO extends BusinessBaseDO {
@TableField("TRF_QTY")
private BigDecimal trfQty;
/**
* 备注
*/
@TableField("RMK")
private String remark;
}