xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

手动新增出入场记录问题

dev
wuwenxiong 2022-01-20 11:20:15 +08:00
parent e22102e70a
commit d4d4debf1c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java
View File

@ -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);

2
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contracttemplate/CustomerContractTemplateService.java
View File

@ -180,7 +180,7 @@ public class CustomerContractTemplateService extends BaseService {
public Result get(Sysuser tokenuser) {
List<CustomerContractTemplate> 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, "有多个模板");