r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改审核方法

This commit is contained in:
wwb 2024-12-14 21:35:24 +08:00
parent 5f96777d00
commit ff45257f88
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/salecontract/vo/SaleContractSaveReqVO.java
View File

@ -55,6 +55,12 @@ public class SaleContractSaveReqVO {
@Schema(description = "地址")
private String address;
@Schema(description = "合约类型")
private String contractType;
@Schema(description = "结算币种")
private String currencyType;
@Schema(description = "OMS销售合约分录列表")
private List<SaleContractEntryDO> saleContractEntrys;

8
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/salecontract/SaleContractDO.java
View File

@ -81,5 +81,13 @@ public class SaleContractDO extends BaseDO {
* 地址
*/
private String address;
/**
* 合约类型
*/
private String contractType;
/**
* 结算币种
*/
private String currencyType;
}

5
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
View File

@ -414,7 +414,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
}
}
break;
case "unaudit": //审核
case "unaudit": //反审核
for (SaleOrderDO saleOrder : saleOrders) {
if (!BillStatusEnum.AUDIT.getValue().equals(saleOrder.getBillStatus())) {
throw new ServiceException(001, "订单状态不等于已审核状态,不允许反审核！");
@ -522,6 +522,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
context.setVariable("clerk", saleContract.getClerk());
context.setVariable("saleOrderNo", saleContract.getCustomerBuyNo());
context.setVariable("totalAmount", saleContract.getAmount());
context.setVariable("currencyType", saleContract.getCurrencyType());
context.setVariable("zhTotalAmount", "合共人民币" + NumberChineseFormatterUtils.convertToChinese(saleContract.getAmount()) + "整");
for (int i = 0; i < saleContractEntrys.size(); i++) {
@ -1008,6 +1009,8 @@ public class SaleOrderServiceImpl implements SaleOrderService {
saveReqVO.setFax(saleOrder.getFax());
saveReqVO.setAmount(saleOrder.getOrderAmount());
saveReqVO.setAddress(saleOrder.getDeliveryAddress());
saveReqVO.setContractType(saleOrder.getContractType());
saveReqVO.setCurrencyType(saleOrder.getCurrencyType());
List<SaleContractEntryDO> list = new ArrayList<>();
for (SaleOrderEntryDO entry : entrys) {