Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -71,7 +71,7 @@
         ROUND(a.net_weight/1000,3) as netWeight,
         a.unit_deduction as unitDeduction,
         a.solid_grain_price as pureWeightPrice,
-        case when a.goods_name like '%潮粮%' then ROUND(a.pure_weight/1000,3) else ROUND(a.net_weight/1000,3) end as pureWeight,
+        case when a.goods_name like '%潮粮%' then a.pure_weight else a.net_weight end as pureWeight,
         a.amount_ing_payable as amountIngPayable,
         a.amount_ed_payable as amountEdPayable,
         i.payee_name as payeeName,
@@ -139,7 +139,7 @@
         s.net_weight as netWeight,
         s.deduction_amount as unitDeduction,
         '' as pureWeightPrice,
-        case when w.goods_name like '%潮粮%' then ROUND(w.pure_weight/1000,3) else ROUND(w.net_weight/1000,3) end as pureWeight,
+        case when w.goods_name like '%潮粮%' then w.pure_weight else w.net_weight*1000 end as pureWeight,
         s.amount_ing_payable as amountIngPayable,
         s.amount_ed_payable as amountEdPayable,
         i.payee_name as payeeName,
@@ -212,7 +212,7 @@
         w.net_weight as netWeight,
         IFNULL(q.deduction_amount,0) as unitDeduction,
         '' as pureWeightPrice,
-        case when a.goods_name like '%潮粮%' then ROUND(a.pure_weight/1000,3) else ROUND(a.net_weight/1000,3) end as pureWeight,
+        case when w.goods_name like '%潮粮%' then w.pure_weight else w.net_weight*1000 end as pureWeight,
 --         ROUND(IFNULL(r.amount_ing_payable,(w.cost+IFNULL(t.tran_price,0))*t.load_net_weight),2) as amountIngPayable,
         case when cmi.settlement_weight_method = '1' then ROUND((w.cost-IFNULL(q.deduction_amount,0))*t.load_net_weight,2)
         else ROUND((w.cost-IFNULL(q.deduction_amount,0))*w.net_weight,2) end as amountIngPayable,
@@ -294,7 +294,7 @@
         w.net_weight as netWeight,
         '' as unitDeduction,
         '' as pureWeightPrice,
-        case when a.goods_name like '%潮粮%' then ROUND(a.pure_weight/1000,3) else ROUND(a.net_weight/1000,3) end as pureWeight,
+        case when w.goods_name like '%潮粮%' then w.pure_weight else w.net_weight*1000 end as pureWeight,
         0 as amountIngPayable,
         0 as amountEdPayable,
         '' as payeeName,