product
chuang 2 years ago
parent df79bbd014
commit ea6dc5ea8e

@ -31,7 +31,7 @@ public class PurchaseorderDTO {
private String grossWeight;
@Excel(name = "皮重")
private String tartareWeighte;
private String tareWeight;
@Excel(name = "扣重")
private String buckleWeight;

@ -1308,7 +1308,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
dataRowMap.put("materialId", model.getMaterialId());
dataRowMap.put("unit", model.getUnit());
dataRowMap.put("grossWeight", model.getGrossWeight());
dataRowMap.put("tartareWeighte", model.getTartareWeighte());
dataRowMap.put("tareWeight", model.getTareWeight());
dataRowMap.put("buckleWeight", model.getBuckleWeight());
dataRowMap.put("netWeight", model.getNetWeight());
dataRowMap.put("settlement", model.getSettlement());
@ -1683,6 +1683,8 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
// 生成的榜单编码
ActionResult pdBillNumber = bean.getBillNumber(str1);
model.setPoundlistNo(String.valueOf(pdBillNumber.getData()));
model.setSupplierName(contractMEntities.get(0).getName());
// 车辆信息
model.setVehiclePictures(purchaseorderDTO.getCarPictures());
BigDecimal settlement = model.getSettlement();

@ -61,9 +61,9 @@
<el-input v-model="scope.row.grossWeight" />
</template>
</el-table-column>
<el-table-column prop="tartareWeighte" label="皮重" width="150">
<el-table-column prop="tareWeight" label="皮重" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.tartareWeighte" />
<el-input v-model="scope.row.tareWeight" />
</template>
</el-table-column>
<el-table-column prop="buckleWeight" label="扣重" width="150">
@ -182,7 +182,7 @@
<el-table-column prop="materialId" label="货物" width="80" />
<el-table-column prop="unit" label="单位" width="120" />
<el-table-column prop="grossWeight" label="毛重" width="120" />
<el-table-column prop="tartareWeighte" label="皮重" width="100" />
<el-table-column prop="tareWeight" label="皮重" width="100" />
<el-table-column prop="buckleWeight" label="扣重" width="150" />
<el-table-column prop="netWeight" label="净重" width="100" />
<el-table-column prop="settlement" label="结算重量" width="100" />

Loading…
Cancel
Save