提交报表

guoyujie

3 天以前 13450f431faf60cb2a7cef7bba2c758df39d906e

提交报表

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

@@ -315,6 +315,8 @@
      <template #title>
        <span style="font-weight: bold" v-show="showTitle">
          {{ row.orderId }}
          {{ row.customerName?'--':'' }}
          {{ row.customerName}}
          {{ row.project?'--':'' }}
          {{row.project}}
          {{ row.batch?'--':'' }}

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

@@ -257,6 +257,8 @@
      <template #title>
        <span style="font-weight: bold" v-show="showTitle">
          {{ row.orderId }}
          {{ row.customerName?'--':'' }}
          {{ row.customerName}}
          {{ row.project?'--':'' }}
          {{row.project}}
          {{ row.batch?'--':'' }}

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java

@@ -1171,7 +1171,6 @@
                materialInventoryMapper.insertMaterialOutbound(materialOutbound, oddNumber);
                log.setFunction("saveMaterialOutbound新增:"+oddNumber);
            }

            //获取对象集合循环进行新增修改

            if (!materialOutboundDetailList.isEmpty()) {
@@ -1230,10 +1229,6 @@
                        TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
                        return "false1";
                    }




                }

            }
@@ -1309,20 +1304,16 @@
    }

    public Object appGetStockList() {
        ExecutorService executor = Executors.newFixedThreadPool(2);
        AtomicReference<List<MaterialInventory>> materialInventoryList = new AtomicReference<>(new ArrayList<MaterialInventory>());
        executor.execute(() -> {
            materialInventoryList.set(materialInventoryMapper.selectGetStockList());
        });
        List<Object> list = new ArrayList<>();
        executor.shutdown();
        //ExecutorService executor = Executors.newFixedThreadPool(2);
        List<MaterialInventory> materialInventoryList = materialInventoryMapper.selectGetStockList();
        //executor.shutdown();

        Map<String, Object> totalSum  = new HashMap<>();

        Integer inventoryQuantity = 0;
        Integer availableQuantity = 0;
        Double totalArea = 0.00;
        for (MaterialInventory materialInventory : materialInventoryList.get()) {
        for (MaterialInventory materialInventory : materialInventoryList) {
            inventoryQuantity += materialInventory.getInventoryQuantity();
            availableQuantity += materialInventory.getAvailableQuantity();
            totalArea += materialInventory.getTotalArea();