提交

廖井涛

2024-07-11 51969c7ca593acd5cfc2e518aceded283a240d27

提交

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

@@ -36,7 +36,10 @@
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)
      otherMoney.value.forEach(item => {
        otherMoneys+=item.DeliveryDetailOtherMoney.monery
        if(item.DeliveryDetailOtherMoney.monery!=null){
          otherMoneys+=item.DeliveryDetailOtherMoney.monery
        }

      })
    }else{
      ElMessage.warning(res.msg)

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

@@ -36,7 +36,9 @@
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)
      otherMoney.value.forEach(item => {
        otherMoneys+=item.DeliveryDetailOtherMoney.monery
        if(item.DeliveryDetailOtherMoney.monery!=null){
          otherMoneys+=item.DeliveryDetailOtherMoney.monery
        }
      })
    }else{
      ElMessage.warning(res.msg)

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

@@ -414,7 +414,6 @@
               router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
             }else{
               ElMessage.warning(t('basicData.msg.saveFail'))
               router.push("/login")
             }
           }).catch((err)=>{
             ElMessage.error(t('basicData.msg.ServerConnectionError'))

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

@@ -255,9 +255,14 @@
                            if(isnull) {
                                Map<String, Object> moneryItemmap = new HashMap<>();
                                Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
                                otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
                                moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                                moneryList.add(moneryItemmap);
                                System.out.println(deliveryDetailOtherMoney.get("monery"));
                                if(deliveryDetailOtherMoney.get("monery")!=null){
                                    otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
                                    moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                                    moneryList.add(moneryItemmap);
                                }else{
                                    return false;
                                }
                            }
                        }