guoyuji
2024-06-06 c117d591e502911ed1b99f19cc3a774d03fcf692
修改后端代码(其他列   数字类型与字符类型的问题)
3个文件已修改
13 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
@@ -144,10 +144,10 @@
  otherMoney:{}
})
onMounted(()=>{
  xGrid.value.reloadData(prop.otherMoney)
  xGrid.value.reloadData(prop.otherMoney.filter(item => item.column.indexOf('M')>-1))
})
watch(prop,(newVal)=>{
  xGrid.value.reloadData(prop.otherMoney)
  xGrid.value.reloadData(prop.otherMoney.filter(item => item.column.indexOf('M')>-1))
})
const countAmount = (row) => {
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -601,9 +601,9 @@
  if(res.code==200){
    titleSelectJson.value=deepClone(res.data)
    //其他金额
    otherMoney.value = titleSelectJson.value.orderOtherMoney[0].filter(item => item.column.indexOf('M')>-1)
    otherMoney.value = titleSelectJson.value.orderOtherMoney[0]
    //let columns = []
    titleSelectJson.value.orderOtherMoney[0].forEach(item => {
    otherMoney.value.forEach(item => {
      let column = {
        field: `otherColumns.${item.column}`,
        width:100,
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -126,13 +126,12 @@
            Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
            int finalI = i;
            if(otherColumns!=null){
                otherColumns.forEach((key, value) ->{
                    if(value!=null && key.equals("M")) {
                    if(value!=null && key.contains("M")) {
                        orderOtherMoneyList.forEach(orderOtherMoney -> {
                            if (orderOtherMoney.getColumn().equals(key)) {
                                orderOtherMoney.setQuantity(orderOtherMoney.getQuantity()+((Double) value * OrderDetails.get(finalI).getQuantity()));
                                orderOtherMoney.setQuantity(orderOtherMoney.getQuantity()+(Double.parseDouble((String) value)  * OrderDetails.get(finalI).getQuantity()));
                            }
                        });
                    }