From d4d4debf1cda7b2ba205254d5df11bb8bd933d71 Mon Sep 17 00:00:00 2001 From: wuwenxiong <646448316@qq.com> Date: Thu, 20 Jan 2022 11:20:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=96=B0=E5=A2=9E=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=9C=BA=E8=AE=B0=E5=BD=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cowr/local/ssjygl/transport/TransportSyncService.java | 7 +++++-- .../contracttemplate/CustomerContractTemplateService.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java index 455658d..1f5f458 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java @@ -6,6 +6,7 @@ import com.cowr.common.enums.OrderStateEnum; import com.cowr.common.enums.OrderTypeEnum; import com.cowr.common.enums.TruckRodState; import com.cowr.common.utils.DateTimeUtil; +import com.cowr.common.utils.MathUtil; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.devicectrl.common.Const; import com.cowr.local.ssjygl.main.CliCacheData; @@ -802,14 +803,16 @@ public class TransportSyncService { Date now = new Date(); + int first_weight_decimal = MathUtil.getNumberDecimalDigits(first_weight); + int second_weight_decimal = MathUtil.getNumberDecimalDigits(second_weight); Transport transport = new Transport(); transport.setId(StrKit.getRandomUUID()); transport.setSupermarketId(supermarket_id); transport.setTruckLicense(truck_license); - transport.setFirstWeight(new BigDecimal(first_weight)); + transport.setFirstWeight(new BigDecimal(first_weight).setScale(first_weight_decimal, BigDecimal.ROUND_HALF_UP)); transport.setFirstWeighMode(2); transport.setInTime(now); - transport.setSecondWeight(new BigDecimal(second_weight)); + transport.setSecondWeight(new BigDecimal(second_weight).setScale(second_weight_decimal, BigDecimal.ROUND_HALF_UP)); transport.setSecondWeightMode(2); transport.setOutTime(now); transport.setOutWhich(out_which); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contracttemplate/CustomerContractTemplateService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contracttemplate/CustomerContractTemplateService.java index d742862..d2ca4ff 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contracttemplate/CustomerContractTemplateService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contracttemplate/CustomerContractTemplateService.java @@ -180,7 +180,7 @@ public class CustomerContractTemplateService extends BaseService { public Result get(Sysuser tokenuser) { List list = CustomerContractTemplate.dao.find("select * from customer_contract_template where del = 0"); if (list.size() == 0) { - return Result.failed(false, "当前没有可用的模板"); + return Result.failed(false, "当前没有可用的合同模板"); } if (list.size() > 1) { return Result.failed(false, "有多个模板");