diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageRest.java index 493105a1..74c82032 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageRest.java @@ -53,21 +53,22 @@ public class GdInstorageRest { @GetMapping("/test") public ResultBean test() { - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/23汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/24汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/25汇融银行_入库明细表 .xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/26汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/27汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/28汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/29汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/30汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-1汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-2汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-3汇融银行_入库明细表.xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-4汇融银行_入库明细表 (1).xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-5汇融银行_入库明细表 (1).xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-6汇融银行_入库明细表 (1).xlsx"); - gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-7汇融银行_入库明细表 (1).xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/23汇融银行_入库明细表.xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/24汇融银行_入库明细表.xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/25汇融银行_入库明细表 .xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/26汇融银行_入库明细表.xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/27汇融银行_入库明细表.xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/28汇融银行_入库明细表.xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/29汇融银行_入库明细表.xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/30汇融银行_入库明细表.xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-1汇融银行_入库明细表.xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-2汇融银行_入库明细表.xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-3汇融银行_入库明细表.xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-4汇融银行_入库明细表 (1).xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-5汇融银行_入库明细表 (1).xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-6汇融银行_入库明细表 (1).xlsx"); + // gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221208/aaa/12-7汇融银行_入库明细表 (1).xlsx"); + gdInstorageService.doimp("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221209/12-8汇融银行_入库明细表 (1).xlsx"); return ResultBean.fireSuccess(); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOkMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOkMapper.java index 626981ce..284df9a5 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOkMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOkMapper.java @@ -52,32 +52,32 @@ public interface GdInventoryOkMapper extends BaseMapper { @Delete("delete from gd_inventory_ok where 1=1") void clearData(); - @Select("select count(1) from (select warehouseCode from gd_inventory_ok where warehouseType='1' and warehouseCode<>'112' group by warehouseCode) t ") + @Select("select IFNULL(count(1),0) from (select warehouseCode from gd_inventory_ok where warehouseType='1' and warehouseCode<>'112' group by warehouseCode) t ") int countWarehouseType1Not112(); - @Select("select count(1) from (select warehouseCode from gd_inventory_ok where warehouseType='2' group by warehouseCode) t ") + @Select("select IFNULL(count(1),0) from (select warehouseCode from gd_inventory_ok where warehouseType='2' group by warehouseCode) t ") int countWarehouseType2(); - @Select("select count(1) from gd_inventory_ok where warehouseCode='112'") + @Select("select IFNULL(count(1),0) from gd_inventory_ok where warehouseCode='112'") int countProd112(); - @Select("select count(1) from gd_inventory_ok where warehouseType='1' and warehouseCode<>'112'") + @Select("select IFNULL(count(1),0) from gd_inventory_ok where warehouseType='1' and warehouseCode<>'112'") int countProd1Not112(); - @Select("select count(1) from gd_inventory_ok where warehouseType='2'") + @Select("select IFNULL(count(1),0) from gd_inventory_ok where warehouseType='2'") int countProd2(); - @Select("select sum(prodValue) from gd_inventory_ok where warehouseCode='112'") + @Select("select IFNULL(sum(prodValue),0) from gd_inventory_ok where warehouseCode='112'") double countVal112(); - @Select("select sum(prodValue) from gd_inventory_ok where warehouseType='1' and warehouseCode<>'112'") + @Select("select IFNULL(sum(prodValue),0) from gd_inventory_ok where warehouseType='1' and warehouseCode<>'112'") double countVal1Not112(); - @Select("select sum(prodValue) from gd_inventory_ok where warehouseType='2'") + @Select("select IFNULL(sum(prodValue),0) from gd_inventory_ok where warehouseType='2'") double countVal2(); - @Select("select warehouseName,warehouseType,count(1) as coun,sum(prodValue) as su from gd_inventory_ok gio group by warehouseName,warehouseType order by warehouseType") + @Select("select warehouseName,warehouseType,IFNULL(count(1),0) as coun,IFNULL(sum(prodValue),0) as su from gd_inventory_ok gio group by warehouseName,warehouseType order by warehouseType") List> listOfWarehouse(); @Select("select warehouseCode, warehouseName, warehouseType, prodCode, prodBarCode, prodName, prodNum, prodValue from gd_inventory_ok order by warehouseType")