误差面积使用宽高除以100万于与误差面积比较

guoyuji

2024-07-07 e2ea655607ad1ab385f95702c7d233c49e5355f3

误差面积使用宽高除以100万于与误差面积比较

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

@@ -354,7 +354,7 @@
              orderIdType:company.orderIdType
            }
            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>item.computeArea*1 < errorArea.value*1
                item=>item.width*item.height/1000000 < errorArea.value*1
            )
            if(errorAreaList.length){
              ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')}
@@ -1090,7 +1090,8 @@
    ElMessage.warning(t('basicData.msg.noProductDataInTheTable'))
  }
  fullData.forEach((item,index) => {
    if( !isNaN(item.computeArea*1) && item.computeArea != null && item.computeArea*1 < errorArea.value){
    let trueArea = item.width*item.height/1000000
    if( !isNaN(item.computeArea*1) && item.computeArea != null && trueArea < errorArea.value){
      item.computeArea = errorArea.value
      item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(2))
      item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))

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

@@ -51,7 +51,10 @@
        Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
        List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);
        List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("otherMoney")), OrderOtherMoney.class);
        orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> o.getColumn().indexOf("M")==0).collect(Collectors.toList());
        if(orderOtherMoneyList != null ){
            orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> o.getColumn().indexOf("M")==0).collect(Collectors.toList());
        }

        boolean saveState = true;
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();