朱园亮 / xingyun-erp · Commits

Commit 68f592e6ccbe59c489fef16354e1dc795c97602e

Authored by 杨鸣坤
1 parent b67f4989

楚江ERP：上传合同附件修改

Inline Side-by-side
Showing 2 changed files with 19 additions and 10 deletions
@@ -63,6 +63,7 @@ import java.io.FileNotFoundException; @@ -63,6 +63,7 @@ import java.io.FileNotFoundException;
63 import java.io.IOException; 63 import java.io.IOException;
64 import java.io.InputStream; 64 import java.io.InputStream;
65 import java.math.BigDecimal; 65 import java.math.BigDecimal;
  66 +import java.math.RoundingMode;
66 import java.net.URLEncoder; 67 import java.net.URLEncoder;
67 import java.time.LocalDate; 68 import java.time.LocalDate;
68 import java.time.format.DateTimeFormatter; 69 import java.time.format.DateTimeFormatter;
@@ -536,11 +537,12 @@ public class ContractDistributorStandardController extends DefaultBaseController @@ -536,11 +537,12 @@ public class ContractDistributorStandardController extends DefaultBaseController
536 dataMap.put("orderDate", data.getOrderDate().format(dateFormatter)); 537 dataMap.put("orderDate", data.getOrderDate().format(dateFormatter));
537 dataMap.put("supplierName", data.getSupplierName()); 538 dataMap.put("supplierName", data.getSupplierName());
538 dataMap.put("buyerName", data.getBuyerName()); 539 dataMap.put("buyerName", data.getBuyerName());
539 - dataMap.put("unitName", data.getUnitName()); 540 +// dataMap.put("unitName", data.getUnitName());
  541 + dataMap.put("unitName", "元、公斤、元/公斤");
540 542
541 - dataMap.put("totalQuantity", data.getTotalQuantity());  
542 - dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax());  
543 - dataMap.put("totalAmountIncludingTax", data.getTotalAmountIncludingTax()); 543 + dataMap.put("totalQuantity", data.getTotalQuantity().setScale(0, RoundingMode.HALF_UP).toString());
  544 + dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax().setScale(2, RoundingMode.HALF_UP).toString());
  545 + dataMap.put("totalAmountIncludingTax", data.getTotalAmountIncludingTax().setScale(2, RoundingMode.HALF_UP).toString());
544 dataMap.put("totalAmountCapital", data.getTotalAmountCapital()); 546 dataMap.put("totalAmountCapital", data.getTotalAmountCapital());
545 547
546 dataMap.put("depositInfo", data.getDepositInfo()); 548 dataMap.put("depositInfo", data.getDepositInfo());
@@ -270,9 +270,12 @@ public class ContractDistributorStandardServiceImpl extends @@ -270,9 +270,12 @@ public class ContractDistributorStandardServiceImpl extends
270 .set(ContractDistributorStandard::getFormalFileId, vo.getFormalFileId()) 270 .set(ContractDistributorStandard::getFormalFileId, vo.getFormalFileId())
271 .set(ContractDistributorStandard::getFormalFileName, vo.getFormalFileName()) 271 .set(ContractDistributorStandard::getFormalFileName, vo.getFormalFileName())
272 .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized()) 272 .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized())
273 - .set(ContractDistributorStandard::getStatus, "FORMAL")  
274 - .set(ContractDistributorStandard::getFormalApproved, CustomerDevelopStatus.AUDIT.name())  
275 - .eq(ContractDistributorStandard::getId, vo.getId()); 273 + .set(ContractDistributorStandard::getFormalApproved, CustomerDevelopStatus.AUDIT.name());
  274 + if (data.getStatus().equals("DRAFT")) {
  275 + updateWrapper.set(ContractDistributorStandard::getStatus, "FORMAL");
  276 + }
  277 +
  278 + updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
276 279
277 getBaseMapper().update(updateWrapper); 280 getBaseMapper().update(updateWrapper);
278 281
@@ -301,9 +304,13 @@ public class ContractDistributorStandardServiceImpl extends @@ -301,9 +304,13 @@ public class ContractDistributorStandardServiceImpl extends
301 .set(ContractDistributorStandard::getStandardFileId, vo.getStandardFileId()) 304 .set(ContractDistributorStandard::getStandardFileId, vo.getStandardFileId())
302 .set(ContractDistributorStandard::getStandardFileName, vo.getStandardFileName()) 305 .set(ContractDistributorStandard::getStandardFileName, vo.getStandardFileName())
303 .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized()) 306 .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
304 - .set(ContractDistributorStandard::getStatus, "STANDARD")  
305 - .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name())  
306 - .eq(ContractDistributorStandard::getId, vo.getId()); 307 + .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name());
  308 + if (!data.getStatus().equals("STANDARD")) {
  309 + updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD");
  310 +
  311 + }
  312 +
  313 + updateWrapper.eq(ContractDistributorStandard::getId, vo.getId());
307 314
308 getBaseMapper().update(updateWrapper); 315 getBaseMapper().update(updateWrapper);
309 316