parent: fea18897 | 补丁 | 提交 | ignore whitespace
廖井涛
2024-10-24 0db70fc24d541c54b218cca105b479a2882debf1 
修改小数点精度问题
4个文件已修改
38 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue


@@ -5,6 +5,8 @@


import companyInfo from "@/stores/sd/companyInfo"


import deepClone from "@/utils/deepClone";


import {ElMessage} from "element-plus";


import {add,multiply,multiplyAuto,divideAuto} from '@/utils/decimal';




const company = companyInfo()


let produceList = ref([])


let otherMoney = []


@@ -39,7 +41,7 @@


      produceList.value.forEach(item => {


        sumMoney+=item.DeliveryDetail.money


      })




      console.log(otherMoney.value)


      otherMoney1=[]


      otherMoney=deepClone(res.data.otherMoney)


      for(let i=0;i<otherMoney.length;i++){


@@ -51,8 +53,9 @@


          else{


            for(let s=0;s<otherMoney1.length;s++){


              if(otherMoney[i].DeliveryDetailOtherMoney.alias===otherMoney1[s].DeliveryDetailOtherMoney.alias){


                otherMoney1[s].DeliveryDetailOtherMoney.count=otherMoney[i].DeliveryDetailOtherMoney.count+otherMoney1[s].DeliveryDetailOtherMoney.count


                otherMoney1[s].DeliveryDetailOtherMoney.monery =otherMoney[i].DeliveryDetailOtherMoney.monery+otherMoney1[s].DeliveryDetailOtherMoney.monery




                otherMoney1[s].DeliveryDetailOtherMoney.count=add(otherMoney[i].DeliveryDetailOtherMoney.count,otherMoney1[s].DeliveryDetailOtherMoney.count)


                otherMoney1[s].DeliveryDetailOtherMoney.monery =add(otherMoney[i].DeliveryDetailOtherMoney.monery,otherMoney1[s].DeliveryDetailOtherMoney.monery)


                break


              }


              if(s+1===otherMoney1.length){


@@ -220,7 +223,7 @@


                  <span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>&nbsp;


                  <span  style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>&nbsp;


                  <span  style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</span>&nbsp;


                  <span  style="width: 25%">{{parseFloat(item.DeliveryDetailOtherMoney.monery.toFixed(2))}}</span>


                  <span  style="width: 25%">{{parseFloat(item.DeliveryDetailOtherMoney.monery).toFixed(2)}}</span>


                </div>


                <div style="display: flex;font-size: 10px;text-align: center" v-if="delivery.freight>0">


                  <span style="width: 25%">运费</span>&nbsp;




 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue


@@ -5,6 +5,7 @@


import companyInfo from "@/stores/sd/companyInfo"


import deepClone from "@/utils/deepClone";


import {ElMessage} from "element-plus";


import {add,multiply,multiplyAuto,divideAuto} from '@/utils/decimal';


const company = companyInfo()


let produceList = ref([])


let delivery = ref([])


@@ -53,8 +54,8 @@


          else{


            for(let s=0;s<otherMoney1.length;s++){


              if(otherMoney[i].DeliveryDetailOtherMoney.alias===otherMoney1[s].DeliveryDetailOtherMoney.alias){


                otherMoney1[s].DeliveryDetailOtherMoney.count=otherMoney[i].DeliveryDetailOtherMoney.count+otherMoney1[s].DeliveryDetailOtherMoney.count


                otherMoney1[s].DeliveryDetailOtherMoney.monery =otherMoney[i].DeliveryDetailOtherMoney.monery+otherMoney1[s].DeliveryDetailOtherMoney.monery


                otherMoney1[s].DeliveryDetailOtherMoney.count=add(otherMoney[i].DeliveryDetailOtherMoney.count,otherMoney1[s].DeliveryDetailOtherMoney.count)


                otherMoney1[s].DeliveryDetailOtherMoney.monery =add(otherMoney[i].DeliveryDetailOtherMoney.monery,otherMoney1[s].DeliveryDetailOtherMoney.monery)


                break


              }


              if(s+1===otherMoney1.length){


@@ -132,8 +133,8 @@


          else{


            for(let s=0;s<otherMoney1.length;s++){


              if(otherMoney[i].DeliveryDetailOtherMoney.alias===otherMoney1[s].DeliveryDetailOtherMoney.alias){


                otherMoney1[s].DeliveryDetailOtherMoney.count=otherMoney[i].DeliveryDetailOtherMoney.count+otherMoney1[s].DeliveryDetailOtherMoney.count


                otherMoney1[s].DeliveryDetailOtherMoney.monery =otherMoney[i].DeliveryDetailOtherMoney.monery+otherMoney1[s].DeliveryDetailOtherMoney.monery


                otherMoney1[s].DeliveryDetailOtherMoney.count=add(otherMoney[i].DeliveryDetailOtherMoney.count,otherMoney1[s].DeliveryDetailOtherMoney.count)


                otherMoney1[s].DeliveryDetailOtherMoney.monery =add(otherMoney[i].DeliveryDetailOtherMoney.monery,otherMoney1[s].DeliveryDetailOtherMoney.monery)


                break


              }


              if(s+1===otherMoney1.length){


@@ -262,7 +263,7 @@


            <span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>&nbsp;


            <span  style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>&nbsp;


            <span  style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</span>&nbsp;


            <span  style="width: 25%">{{parseFloat(item.DeliveryDetailOtherMoney.monery.toFixed(2))}}</span>


            <span  style="width: 25%">{{parseFloat(item.DeliveryDetailOtherMoney.monery).toFixed(2)}}</span>


          </div>


        </td>


        <td style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="5">大写金额:&nbsp;&nbsp;&nbsp;&nbsp;{{money}}</td>




 north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryDetailMapper.java


@@ -33,9 +33,9 @@


                                                         @Param("productId") Integer productId,@Param("orderId") String orderId);




    Map<String, Object> getSelectotherMoney(@Param("orderId") String orderId,@Param("deliveryId") String deliveryId,


                                                   @Param("orderNumber") Integer orderNumber,@Param("key") String key,@Param("value") String value);


                                                   @Param("orderNumber") Integer orderNumber,@Param("key") String key,@Param("value") Double value);




    Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") String value);


    Map<String, Object> getSelectOrderotherMoney(@Param("orderId") String orderId,@Param("orderNumber") Integer orderNumber, @Param("key") String key,@Param("value") Double value);




    List <Map<String, Object>> getSelectOrderDetailPrinting(@Param("productId") Integer productId,@Param("orderId") String orderId);






 north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java


@@ -309,7 +309,8 @@


                                    boolean isnull = key.contains("M");


                                    if(isnull) {


                                        Map<String, Object> moneryItemmap = new HashMap<>();


                                        Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());


                                        Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(),


                                                key, Double.valueOf(jsonObject.get(key).toString()));


                                        if(deliveryDetailOtherMoney.get("monery")!=null){


                                            otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());


                                            deliveryDetailotherMoneys=Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());


@@ -376,7 +377,7 @@




                int intMoney= (int) Math.round(money+freight+otherMoneys);


                //修改发货明细累加面积数量金额


                deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);


                deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoneys, oddNumber);


                logService.saveLog(log);


            } else {


                return "false3";


@@ -488,8 +489,8 @@


                        if(isnull) {


                            Map<String, Object> moneryItemmap = new HashMap<>();


                            Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),


                                    detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), key, jsonObject.get(key).toString());




                                    detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), key,Double.valueOf(jsonObject.get(key).toString()));


                            Double sss= Double.valueOf(jsonObject.get(key).toString());


                            moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);


                            moneryList.add(moneryItemmap);


                        }


@@ -544,7 +545,8 @@


                            boolean isnull = key.contains("M");


                            if(isnull){


                                Map<String, Object> moneryItemmap = new HashMap<>();


                                Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString()),key,jsonObject.get(key).toString());


                                Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString())


                                        ,key,Double.valueOf(jsonObject.get(key).toString()));


                                grossAmount=grossAmount.add(BigDecimal.valueOf(Double.parseDouble(deliveryDetailOtherMoney.get("monery").toString())));


                                moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);


                                moneryList.add(moneryItemmap);