更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -1047,7 +1047,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
 
         try {
             // 取得文件名。
-            String fileName = "excel";
+            String fileName = "excelExpenseInfo";
             // 给文件名编码
             fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1");
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -620,7 +620,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                         identityAuthenticationInfo.setGoodsName("玉米");
                     }
                     List<PaymentManagement> paymentManagementList = paymentManagementService.selectList(new EntityWrapper<PaymentManagement>()
-                            .like("goods_name", "%" + identityAuthenticationInfo.getGoodsName() + "%")
+//                            .like("goods_name", "%" + identityAuthenticationInfo.getGoodsName() + "%")
                             .eq("customer_number_card", identityAuthenticationInfo1.getCustomerNumberCard())
                             .eq("comp_id", purchasePrice.getCompId())
                             .ge("create_date", year));
@@ -633,8 +633,10 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                             }
                             //潮粮纯重
                             else if ("潮粮".equals(paymentManagement1.getType())) {
-                                netWeight = netWeight + (paymentManagement1.getPureWeight() != null ? paymentManagement1.getPureWeight() : 0f);
+//                                netWeight = netWeight + (paymentManagement1.getPureWeight() != null ? paymentManagement1.getPureWeight() : 0f);
+                                netWeight = netWeight + (paymentManagement1.getNetWeight() != null ? paymentManagement1.getNetWeight() : 0f);
                             }
+
                         }
                         cumulant = cumulant + netWeight;
                     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -3359,7 +3359,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
 //            File file = new File(path);
 //            File file = new File( new String(("templates" + File.separator + "仓库信息"+".xlsx").getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
             // 取得文件名。
-            String fileName = "excel1";
+            String fileName = "excelPayment";
             // 给文件名编码
             fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1");
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -5394,7 +5394,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 //            File file = new File(path);
 //            File file = new File( new String(("templates" + File.separator + "仓库信息"+".xlsx").getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
             // 取得文件名。
-            String fileName = "excel";
+            String fileName = "excelWarehouse";
             // 给文件名编码
             fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1");
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -1445,7 +1445,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
 
         try {
             // 取得文件名。
-            String fileName = "excel";
+            String fileName = "excelOrder";
             // 给文件名编码
             fileName = new String(fileName.getBytes("GBK"), "ISO-8859-1");
 

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/IdentityAuthenticationInfoMapper.xml

@@ -23,7 +23,8 @@
         a.card_address_url as cardAddressUrl,
         a.comp_id as compId,
         a.supplier,
-        ROUND((SELECT IFNULL(sum(case when p.type ='潮粮' then p.pure_weight else p.net_weight end),0)
+        --         ROUND((SELECT IFNULL(sum(case when p.type ='潮粮' then p.pure_weight else p.net_weight end),0)
+        ROUND((SELECT IFNULL(sum(case when p.type ='潮粮' then p.net_weight else p.net_weight end),0)
         FROM payment_management p
         WHERE p.delete_flag = '0'
         AND p.customer_number_card = a.customer_number_card
@@ -103,7 +104,8 @@
         a.card_address_url as cardAddressUrl,
         a.comp_id as compId,
         a.supplier,
-        (SELECT IFNULL(sum(case when p.type ='潮粮' then p.pure_weight else p.net_weight end),0)
+        --         (SELECT IFNULL(sum(case when p.type ='潮粮' then p.pure_weight else p.net_weight end),0)
+        (SELECT IFNULL(sum(case when p.type ='潮粮' then p.net_weight else p.net_weight end),0)
         FROM payment_management p
         WHERE p.delete_flag = '0'
         AND p.customer_number_card = a.customer_number_card