Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-08-26 d3dfcd3e96cb0f2b04cfe973e4f348ee5fe96032

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

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

@@ -118,7 +118,7 @@
      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.remarks}}</span>&nbsp;
        <span>{{item.filmNumber}}</span>&nbsp;
        <span>{{ item.processingNote }}</span>
      </div>
    </div>

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

@@ -119,7 +119,7 @@
      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.remarks}}</span>&nbsp;
        <span>{{item.filmNumber}}</span>&nbsp;
        <span>{{ item.processingNote }}</span>
      </div>
    </div>

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

@@ -117,7 +117,7 @@
      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}x{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.remarks}}</span>&nbsp;
        <span>{{item.filmNumber}}</span>&nbsp;
        <span>{{ item.processingNote }}</span>
      </div>
    </div>

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

@@ -232,22 +232,27 @@
            }

            Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
            otherColumns.values().removeIf(value -> value == null || value.equals(""));
            OrderDetails.get(i).setOtherColumns(JSON.toJSONString(otherColumns));

            int finalI = i;
            otherColumns.forEach((key, value) ->{
            if(otherColumns!=null){
                otherColumns.values().removeIf(value -> value == null || value.equals(""));
                OrderDetails.get(i).setOtherColumns(JSON.toJSONString(otherColumns));

                if(value!=null && !value.equals("") && key.contains("M")) {
                    orderOtherMoneyList.forEach(orderOtherMoney -> {
                        if (orderOtherMoney.getColumn().equals(key)) {
                            orderOtherMoney.setQuantity(
                                    orderOtherMoney.getQuantity()+(Double.parseDouble((String) value)  * OrderDetails.get(finalI).getQuantity()));
                        }
                    });
                }
                otherColumns.forEach((key, value) ->{

            });
                    if(value!=null && !value.equals("") && key.contains("M")) {
                        orderOtherMoneyList.forEach(orderOtherMoney -> {
                            if (orderOtherMoney.getColumn().equals(key)) {
                                orderOtherMoney.setQuantity(
                                        orderOtherMoney.getQuantity()+(Double.parseDouble((String) value)  * OrderDetails.get(finalI).getQuantity()));
                            }
                        });
                    }

                });
            }else{
                OrderDetails.get(i).setOtherColumns("{}");
            }

        }



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

@@ -1139,7 +1139,7 @@
                                           pl.order_sort = fc.order_number and
                                           pl.technology_number = fc.technology_number
        where pl.create_time between #{selectTime1} and #{selectTime2}
        GROUP BY fc.process_id, ogd.technology_number, pl.reporting_work_id
        GROUP BY fc.process_id,fc.order_number, ogd.technology_number, pl.reporting_work_id
        order by pl.id desc, fc.process_id, ogd.technology_number
    </select>