计算方式 精度问题解决冲突

你好啊

2024-08-07 4be6aef4c0af3ce178d3d3e3c5f482d837da8045

计算方式  精度问题解决冲突

 north-glass-erp/northglass-erp/src/components/pp/OrderSortDetail.vue

@@ -188,7 +188,8 @@
      title: t('processCard.processId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      sortable: true,
    },
    {
      field: 'order_number',
@@ -205,6 +206,13 @@
      filterMethod: filterChanged
    },
    {
      field: 'glassNumber',
      title: t('reportingWorks.glassNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'glass_address',
      title: t('processCard.glassAddress'),
      filters: [{data: ''}],

 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue

@@ -362,6 +362,10 @@
        <td colspan="2"></td>
        <td colspan="2"></td>
      </tr>
      <tr>
        <td>原片箱号</td>
        <td colspan="20"></td>
      </tr>
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="23">
          <span style="display: flex;">

 north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue

@@ -388,6 +388,10 @@
        <td colspan="2"></td>
        <td colspan="2"></td>
      </tr>
      <tr>
        <td>原片箱号</td>
        <td colspan="20"></td>
      </tr>
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="23">
          <span style="display: flex;">

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue

@@ -30,7 +30,6 @@

  request.post(`/Delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      console.log(res.data.data)
      produceList.value = deepClone(res.data.data)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)

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

@@ -93,7 +93,6 @@

const getColumns = async () => {
  await request.post(`/basicOtherMoney/findAllByState`).then(res=>{
    console.log(res.data)
    res.data.forEach(item => {
      let column = {
        field: `otherColumns.${item.column}`,

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

@@ -35,7 +35,6 @@
  perimeter: 0
})
const getData = () => {
  console.log(selectedValues.value)
  request.post(`/order/printOrderProductGlassDetailMonolithic/${props.orderId}`,selectedValues.value).then(res => {
    data.value= res.data
    productIdData.value=data.value.orderDetail

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -952,6 +952,41 @@
        inconsistentParameters :'The required parameters are inconsistent',
        strip :'Piece',
        exportSelected :'Export selected',
    },

    menu:{
        salesAndDistribution :'Sales and Distribution',
        productionPlanning :'Production Planning',
        materialManage :'Material Manage',
        userManage :'User Manage',

        product :'Product',
        order :'Order',
        delivery :'Delivery',
        returns :'Returns',
        customer :'Customer',
        workOrder :'Work Order',
        processCard :'Process Card',
        reportingWorks :'Report for work',
        rework :'Rework',
        replenish :'Replenish',
        machine :'Machine',
        bOM :'BOM',
        report :'Report',
        productStock :'Product Stock',
        ingredientsStock :'Ingredients Stock',
        ingredients :'Ingredients',
        trader :'Trader',
        stockReport :'Stock Report',
        purchaseOrder :'Purchase Order',
        purchaseStorage :'Purchase Storage',
        purchaseReturn :'Purchase Return',
        orderBasicData :'Order Basic Data',
        productionBasicData :'Production Basic Data',
        warehouseBasicData :'Warehouse Basic Data',
        user :'User',
        role :'Role',
        userPassWord :'User Pass Word',
    }



 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -946,6 +946,41 @@
        inconsistentParameters :'Обязательные параметры не совпадают',
        strip :'Статья',
        exportSelected :'Экспортировать выделение',
    },

    menu:{
        salesAndDistribution :'Продажа и распределение',
        productionPlanning :'Производство и планирование',
        materialManage :'Закупки и материалы',
        userManage :'Пользователи и права доступа',

        product :'Управление товарными запасами',
        order :'Управление заказами',
        delivery :'Управление доставкой',
        returns :'Управление возвратом',
        customer :'Информация о клиентах',
        workOrder :'Управление рабочей документацией',
        processCard :'Управление картами процессов',
        reportingWorks :'Управление обратной связью',
        rework :'Управление переработкой',
        replenish :'Управление дополнительным стеклом',
        machine :'Управление оборудованием',
        bOM :'Управление BOM',
        report :'Управление отчетами',
        productStock :'Запасы готовой продукции',
        ingredientsStock :'Запасы материалов',
        ingredients :'Материальные данные',
        trader :'Управление поставщиками',
        stockReport :'Таблица запасов',
        purchaseOrder :'Закупочные заказы',
        purchaseStorage :'Закупки на складе',
        purchaseReturn :'Возврат покупок',
        orderBasicData :'Основы заказа',
        productionBasicData :'Основа производства',
        warehouseBasicData :'База запасов',
        user :'Список пользователей',
        role :'Права на роль',
        userPassWord :'Изменить пароль',
    }



 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -957,6 +957,41 @@
        inconsistentParameters :'必填,参数不一致',
        strip :'条',
        exportSelected :'导出选中',
    },

    menu:{
        salesAndDistribution :'销售与分销',
        productionPlanning :'生产与计划',
        materialManage :'采购与物资',
        userManage :'用户与权限',

        product :'商品管理',
        order :'订单管理',
        delivery :'送货管理',
        returns :'退货管理',
        customer :'客户信息',
        workOrder :'工单管理',
        processCard :'流程卡管理',
        reportingWorks :'报工管理',
        rework :'返工管理',
        Replenish :'补片管理',
        machine :'设备管理',
        bOM :'BOM管理',
        report :'报表管理',
        productStock :'成品库存',
        ingredientsStock :'物料库存',
        ingredients :'物料资料',
        trader :'供应商管理',
        stockReport :'仓储报表',
        purchaseOrder :'采购订单',
        purchaseStorage :'采购入库',
        purchaseReturn :'采购退货',
        orderBasicData :'订单基础',
        productionBasicData :'生产基础',
        warehouseBasicData :'库存基础',
        user :'用户列表',
        role :'角色权限',
        userPassWord :'修改密码',
    }



 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectSurplusMaterials.vue

@@ -229,7 +229,6 @@
            surplusMaterials: selectRecords,
            state:2
          })
          console.log(flowData.value)
          request.post("/MaterialInventory/addSelectSurplusMaterialsDate",flowData.value).then((res) => {
            if(res.code==200 && res.data===true){
              ElMessage.success(t('basicData.msg.saveSuccess'))

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue

@@ -310,7 +310,6 @@
const validRules = ref({
  "inventoryQuantity": [{
    validator (e) {
      console.log(e.row)
      if ((parseInt(e.row.inventoryQuantity) + e.row.receivedQuantity) > e.row.orderDetail.quantity) {
        return new Error('入库数量不能超过订单总数')
      }

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue

@@ -50,7 +50,6 @@
              }
            }
          }
          console.log(lastList.value)
        } else {
          ElMessage.warning(res.msg)
          router.push("/login")

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -124,7 +124,6 @@

    if (res.code == 200) {
      titleSelectJson.value = deepClone(res.data)
      console.log(titleSelectJson.value)
      //其他金额
      otherMoney.value = titleSelectJson.value.deliveryOtherMoney[0]
      //let columns = []
@@ -165,8 +164,6 @@


        titleUploadData.value=deepClone(res.data.title)
        console.log(111)
        console.log(titleSelectJson.value)
        titleUploadData.value.paymentTerms = titleSelectJson.value.paymentTerms[0].basicName
        titleUploadData.value.payMethod = titleSelectJson.value.payMethod[0].basicName
        const today = new Date
@@ -422,7 +419,6 @@
            deliveryIdType:company.deliveryIdType

          })
          console.log(flowData.value)
           request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
             if(res.code==200 && res.data===true){
               ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -324,7 +324,6 @@

const printingNumber = ()=>{
    request.post(`/Delivery/updateDeliveryPrintNumber/${rowClickIndex.value.deliveryId}`).then(res =>{

    })
}


 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue

@@ -274,7 +274,6 @@
            return
          }
          //判断所选项目是否相同
          console.log(projectArray)
          if(!isAllEqual(projectArray)){
            ElMessage.warning(t('delivery.pleaseSelectTheSameCustomerProject'))
            return

 north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue

@@ -347,7 +347,6 @@
    }
    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData.value).then((res) => {
      if(res.code==200){
        console.log(res.data.data)
        total.dataTotal = res.data.total.total*1
        total.pageTotal=parseInt(res.data.total)
        pageNum.value=1

 north-glass-erp/northglass-erp/src/views/system/user/UserList.vue

@@ -82,7 +82,6 @@
})
onMounted(()=>{
  request.get('/userInfo/findAll').then(res=>{
    console.log(res.data)
    let arr = res.data.users[0]
    arr.forEach(item=>{
      let bValues = item.userRoleList.map(item => item.role);

 north-glass-erp/northglass-erp/src/views/system/userPassWord/UpdateUserName.vue

@@ -26,7 +26,6 @@


const submitForm = () => {
  console.log(register.userName)
  if(register.userName==""||register.userName==null){
    ElMessage.warning(t('user.userNameCannotBeEmpty'))
    return

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

@@ -22,6 +22,8 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -247,7 +249,30 @@
                        calculateType=orderDetail.getOrder().getCalculateType();
                    }
                    double deliveryDetailMoney = 0.0;

                    BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
                    BigDecimal getQuantity= BigDecimal.valueOf(orderDetail.getDeliveryDetail().getQuantity());
                    BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
                    BigDecimal getWidth= BigDecimal.valueOf(orderDetail.getWidth());
                    BigDecimal getHeight= BigDecimal.valueOf(orderDetail.getHeight());
                    BigDecimal singlePieceArea =getComputeArea.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP)
                            .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
                    //根据订单计算方式进行金额计算
                    if (calculateType==1){
                        deliveryDetailMoney=singlePieceArea.doubleValue();

                    }else if (calculateType==2){
                        if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
                            deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
                                    .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
                        }else{
                            deliveryDetailMoney=singlePieceArea.doubleValue();
                        }
                    }else if (calculateType==3){
                        deliveryDetailMoney=getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();

                    }
                    /*if (calculateType==1){
                        deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
                                String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
                        )*orderDetail.getPrice()));
@@ -264,8 +289,8 @@
                    }else if (calculateType==3){
                        deliveryDetailMoney=Double.parseDouble(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));

                    }
                    //根据订单计算方式进行金额计算
                    }*/



                    if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -472,13 +472,41 @@

    <select id="selectPrintMp">
        select *
        from ((select fc.id,
        from ((
                  select fc.id,
                         fc.order_id,
                         fc.process_id,
                         o.customer_name,
                         o.project,
                         ogd.technology_number,
                         ogd.glass_address,
                         sum(od.quantity)         as quantity,
                         sum(ogd.total_area)      as total_area,
                         od.product_name,
                         ogd.glass_child,
                         fc.founder,
                         date(fc.splitFrame_time) as splitFrame_time,
                         fc.print_status,
                         ogd.process
                  from flow_card as fc
                           left join sd.order_glass_detail as ogd
                                     on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
                                        ogd.technology_number = fc.technology_number
                           left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
                           left join sd.`order` as o on o.order_id = fc.order_id
                  where fc.order_id = #{orderId}
                  GROUP BY fc.process_id, ogd.technology_number
                  order by fc.process_id, ogd.technology_number
              )
              UNION

        (select fc.id,
                      fc.order_id,
                      fc.process_id,
                      o.customer_name,
                      o.project,
                      ogdss.technology_number,
                      ogdss.concatenated_glass_child,
                      ogd.glass_address,
                      ROUND(sum(fc.quantity) / (count(DISTINCT fc.technology_number))) as quantity,
                      sum(ogd.total_area)                                              as total_area,
                      # SUM(ogd.child_width*child_height*fc.quantity/(count(DISTINCT ogd.technology_number))) as total_area,
@@ -503,10 +531,10 @@
                                          process                                           AS processed_part
                                   from sd.order_glass_detail as ogds
                                   where ogds.order_id = #{orderId}
                                   GROUP BY order_id, order_number, ogds.glass_child) as ogdss
                                   GROUP BY order_id, order_number, ogds.glass_child,process) as ogdss
                                  on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
               where fc.order_id = #{orderId}
               GROUP BY fc.process_id, ogdss.concatenated_glass_child
               GROUP BY fc.process_id, ogdss.concatenated_glass_child,ogdss.processed_part
               order by fc.process_id, ogdss.technology_number)

              UNION
@@ -593,7 +621,7 @@
               order by fc.process_id)) AS combined_results
        where process is not null
          and process != ""

        GROUP BY order_id,process_id,technology_number
    </select>

    <select id="getPrimaryList">
@@ -995,11 +1023,13 @@
               fc.quantity,
               ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
               fc.sort,
               ogd.process
               ogd.process,
               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS glassNumber
        FROM flow_card AS fc
                 LEFT JOIN sd.order_glass_detail AS ogd ON fc.order_id = ogd.order_id
            AND fc.order_number = ogd.order_number
            AND fc.technology_number = ogd.technology_number
        left join sd.order_detail as od on fc.order_id = od.order_id and fc.order_number = od.order_number
        where fc.order_id = #{orderId}
        order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.technology_number)
    </select>

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -33,12 +33,13 @@
    </select>

    <select id="selectMaxOrderIdByYear">
        select
            ifnull(SUBSTR(max(order_id) from 5),0)
       select ifnull((select
            SUBSTR(order_id from 5)
        from
            `order` as a
        where
            year(a.create_time)  = year(NOW())
            year(a.create_time)  = year(now())
        order by  id desc limit 1),0) temp
    </select>

    <update id="updateOrderParameter">