diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/salecontract/vo/SaleContractSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/salecontract/vo/SaleContractSaveReqVO.java index fb5c415..88bbc0c 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/salecontract/vo/SaleContractSaveReqVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/salecontract/vo/SaleContractSaveReqVO.java @@ -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 saleContractEntrys; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/salecontract/SaleContractDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/salecontract/SaleContractDO.java index 2717f9c..b640b61 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/salecontract/SaleContractDO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/salecontract/SaleContractDO.java @@ -81,5 +81,13 @@ public class SaleContractDO extends BaseDO { * 地址 */ private String address; + /** + * 合约类型 + */ + private String contractType; + /** + * 结算币种 + */ + private String currencyType; } \ No newline at end of file diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index 02bafcc..6d8c6e5 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -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 list = new ArrayList<>(); for (SaleOrderEntryDO entry : entrys) {