更新

unimall-app/pageA/product/trade.vue

@@ -115,8 +115,8 @@
 			<view class="title">{{unloadingFee}}</view>
 		</view> -->
 		<view v-if="companyId==2" class="cu-form-group">
-			<view class="title">包装费（元/吨）</view>
-			<view class="title">25KG以内（含25KG）包装40元，50KG以内（含50KG）包装20元</view>
+			<view class="title">包装费</view>
+			<view class="title">25KG(含25)以内40元/吨，50KG(含50)以内20元/吨</view>
 		</view>
 		
 		<view v-if="companyId==2" class="cu-form-group">

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/ReportMapper.xml

@@ -183,7 +183,8 @@
         ut.invoice_money as invoiceMoney,
         ub.basis as basis,
         ut.unit_price + ub.basis - ifnull(uta.deduction,0) + ut.unloading_fee + ut.invoice_money as unitPrice1,
-        (ut.unit_price + ub.basis - ifnull(uta.deduction,0) + ut.unloading_fee + ut.invoice_money) * uta.net_weight as money,
+        (ut.unit_price + ub.basis - ifnull(uta.deduction,0) + ut.unloading_fee + ut.invoice_money)
+         * uta.net_weight as money,
         (ut.unit_price + ub.basis - ifnull(uta.deduction,0) + ut.unloading_fee + ut.invoice_money) * uta.net_weight as notMoney,
         '未付款' as payStatus,
         null as payDate,