1

get-data/src/main/java/com/huimv/getdata/controller/CenterController.java

@@ -23,22 +23,22 @@ public class CenterController {
 
 
     @RequestMapping(value = "/getXiaoShouE",method = RequestMethod.GET)
-    public List<XiaoShouE> getXiaoShouE(@RequestParam(value = "date" ,required = false) Date date){
+    public List<XiaoShouE> getXiaoShouE(@RequestParam(value = "date" ,required = false) String date){
         return centerService.getXiaoShouE(date);
     }
 
     @RequestMapping(value = "/getDangQianYvQi",method = RequestMethod.GET)
-    public List<DangQianYvQi> getDangQianYvQi(@RequestParam(value = "date" ,required = false) Date date){
+    public List<DangQianYvQi> getDangQianYvQi(@RequestParam(value = "date" ,required = false) String date){
         return centerService.getDangQianYvQi(date);
     }
 
     @RequestMapping(value = "/getCaiGouJinE",method = RequestMethod.GET)
-    public List<CaiGouJinE> getCaiGouJinE(@RequestParam(value = "date" ,required = false) Date date){
+    public List<CaiGouJinE> getCaiGouJinE(@RequestParam(value = "date" ,required = false) String date){
         return centerService.getCaiGouJinE(date);
     }
 
     @RequestMapping(value = "/getYangMaoZhiCaiGouJinE",method = RequestMethod.GET)
-    public List<YangMaoZhiCaiGouJinE> getYangMaoZhiCaiGouJinE(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YangMaoZhiCaiGouJinE> getYangMaoZhiCaiGouJinE(@RequestParam(value = "date" ,required = false) String date){
         return centerService.getYangMaoZhiCaiGouJinE(date);
     }
 }

get-data/src/main/java/com/huimv/getdata/controller/ErpCaiGouController.java

@@ -22,51 +22,52 @@ public class ErpCaiGouController {
 
 
     @RequestMapping(value = "/getCaiGouRuku",method = RequestMethod.GET)
-    public List<CaiGouRuKu> getCaiGouRuku(@RequestParam(value = "date" ,required = false) Date date){
+    public List<CaiGouRuKu> getCaiGouRuku(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getCaiGouRuku(date);
     }
     @RequestMapping(value = "/getCaiGouFaPiao",method = RequestMethod.GET)
-    public List<FaPiaoJinE> getCaiGouFaPiao(@RequestParam(value = "date" ,required = false) Date date){
+    public List<FaPiaoJinE> getCaiGouFaPiao(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getCaiGouFaPiao(date);
     }
     @RequestMapping(value = "/getLeiJiRuKu",method = RequestMethod.GET)
-    public List<LeiJiRuKu> getLeiJiRuKu(@RequestParam(value = "date" ,required = false) Date date){
+    public List<LeiJiRuKu> getLeiJiRuKu(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getLeiJiRuKu(date);
     }
     @RequestMapping(value = "/getShouLiaoJinE",method = RequestMethod.GET)
-    public List<ShouLiaoJinE> getShouLiaoJinE(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ShouLiaoJinE> getShouLiaoJinE(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getShouLiaoJinE(date);
     }
     @RequestMapping(value = "/getJiaoHuoShuLiang",method = RequestMethod.GET)
-    public List<JiaoHuoShuliang> getJiaoHuoShuLiang(@RequestParam(value = "date" ,required = false) Date date){
+    public List<JiaoHuoShuliang> getJiaoHuoShuLiang(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getJiaoHuoShuLiang(date);
     }
     @RequestMapping(value = "/getCaiGouShuLiang",method = RequestMethod.GET)
-    public List<CaiGouShuLiang> getCaiGouShuLiang(@RequestParam(value = "date" ,required = false) Date date){
+    public List<CaiGouShuLiang> getCaiGouShuLiang(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getCaiGouShuLiang(date);
     }
     @RequestMapping(value = "/getCaiGouDingDanShuLiangJinE",method = RequestMethod.GET)
-    public List<CaiGouDingDanShuLiangJinE> getCaiGouDingDanShuLiangJinE(@RequestParam(value = "date" ,required = false) Date date){
+    public List<CaiGouDingDanShuLiangJinE> getCaiGouDingDanShuLiangJinE(@RequestParam(value = "date" ,required = false) String date){
+
         return iErpCaiGouService.getCaiGouDingDanShuLiangJinE(date);
     }
     @RequestMapping(value = "/getDaiJianShuLiang",method = RequestMethod.GET)
-    public List<DaiJianShuLiang> getDaiJianShuLiang(@RequestParam(value = "date" ,required = false) Date date){
+    public List<DaiJianShuLiang> getDaiJianShuLiang(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getDaiJianShuLiang(date);
     }
     @RequestMapping(value = "/getCaiGouYueJun",method = RequestMethod.GET)
-    public List<CaiGouYueJun> getCaiGouYueJun(@RequestParam(value = "date" ,required = false) Date date){
+    public List<CaiGouYueJun> getCaiGouYueJun(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getCaiGouYueJun(date);
     }
     @RequestMapping(value = "/getYingFuZhangKuang",method = RequestMethod.GET)
-    public List<YingFuZhangKuan> getYingFuZhangKuang(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YingFuZhangKuan> getYingFuZhangKuang(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getYingFuZhangKuang(date);
     }
     @RequestMapping(value = "/getZuiDiKuChun",method = RequestMethod.GET)
-    public List<ZuiDiKuChun> getZuiDiKuChun(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ZuiDiKuChun> getZuiDiKuChun(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getZuiDiKuChun(date);
     }
     @RequestMapping(value = "/getCaiGouHeTongShuLiangJinE",method = RequestMethod.GET)
-    public List<CaiGouDingDanShuLiangJinE> getCaiGouHeTongShuLiangJinE(@RequestParam(value = "date" ,required = false) Date date){
+    public List<CaiGouDingDanShuLiangJinE> getCaiGouHeTongShuLiangJinE(@RequestParam(value = "date" ,required = false) String date){
         return iErpCaiGouService.getCaiGouHeTongShuLiangJinE(date);
     }
 }

get-data/src/main/java/com/huimv/getdata/controller/ErpHrController.java

@@ -21,7 +21,7 @@ public class ErpHrController {
     private IErpHrService erpHrService;
 
     @RequestMapping(value = "/getYuanGongRenShu",method = RequestMethod.GET)
-    public List<YuanGongShuLiang> getYuanGongRenShu(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YuanGongShuLiang> getYuanGongRenShu(@RequestParam(value = "date" ,required = false) String date){
         return erpHrService.getYuanGongRenShu(date);
     }
 }

get-data/src/main/java/com/huimv/getdata/controller/ErpKuCunController.java

@@ -22,72 +22,72 @@ public class ErpKuCunController {
     IErpKuCunService iErpKuCunService;
 
     @RequestMapping(value = "/getYuanCaiLiaoCunLiang",method = RequestMethod.GET)
-    public List<YuanCaiLiaoKuCun> getYuanCaiLiaoCunLiang(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YuanCaiLiaoKuCun> getYuanCaiLiaoCunLiang(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getYuanCaiLiaoCunLiang(date);
     }
 
     @RequestMapping(value = "/getYangMaoZhiKuCun",method = RequestMethod.GET)
-    public List<YangMaoZhiChuKu> getYangMaoZhiKuCun(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YangMaoZhiChuKu> getYangMaoZhiKuCun(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getYangMaoZhiKuCun(date);
     }
 
     @RequestMapping(value = "/getYangMaoZhiGongYingShang",method = RequestMethod.GET)
-    public List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShang(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShang(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getYangMaoZhiGongYingShang(date);
     }
 
     @RequestMapping(value = "/getYuanCaiLiaoDangRi",method = RequestMethod.GET)
-    public List<YuanCaiLiaoDangRiRuKu> getYuanCaiLiaoDangRi(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YuanCaiLiaoDangRiRuKu> getYuanCaiLiaoDangRi(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getYuanCaiLiaoDangRi(date);
     }
 
 
     @RequestMapping(value = "/getChengPinDangRi",method = RequestMethod.GET)
-    public List<ChengPinRuKu> getChengPinDangRi(@RequestParam(value = "date" ,required = false) Date date ,
-                                                @RequestParam(value = "type") int type ){
+    public List<ChengPinRuKu> getChengPinDangRi(@RequestParam(value = "date" ,required = false) String date ,
+                                                @RequestParam(value = "type",required = false) String type ){
         return iErpKuCunService.getChengPinDangRi(date,type);
     }
 
     @RequestMapping(value = "/getYangMaoZhiDangRi",method = RequestMethod.GET)
-    public List<ChengPinRuKu> getYangMaoZhiDangRi(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ChengPinRuKu> getYangMaoZhiDangRi(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getYangMaoZhiDangRi(date);
     }
 
 
     @RequestMapping(value = "/getYuanCaiLiaoChuKu",method = RequestMethod.GET)
-    public List<YuanCaiLiaoChuKu> getYuanCaiLiaoChuKu(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YuanCaiLiaoChuKu> getYuanCaiLiaoChuKu(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getYuanCaiLiaoChuKu(date);
     }
 
     @RequestMapping(value = "/getChengPinChuKu",method = RequestMethod.GET)
-    public List<ChenPinChuKu> getChengPinChuKu(@RequestParam(value = "date" ,required = false) Date date,
-                                               @RequestParam(value = "type") int type){
+    public List<ChenPinChuKu> getChengPinChuKu(@RequestParam(value = "date" ,required = false) String date,
+                                               @RequestParam(value = "type",required = false) String type){
         return iErpKuCunService.getChengPinChuKu(date,type);
     }
 
 
     @RequestMapping(value = "/getYangMaoZhiChuKu",method = RequestMethod.GET)
-    public List<YangMaoZhiChuKu> getYangMaoZhiChuKu(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YangMaoZhiChuKu> getYangMaoZhiChuKu(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getYangMaoZhiChuKu(date);
     }
 
     @RequestMapping(value = "/getKunCunQuShi",method = RequestMethod.GET)
-    public List<KunCunQuShi> getKunCunQuShi(@RequestParam(value = "date" ,required = false) Date date){
+    public List<KunCunQuShi> getKunCunQuShi(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getKunCunQuShi(date);
     }
 
     @RequestMapping(value = "/getChuKuShuLiang",method = RequestMethod.GET)
-    public List<YangMaoZhiChuKu> getChuKuShuLiang(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YangMaoZhiChuKu> getChuKuShuLiang(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getChuKuShuLiang(date);
     }
 
     @RequestMapping(value = "/getWuLiaoMingXi",method = RequestMethod.GET)
-    public List<WuLiaoKuMingXi> getWuLiaoMingXi(@RequestParam(value = "date" ,required = false) Date date){
+    public List<WuLiaoKuMingXi> getWuLiaoMingXi(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getWuLiaoMingXi(date);
     }
 
     @RequestMapping(value = "/getYangMaoZhiGongYingShangLeiJi",method = RequestMethod.GET)
-    public List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShangLeiJi(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShangLeiJi(@RequestParam(value = "date" ,required = false) String date){
         return iErpKuCunService.getYangMaoZhiGongYingShangLeiJi(date);
     }
 }

get-data/src/main/java/com/huimv/getdata/controller/ErpShengChanController.java

@@ -19,7 +19,7 @@ public class ErpShengChanController {
     private IErpShengChanService erpShengChanService;
 
     @RequestMapping(value = "/getShiJiChanLiang",method = RequestMethod.GET)
-    public List<ShiJiChanLiang> getShiJiChanLiang(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ShiJiChanLiang> getShiJiChanLiang(@RequestParam(value = "date" ,required = false) String date){
         return erpShengChanService.getShiJiChanLiang(date);
     }
 

get-data/src/main/java/com/huimv/getdata/controller/ErpVoucherColntroller.java

@@ -22,47 +22,47 @@ public class ErpVoucherColntroller {
     IErpVoucherService iErpVoucherService;
 
     @RequestMapping(value = "/getShouRuJinE",method = RequestMethod.GET)
-    public List<ErpVoucher> getDep(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ErpVoucher> getDep(@RequestParam(value = "date" ,required = false) String date){
         return iErpVoucherService.getShouRuJinE(date);
     }
 
     @RequestMapping(value = "/getDangQianYueYingYeE",method = RequestMethod.GET)
-    public List<ErpVoucher> getDangQianYueYingYeE(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ErpVoucher> getDangQianYueYingYeE(@RequestParam(value = "date" ,required = false) String date){
         return iErpVoucherService.getDangQianYueYingYeE(date);
     }
     @RequestMapping(value = "/getDangQianYueJingLiRun",method = RequestMethod.GET)
-    public List<ErpVoucher> getDangQianYueJingLiRun(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ErpVoucher> getDangQianYueJingLiRun(@RequestParam(value = "date" ,required = false) String date){
         return iErpVoucherService.getDangQianYueJingLiRun(date);
     }
 
     @RequestMapping(value = "/getDangQianZiJinYvE",method = RequestMethod.GET)
-    public List<ErpVoucher> getDangQianZiJinYvE(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ErpVoucher> getDangQianZiJinYvE(@RequestParam(value = "date" ,required = false) String date){
         return iErpVoucherService.getDangQianZiJinYvE(date);
     }
 
     @RequestMapping(value = "/getDangYueJieKuanYvE",method = RequestMethod.GET)
-    public List<ErpVoucher> getDangYueJieKuanYvE(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ErpVoucher> getDangYueJieKuanYvE(@RequestParam(value = "date" ,required = false) String date){
         return iErpVoucherService.getDangYueJieKuanYvE(date);
     }
 
     @RequestMapping(value = "/getGuoNeiWaiSouRu",method = RequestMethod.GET)
-    public List<ErpVoucher> getGuoNeiWaiSouRu(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ErpVoucher> getGuoNeiWaiSouRu(@RequestParam(value = "date" ,required = false) String date){
         return iErpVoucherService.getGuoNeiWaiSouRu(date);
     }
 
 
     @RequestMapping(value = "/getChanPinShouRu",method = RequestMethod.GET)
-    public List<ChanPinShouRu> getChanPinShouRu(@RequestParam(value = "date" ,required = false) Date date){
+    public List<ChanPinShouRu> getChanPinShouRu(@RequestParam(value = "date" ,required = false) String date){
         return iErpVoucherService.getChanPinShouRu(date);
     }
 
     @RequestMapping(value = "/JingLiRunQuShi",method = RequestMethod.GET)
-    public List<JingLiRunQuShi> getJingLiRunQuShi(@RequestParam(value = "date" ,required = false) Date date){
+    public List<JingLiRunQuShi> getJingLiRunQuShi(@RequestParam(value = "date" ,required = false) String date){
         return iErpVoucherService.getJingLiRunQuShi(date);
     }
 
     @RequestMapping(value = "/getLinJinHuanKuan",method = RequestMethod.GET)
-    public List<LinJinHuanKuanQi> getLinJinHuanKuan(@RequestParam(value = "date" ,required = false) Date date){
+    public List<LinJinHuanKuanQi> getLinJinHuanKuan(@RequestParam(value = "date" ,required = false) String date){
         return iErpVoucherService.getLinJinHuanKuan(date);
     }
 

get-data/src/main/java/com/huimv/getdata/controller/ErpXiaoShouController.java

@@ -22,32 +22,32 @@ public class ErpXiaoShouController {
     IErpXiaoShouService iErpXiaoShouService;
 
     @RequestMapping(value = "/getWanChengLv",method = RequestMethod.GET)
-    public List<XiaoShouWanChenLvJinE> getWanChengLv(@RequestParam(value = "date" ,required = false) Date date){
+    public List<XiaoShouWanChenLvJinE> getWanChengLv(@RequestParam(value = "date" ,required = false) String date){
         return iErpXiaoShouService.getWanChengLv(date);
     }
 
     @RequestMapping(value = "/getBaiFangKeHu",method = RequestMethod.GET)
-    public List<BaiFangKeHu> getBaiFangKeHu(@RequestParam(value = "date" ,required = false) Date date){
+    public List<BaiFangKeHu> getBaiFangKeHu(@RequestParam(value = "date" ,required = false) String date){
         return iErpXiaoShouService.getBaiFangKeHu(date);
     }
 
     @RequestMapping(value = "/getXiaoShouFaPiaoJinE",method = RequestMethod.GET)
-    public List<XiaoShouFaPiaoJinE> getXiaoShouFaPiaoJinE(@RequestParam(value = "date" ,required = false) Date date){
+    public List<XiaoShouFaPiaoJinE> getXiaoShouFaPiaoJinE(@RequestParam(value = "date" ,required = false) String date){
         return iErpXiaoShouService.getXiaoShouFaPiaoJinE(date);
     }
 
     @RequestMapping(value = "/getXiaoShouFaHuoJinEKeHuGongXian",method = RequestMethod.GET)
-    public List<XiaoShouFaHuoJinEKeHuGongXian> getXiaoShouFaHuoJinEKeHuGongXian(@RequestParam(value = "date" ,required = false) Date date){
+    public List<XiaoShouFaHuoJinEKeHuGongXian> getXiaoShouFaHuoJinEKeHuGongXian(@RequestParam(value = "date" ,required = false) String date){
         return iErpXiaoShouService.getXiaoShouFaHuoJinEKeHuGongXian(date);
     }
 
     @RequestMapping(value = "/getXiaoShouFeiYong",method = RequestMethod.GET)
-    public List<XiaoShouFeiYong> getXiaoShouFeiYong(@RequestParam(value = "date" ,required = false) Date date){
+    public List<XiaoShouFeiYong> getXiaoShouFeiYong(@RequestParam(value = "date" ,required = false) String date){
         return iErpXiaoShouService.getXiaoShouFeiYong(date);
     }
 
     @RequestMapping(value = "/getYvQiHeTongMingXi",method = RequestMethod.GET)
-    public List<YvQiHeTongMingXi> getYvQiHeTongMingXi(@RequestParam(value = "date" ,required = false) Date date){
+    public List<YvQiHeTongMingXi> getYvQiHeTongMingXi(@RequestParam(value = "date" ,required = false) String date){
         return iErpXiaoShouService.getYvQiHeTongMingXi(date);
     }
 

get-data/src/main/java/com/huimv/getdata/entity/ErpBdDepartment.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

get-data/src/main/java/com/huimv/getdata/entity/ErpBdOrg.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

get-data/src/main/java/com/huimv/getdata/entity/caigou/CaiGouDingDan.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class CaiGouDingDan {
     private Double FQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FPURCHASEORGID;
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/CaiGouDingDanShuLiangJinE.java

@@ -1,5 +1,7 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,10 +10,13 @@ import java.util.Date;
 public class CaiGouDingDanShuLiangJinE {
 
     private String fname;
+
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FPURCHASEORGID;
     private Double FQTY;
     private Double FALLAMOUNT;
     private Double danJia ;
+    private String gys ;
 
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/CaiGouRuKu.java

@@ -1,5 +1,11 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.getdata.entity.caigou
@@ -7,5 +13,11 @@ package com.huimv.getdata.entity.caigou;
  * @Author : yuxuexuan
  * @Create : 2025-01-04 15:08
  **/
+@Data
 public class CaiGouRuKu {
+    private Double FBILLAMOUNTLC;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
+    private Integer FDEMANDORGID;
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/CaiGouShuLiang.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class CaiGouShuLiang {
     private Double FQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
-    private Integer FSTOCKORGID;
+    private Integer FPURCHASEORGID;
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/CaiGouYueJun.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class CaiGouYueJun {
     private Double FQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FPURCHASEORGID;
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/DaiJianShuLiang.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -9,6 +10,7 @@ public class DaiJianShuLiang {
 
     private Double FINSTOCKQTY;
     private Double FACTRECEIVEQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     private Double DAIJIAN;

get-data/src/main/java/com/huimv/getdata/entity/caigou/DingDanJinE.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class DingDanJinE {
     private Double FALLAMOUNT;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FPURCHASEORGID;
 

get-data/src/main/java/com/huimv/getdata/entity/caigou/FaPiaoJinE.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,8 @@ import java.util.Date;
 @Data
 public class FaPiaoJinE {
     private Double FALLAMOUNT;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FPURCHASEORGID;
+    private Double FQTY;
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/JiaoHuoShuliang.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class JiaoHuoShuliang {
     private Double FACTRECEIVEQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FSTOCKORGID;
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/LeiJiRuKu.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class LeiJiRuKu {
     private Double FREALQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FDEMANDORGID;
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/RuKuJinE.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class RuKuJinE {
     private Double FREALQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FDEMANDORGID;
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/ShouLiaoJinE.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class ShouLiaoJinE {
     private Double FINSTOCKQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FSTOCKORGID;
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/YingFuZhangKuan.java

@@ -1,11 +1,13 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class YingFuZhangKuan {
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private String  FBGLSHSJDW;
     //采购组织
@@ -17,5 +19,10 @@ public class YingFuZhangKuan {
     private String FNAME;
     //未核销金额
     private Double FNOTVERIFICATEAMOUNT;
+    private double FQTY;
+    private String wuLiaoName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FBOOKINGDATE;
+
 
 }

get-data/src/main/java/com/huimv/getdata/entity/caigou/ZuiDiKuChun.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +11,7 @@ public class ZuiDiKuChun {
     private Double FINSTOCKQTY;
     //交货数量
     private Double FACTRECEIVEQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     //剩余数量

get-data/src/main/java/com/huimv/getdata/entity/center/CaiGouJinE.java

@@ -1,12 +1,14 @@
 package com.huimv.getdata.entity.center;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class CaiGouJinE {
-    private Date fdate;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
     //部门id
     private int FPURCHASEDEPTID;
     //组织ID

get-data/src/main/java/com/huimv/getdata/entity/center/DangQianYvQi.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.center;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -12,6 +13,7 @@ public class DangQianYvQi {
     private  int  FSALEORGID;
     //收款组织
     private  int  FPAYORGID;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Double FNOTVERIFICATEAMOUNT;
 

get-data/src/main/java/com/huimv/getdata/entity/center/XiaoShouE.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.center;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -12,6 +13,7 @@ public class XiaoShouE {
     private  int  FSALEORGID;
     //收款组织
     private  int  FPAYORGID;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Double FREALRECAMOUNTFOR;
 }

get-data/src/main/java/com/huimv/getdata/entity/center/YangMaoZhiCaiGouJinE.java

@@ -1,12 +1,14 @@
 package com.huimv.getdata.entity.center;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class YangMaoZhiCaiGouJinE {
-    private Date fdate;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
     //部门
     private int FPURCHASEDEPTID;
     //组织

get-data/src/main/java/com/huimv/getdata/entity/kucun/ChenPinChuKu.java

@@ -1,6 +1,7 @@
 package com.huimv.getdata.entity.kucun;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,8 +9,11 @@ import java.util.Date;
 @Data
 public class ChenPinChuKu {
     private Double FSALUNITQTY;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     private int FMATERIALID;
     private String FNAME;
+    private String fnumber;
+    private String wuLiaoName;
 }

get-data/src/main/java/com/huimv/getdata/entity/kucun/ChengPinRuKu.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,9 +8,11 @@ import java.util.Date;
 @Data
 public class ChengPinRuKu {
     private Double FREALQTY;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     private int FMATERIALID;
     private String FNAME;
-    private String FNUMBER;
+    private String fnumber;
+    private String wuLiaoName;
 }

get-data/src/main/java/com/huimv/getdata/entity/kucun/KunCunQuShi.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;

get-data/src/main/java/com/huimv/getdata/entity/kucun/WuLiaoKuMingXi.java

@@ -1,12 +1,14 @@
 package com.huimv.getdata.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class WuLiaoKuMingXi {
-    private Date fdate;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
     private int FSTOCKORGID;
     //交货数量
     private Double FACTRECEIVEQTY;
@@ -14,8 +16,8 @@ public class WuLiaoKuMingXi {
     private Double FINSTOCKQTY;
     //待检数量
     private Double daiJian;
-    private Date wuLiaoName ;
-    private Date FNUMBER;
-    private Date FNAME;
-    private Date FMATERIALID;
+    private String wuLiaoName ;
+    private String fnumber;
+    private String FNAME;
+    private String FMATERIALID;
 }

get-data/src/main/java/com/huimv/getdata/entity/kucun/YangMaoZhiChuKu.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class YangMaoZhiChuKu {
     private Double FSALUNITQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     private int FMATERIALID;

get-data/src/main/java/com/huimv/getdata/entity/kucun/YangMaoZhiGongYingShang.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 @Data

get-data/src/main/java/com/huimv/getdata/entity/kucun/YangMaoZhiKuCun.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;

get-data/src/main/java/com/huimv/getdata/entity/kucun/YuanCaiLiaoChuKu.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class YuanCaiLiaoChuKu {
     private Double FSALUNITQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     private int FMATERIALID;

get-data/src/main/java/com/huimv/getdata/entity/kucun/YuanCaiLiaoDangRiRuKu.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,10 +8,11 @@ import java.util.Date;
 @Data
 public class YuanCaiLiaoDangRiRuKu {
     private Double FREALQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     private int FMATERIALID;
     private String wuLiaoName;
-    private int FNUMBER;
+    private String fnumber;
     private String FNAME;
 }

get-data/src/main/java/com/huimv/getdata/entity/kucun/YuanCaiLiaoKuCun.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,10 +8,12 @@ import java.util.Date;
 @Data
 public class YuanCaiLiaoKuCun {
     private int FSTOCKORGID;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FUPDATETIME;
     private Double FBASEQTY;
     private String FNAME;
     private int FMATERIALID;
     private String wuLiaoName;
+    private String fnumber;
 
 }

get-data/src/main/java/com/huimv/getdata/entity/renshi/YuanGongShuLiang.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.renshi;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 @Data

get-data/src/main/java/com/huimv/getdata/entity/shengcan/ShiJiChanLiang.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.shengcan;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class ShiJiChanLiang {
     private double FREALQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     //入库组织
     private int FSTOCKORGID;

get-data/src/main/java/com/huimv/getdata/entity/voucher/ChanPinShouRu.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.voucher;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class ChanPinShouRu {
     private int fstockorgid;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date fdate ;
     private Double fallamount ;
     private String  fname ;

get-data/src/main/java/com/huimv/getdata/entity/voucher/ErpVoucher.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.voucher;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,7 +9,8 @@ import java.util.Date;
 public class ErpVoucher {
 
     private Double fcredit ;
-    private Date fdate;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
     private Integer facctorgid;
     private String  FNAME;
 }

get-data/src/main/java/com/huimv/getdata/entity/voucher/JingLiRunQuShi.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.voucher;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,7 +8,8 @@ import java.util.Date;
 @Data
 public class JingLiRunQuShi {
     private Double fcredit;
-    private Date fdate;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
     private int facctorgid;
     private String fnumber;
 

get-data/src/main/java/com/huimv/getdata/entity/voucher/LinJinHuanKuanQi.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.voucher;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -9,6 +10,7 @@ public class LinJinHuanKuanQi {
 
     private Double fcredit ;
     private String fname ;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date fdate ;
     private String orgName ;
     private String  forgid ;

get-data/src/main/java/com/huimv/getdata/entity/xiaoshou/BaiFangKeHu.java

@@ -1,20 +1,22 @@
 package com.huimv.getdata.entity.xiaoshou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class BaiFangKeHu {
-    private String  F_ZC_REMARKS;
-    private int  F_ZC_ORGID;
-    private Date F_ZC_DATE;
-    private int  F_ZC_BASE;
-    private int  F_ZC_BASE1;
-    private int  F_ZC_BASE2;
-    private int  F_ZC_REMARKS1;
-    private int  F_ZC_REMARKS2;
-    private int  F_ZC_REMARKS3;
-    private int  F_ZC_REMARKS4;
+    private String  FZCREMARKS;
+    private int  FZCORGID;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FZCDATE;
+    private int  FZCBASE;
+    private int  FZCBASE1;
+    private int  FZCBASE2;
+    private String  FZCREMARKS1;
+    private String  FZCREMARKS2;
+    private String  FZCREMARKS3;
+    private String  FZCREMARKS4;
 
 }

get-data/src/main/java/com/huimv/getdata/entity/xiaoshou/XiaoShouFaHuoJinEKeHuGongXian.java

@@ -1,13 +1,17 @@
 package com.huimv.getdata.entity.xiaoshou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class XiaoShouFaHuoJinEKeHuGongXian {
     //销售组织
     private int FSALEORGID;
     //日期
-    private int FDATE;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
     //发货组织
     private int FSTOCKORGID;
     //发货组织
@@ -15,9 +19,11 @@ public class XiaoShouFaHuoJinEKeHuGongXian {
     //客户
     private int FSALESMANID;
     //实发数量
-    private int FREALQTY;
+    private Double FREALQTY;
     //价税合计（本位币
-    private int FALLAMOUNT_LC;
+    private Double FALLAMOUNT_LC;
     //客户名字
-    private int FNAME;
+    private String FNAME;
+    private String FBILLNO;
+    private String xiaoShouName;
 }

get-data/src/main/java/com/huimv/getdata/entity/xiaoshou/XiaoShouFaPiaoJinE.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.xiaoshou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class XiaoShouFaPiaoJinE {
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     //结算组织
     private int FSETTLEORGID;
@@ -17,5 +19,6 @@ public class XiaoShouFaPiaoJinE {
     private double FALLAMOUNT;
     //立账类型
     private int FSETACCOUNTTYPE;
+    private String FBILLNO;
 
 }

get-data/src/main/java/com/huimv/getdata/entity/xiaoshou/XiaoShouFeiYong.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.xiaoshou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,7 +8,8 @@ import java.util.Date;
 @Data
 public class XiaoShouFeiYong {
     private int facctorgid;
-    private Date fdate;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
     private String fname;
     private Double FCREDIT;
 }

get-data/src/main/java/com/huimv/getdata/entity/xiaoshou/XiaoShouWanChenLvJinE.java

@@ -1,5 +1,6 @@
 package com.huimv.getdata.entity.xiaoshou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,6 +9,7 @@ import java.util.Date;
 public class XiaoShouWanChenLvJinE {
     //完成率(价税合计本位币)
     private Double FALLAMOUNT_LC;
+    private String FBILLNO;
     //销售订单金额(价税合计)
     private Double FALLAMOUNT;
     //客户
@@ -19,22 +21,25 @@ public class XiaoShouWanChenLvJinE {
     //FSALEORGID
     private int FSALEORGID;
     //日期
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     //销售数量
     private Double FQTY;
     //物料id
     private int FMATERIALID;
     // 物料名字
-    private int wuLiaoName;
+    private String wuLiaoName;
     //累计退货数量（销售
-    private int FRETURNQTY;
+    private Double FRETURNQTY;
     //累计退货数量（销售基本）
-    private int FBASERETURNQTY;
+    private Double FBASERETURNQTY;
     //销售员
-    private int FNAME;
+    private String FNAME;
     //部门名字
-    private int fdeptname;
+    private String fdeptname;
+    //客户名字
+    private String keHuName;
     //销售单价
-    private int xiaoShouDanJia;
+    private Double xiaoShouDanJia;
 
 }

get-data/src/main/java/com/huimv/getdata/entity/xiaoshou/YvQiHeTongMingXi.java

@@ -1,9 +1,14 @@
 package com.huimv.getdata.entity.xiaoshou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class YvQiHeTongMingXi {
+
+    private Integer FSALEORGID;
     private String FBILLNO;
     private String FDATE;
     private String FBILLTYPEID;
@@ -16,5 +21,6 @@ public class YvQiHeTongMingXi {
     //价税合计（本位币）
     private String FALLAMOUNT_LC;
     //出库日期
-    private String chuKuDate;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date chuKuDate;
 }

get-data/src/main/java/com/huimv/getdata/mapper/ErpCaiGouMapper.java

@@ -9,29 +9,29 @@ import java.util.List;
 
 public interface ErpCaiGouMapper {
 
-    List<DingDanJinE> getDingDanJinE(@Param("date")  Date date);
+    List<DingDanJinE> getDingDanJinE(@Param("date")  String date);
 
-    List<CaiGouRuKu> getCaiGouRuku(@Param("date") Date date);
+    List<CaiGouRuKu> getCaiGouRuku(@Param("date") String date);
 
-    List<FaPiaoJinE> getCaiGouFaPiao(@Param("date") Date date);
+    List<FaPiaoJinE> getCaiGouFaPiao(@Param("date") String date);
 
-    List<LeiJiRuKu> getLeiJiRuKu(@Param("date") Date date);
+    List<LeiJiRuKu> getLeiJiRuKu(@Param("date") String date);
 
-    List<ShouLiaoJinE> getShouLiaoJinE(@Param("date") Date date);
+    List<ShouLiaoJinE> getShouLiaoJinE(@Param("date") String date);
 
-    List<JiaoHuoShuliang> getJiaoHuoShuLiang(@Param("date") Date date);
+    List<JiaoHuoShuliang> getJiaoHuoShuLiang(@Param("date") String date);
 
-    List<CaiGouShuLiang> getCaiGouShuLiang(@Param("date") Date date);
+    List<CaiGouShuLiang> getCaiGouShuLiang(@Param("date") String date);
 
-    List<CaiGouDingDanShuLiangJinE> getCaiGouDingDanShuLiangJinE(@Param("date") Date date);
+    List<CaiGouDingDanShuLiangJinE> getCaiGouDingDanShuLiangJinE(@Param("date") String date);
 
-    List<DaiJianShuLiang> getDaiJianShuLiang(@Param("date") Date date);
+    List<DaiJianShuLiang> getDaiJianShuLiang(@Param("date") String date);
 
-    List<CaiGouYueJun> getCaiGouYueJun(@Param("date") Date date);
+    List<CaiGouYueJun> getCaiGouYueJun(@Param("date") String date);
 
-    List<YingFuZhangKuan> getYingFuZhangKuang(@Param("date") Date date);
+    List<YingFuZhangKuan> getYingFuZhangKuang(@Param("date") String date);
 
-    List<ZuiDiKuChun> getZuiDiKuChun(@Param("date") Date date);
+    List<ZuiDiKuChun> getZuiDiKuChun(@Param("date") String date);
 
-    List<CaiGouDingDanShuLiangJinE> getCaiGouHeTongShuLiangJinE(@Param("date") Date date);
+    List<CaiGouDingDanShuLiangJinE> getCaiGouHeTongShuLiangJinE(@Param("date") String date);
 }

get-data/src/main/java/com/huimv/getdata/mapper/ErpCenterMapper.java

@@ -11,11 +11,11 @@ import java.util.List;
 
 public interface ErpCenterMapper {
 
-    List<XiaoShouE> getXiaoShouE(@Param("date") Date date);
+    List<XiaoShouE> getXiaoShouE(@Param("date") String date);
 
-    List<DangQianYvQi> getDangQianYvQi(@Param("date")Date date);
+    List<DangQianYvQi> getDangQianYvQi(@Param("date")String date);
 
-    List<CaiGouJinE> getCaiGouJinE(@Param("date") Date date);
+    List<CaiGouJinE> getCaiGouJinE(@Param("date") String date);
 
-    List<YangMaoZhiCaiGouJinE> getYangMaoZhiCaiGouJinE(@Param("date")Date date);
+    List<YangMaoZhiCaiGouJinE> getYangMaoZhiCaiGouJinE(@Param("date")String date);
 }

get-data/src/main/java/com/huimv/getdata/mapper/ErpHrMapper.java

@@ -10,5 +10,5 @@ import java.util.List;
 
 public interface ErpHrMapper {
 
-    List<YuanGongShuLiang> getYuanGongRenShu(@Param("date")Date date);
+    List<YuanGongShuLiang> getYuanGongRenShu(@Param("date")String date);
 }

get-data/src/main/java/com/huimv/getdata/mapper/ErpKuCunMapper.java

@@ -8,38 +8,42 @@ import java.util.List;
 
 public interface ErpKuCunMapper {
 
-    List<YuanCaiLiaoKuCun> getYuanCaiLiaoCunLiang(@Param("date")  Date date);
+    List<YuanCaiLiaoKuCun> getYuanCaiLiaoCunLiang(@Param("date")  String date);
 
-    List<YangMaoZhiChuKu> getYangMaoZhiKuCun(@Param("date") Date date);
+    List<YangMaoZhiChuKu> getYangMaoZhiKuCun(@Param("date") String date);
 
-    List<YuanCaiLiaoDangRiRuKu> getYuanCaiLiaoDangRi(@Param("date") Date date);
+    List<YuanCaiLiaoDangRiRuKu> getYuanCaiLiaoDangRi(@Param("date") String date);
 
-    List<ChengPinRuKu> getChengPinDangRi(@Param("date") Date date);
+    List<ChengPinRuKu> getChengPinDangRi(@Param("date") String date);
 
-    List<ChengPinRuKu> getYangMaoZhiDangRi(@Param("date") Date date);
+    List<ChengPinRuKu> getYangMaoZhiDangRi(@Param("date") String date);
 
-    List<YuanCaiLiaoChuKu> getYuanCaiLiaoChuKu(@Param("date") Date date);
+    List<YuanCaiLiaoChuKu> getYuanCaiLiaoChuKu(@Param("date") String date);
 
-    List<ChenPinChuKu> getChengPinChuKu(@Param("date") Date date);
+    List<ChenPinChuKu> getChengPinChuKu(@Param("date") String date);
 
-    List<YangMaoZhiChuKu> getYangMaoZhiChuKu(@Param("date") Date date);
+    List<YangMaoZhiChuKu> getYangMaoZhiChuKu(@Param("date") String date);
 
-    List<KunCunQuShi> getKunCunQuShi(@Param("date") Date date);
+    List<KunCunQuShi> getKunCunQuShi(@Param("date") String date);
 
-    List<YangMaoZhiChuKu> getChuKuShuLiang(@Param("date") Date date);
+    List<YangMaoZhiChuKu> getChuKuShuLiang(@Param("date") String date);
 
-    List<WuLiaoKuMingXi> getWuLiaoMingXi(@Param("date") Date date);
+    List<WuLiaoKuMingXi> getWuLiaoMingXi(@Param("date") String date);
 
-    List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShang(@Param("date") Date date);
+    List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShang(@Param("date") String date);
 
-    List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShangLeiJi(@Param("date") Date date);
+    List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShangLeiJi(@Param("date") String date);
 
 
-    List<ChengPinRuKu> getWuJinDangRi(@Param("date") Date date);
+    List<ChengPinRuKu> getWuJinDangRi(@Param("date") String date);
 
-    List<ChengPinRuKu> getBaoCaiDangRi(@Param("date")Date date);
+    List<ChengPinRuKu> getBaoCaiDangRi(@Param("date")String date);
 
-    List<ChenPinChuKu> getWuJinChuKu(@Param("date")Date date);
+    List<ChenPinChuKu> getWuJinChuKu(@Param("date")String date);
 
-    List<ChenPinChuKu> getBaoCaiChuKu(@Param("date")Date date);
+    List<ChenPinChuKu> getBaoCaiChuKu(@Param("date")String date);
+
+    List<ChengPinRuKu> getChengPinDangRiAll(@Param("date")String date);
+
+    List<ChenPinChuKu> getChengPinChuKuAll(@Param("date")String date);
 }

get-data/src/main/java/com/huimv/getdata/mapper/ErpShengChanMapper.java

@@ -10,5 +10,5 @@ import java.util.List;
 
 public interface ErpShengChanMapper {
 
-    List<ShiJiChanLiang> getShiJiChanLiang(@Param("date") Date date);
+    List<ShiJiChanLiang> getShiJiChanLiang(@Param("date") String date);
 }

get-data/src/main/java/com/huimv/getdata/mapper/ErpVoucherMapper.java

@@ -12,21 +12,21 @@ import java.util.List;
 
 public interface ErpVoucherMapper  {
 
-    List<ErpVoucher> getShouRuJinE(@Param("date")Date date);
+    List<ErpVoucher> getShouRuJinE(@Param("date")String date);
 
-    List<ErpVoucher> getDangQianYueYingYeE(@Param("date")Date date);
+    List<ErpVoucher> getDangQianYueYingYeE(@Param("date")String date);
 
-    List<ErpVoucher> getDangQianYueJingLiRun(@Param("date")Date date);
+    List<ErpVoucher> getDangQianYueJingLiRun(@Param("date")String date);
 
-    List<ErpVoucher> getDangQianZiJinYvE(@Param("date")Date date);
+    List<ErpVoucher> getDangQianZiJinYvE(@Param("date")String date);
 
-    List<ErpVoucher> getDangYueJieKuanYvE(@Param("date")Date date);
+    List<ErpVoucher> getDangYueJieKuanYvE(@Param("date")String date);
 
-    List<ErpVoucher> getGuoNeiWaiSouRu(@Param("date")Date date);
+    List<ErpVoucher> getGuoNeiWaiSouRu(@Param("date")String date);
 
-    List<ChanPinShouRu> getChanPinShouRu(@Param("date") Date date);
+    List<ChanPinShouRu> getChanPinShouRu(@Param("date") String date);
 
-    List<JingLiRunQuShi> getJingLiRunQuShi(@Param("date")Date date);
+    List<JingLiRunQuShi> getJingLiRunQuShi(@Param("date")String date);
 
-    List<LinJinHuanKuanQi> getLinJinHuanKuan(@Param("date")Date date);
+    List<LinJinHuanKuanQi> getLinJinHuanKuan(@Param("date")String date);
 }

get-data/src/main/java/com/huimv/getdata/mapper/ErpXiaoShouMapper.java

@@ -8,15 +8,15 @@ import java.util.List;
 
 
 public interface ErpXiaoShouMapper {
-    List<XiaoShouWanChenLvJinE> getWanChengLv(@Param("date") Date date);
+    List<XiaoShouWanChenLvJinE> getWanChengLv(@Param("date") String date);
 
-    List<BaiFangKeHu> getBaiFangKeHu(Date date);
+    List<BaiFangKeHu> getBaiFangKeHu(String date);
 
-    List<XiaoShouFaPiaoJinE> getXiaoShouFaPiaoJinE(Date date);
+    List<XiaoShouFaPiaoJinE> getXiaoShouFaPiaoJinE(String date);
 
-    List<XiaoShouFaHuoJinEKeHuGongXian> getXiaoShouFaHuoJinEKeHuGongXian(Date date);
+    List<XiaoShouFaHuoJinEKeHuGongXian> getXiaoShouFaHuoJinEKeHuGongXian(String date);
 
-    List<XiaoShouFeiYong> getXiaoShouFeiYong(Date date);
+    List<XiaoShouFeiYong> getXiaoShouFeiYong(String date);
 
-    List<YvQiHeTongMingXi> getYvQiHeTongMingXi(Date date);
+    List<YvQiHeTongMingXi> getYvQiHeTongMingXi(String date);
 }

get-data/src/main/java/com/huimv/getdata/service/IErpCaiGouService.java

@@ -14,29 +14,29 @@ import java.util.List;
 public interface IErpCaiGouService {
 
 
-    List<DingDanJinE> getDingDanJinE(Date date);
+    List<DingDanJinE> getDingDanJinE(String date);
 
-    List<CaiGouRuKu> getCaiGouRuku(Date date);
+    List<CaiGouRuKu> getCaiGouRuku(String date);
 
-    List<FaPiaoJinE> getCaiGouFaPiao(Date date);
+    List<FaPiaoJinE> getCaiGouFaPiao(String date);
 
-    List<LeiJiRuKu> getLeiJiRuKu(Date date);
+    List<LeiJiRuKu> getLeiJiRuKu(String date);
 
-    List<ShouLiaoJinE> getShouLiaoJinE(Date date);
+    List<ShouLiaoJinE> getShouLiaoJinE(String date);
 
-    List<JiaoHuoShuliang> getJiaoHuoShuLiang(Date date);
+    List<JiaoHuoShuliang> getJiaoHuoShuLiang(String date);
 
-    List<CaiGouShuLiang> getCaiGouShuLiang(Date date);
+    List<CaiGouShuLiang> getCaiGouShuLiang(String date);
 
-    List<CaiGouDingDanShuLiangJinE> getCaiGouDingDanShuLiangJinE(Date date);
+    List<CaiGouDingDanShuLiangJinE> getCaiGouDingDanShuLiangJinE(String date);
 
-    List<DaiJianShuLiang> getDaiJianShuLiang(Date date);
+    List<DaiJianShuLiang> getDaiJianShuLiang(String date);
 
-    List<CaiGouYueJun> getCaiGouYueJun(Date date);
+    List<CaiGouYueJun> getCaiGouYueJun(String date);
 
-    List<YingFuZhangKuan> getYingFuZhangKuang(Date date);
+    List<YingFuZhangKuan> getYingFuZhangKuang(String date);
 
-    List<ZuiDiKuChun> getZuiDiKuChun(Date date);
+    List<ZuiDiKuChun> getZuiDiKuChun(String date);
 
-    List<CaiGouDingDanShuLiangJinE> getCaiGouHeTongShuLiangJinE(Date date);
+    List<CaiGouDingDanShuLiangJinE> getCaiGouHeTongShuLiangJinE(String date);
 }

get-data/src/main/java/com/huimv/getdata/service/IErpCenterService.java

@@ -11,11 +11,11 @@ import java.util.List;
 
 public interface IErpCenterService {
 
-    List<XiaoShouE> getXiaoShouE(Date date);
+    List<XiaoShouE> getXiaoShouE(String date);
 
-    List<DangQianYvQi> getDangQianYvQi(Date date);
+    List<DangQianYvQi> getDangQianYvQi(String date);
 
-    List<CaiGouJinE> getCaiGouJinE(Date date);
+    List<CaiGouJinE> getCaiGouJinE(String date);
 
-    List<YangMaoZhiCaiGouJinE> getYangMaoZhiCaiGouJinE(Date date);
+    List<YangMaoZhiCaiGouJinE> getYangMaoZhiCaiGouJinE(String date);
 }

get-data/src/main/java/com/huimv/getdata/service/IErpHrService.java

@@ -8,5 +8,5 @@ import java.util.List;
 
 public interface IErpHrService {
 
-    List<YuanGongShuLiang> getYuanGongRenShu(Date date);
+    List<YuanGongShuLiang> getYuanGongRenShu(String date);
 }

get-data/src/main/java/com/huimv/getdata/service/IErpKuCunService.java

@@ -11,29 +11,29 @@ import java.util.List;
 
 public interface IErpKuCunService {
 
-    List<YuanCaiLiaoKuCun> getYuanCaiLiaoCunLiang(Date date);
+    List<YuanCaiLiaoKuCun> getYuanCaiLiaoCunLiang(String date);
 
-    List<YangMaoZhiChuKu> getYangMaoZhiKuCun(Date date);
+    List<YangMaoZhiChuKu> getYangMaoZhiKuCun(String date);
 
-    List<YuanCaiLiaoDangRiRuKu> getYuanCaiLiaoDangRi(Date date);
+    List<YuanCaiLiaoDangRiRuKu> getYuanCaiLiaoDangRi(String date);
 
-    List<ChengPinRuKu> getChengPinDangRi(Date date,int type);
+    List<ChengPinRuKu> getChengPinDangRi(String date,String type);
 
-    List<ChengPinRuKu> getYangMaoZhiDangRi(Date date);
+    List<ChengPinRuKu> getYangMaoZhiDangRi(String date);
 
-    List<YuanCaiLiaoChuKu> getYuanCaiLiaoChuKu(Date date);
+    List<YuanCaiLiaoChuKu> getYuanCaiLiaoChuKu(String date);
 
-    List<ChenPinChuKu> getChengPinChuKu(Date date, int type);
+    List<ChenPinChuKu> getChengPinChuKu(String date, String type);
 
-    List<YangMaoZhiChuKu> getYangMaoZhiChuKu(Date date);
+    List<YangMaoZhiChuKu> getYangMaoZhiChuKu(String date);
 
-    List<KunCunQuShi> getKunCunQuShi(Date date);
+    List<KunCunQuShi> getKunCunQuShi(String date);
 
-    List<YangMaoZhiChuKu> getChuKuShuLiang(Date date);
+    List<YangMaoZhiChuKu> getChuKuShuLiang(String date);
 
-    List<WuLiaoKuMingXi> getWuLiaoMingXi(Date date);
+    List<WuLiaoKuMingXi> getWuLiaoMingXi(String date);
 
-    List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShang(Date date);
+    List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShang(String date);
 
-    List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShangLeiJi(Date date);
+    List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShangLeiJi(String date);
 }

get-data/src/main/java/com/huimv/getdata/service/IErpShengChanService.java

@@ -8,5 +8,5 @@ import java.util.List;
 
 public interface IErpShengChanService {
 
-    List<ShiJiChanLiang> getShiJiChanLiang(Date date);
+    List<ShiJiChanLiang> getShiJiChanLiang(String date);
 }

get-data/src/main/java/com/huimv/getdata/service/IErpVoucherService.java

@@ -10,21 +10,21 @@ import java.util.List;
 
 public interface IErpVoucherService {
 
-    List<ErpVoucher> getShouRuJinE(Date date);
+    List<ErpVoucher> getShouRuJinE(String date);
 
-    List<ErpVoucher> getDangQianYueYingYeE(Date date);
+    List<ErpVoucher> getDangQianYueYingYeE(String date);
 
-    List<ErpVoucher> getDangQianYueJingLiRun(Date date);
+    List<ErpVoucher> getDangQianYueJingLiRun(String date);
 
-    List<ErpVoucher> getDangQianZiJinYvE(Date date);
+    List<ErpVoucher> getDangQianZiJinYvE(String date);
 
-    List<ErpVoucher> getDangYueJieKuanYvE(Date date);
+    List<ErpVoucher> getDangYueJieKuanYvE(String date);
 
-    List<ErpVoucher> getGuoNeiWaiSouRu(Date date);
+    List<ErpVoucher> getGuoNeiWaiSouRu(String date);
 
-    List<ChanPinShouRu> getChanPinShouRu(Date date);
+    List<ChanPinShouRu> getChanPinShouRu(String date);
 
-    List<JingLiRunQuShi> getJingLiRunQuShi(Date date);
+    List<JingLiRunQuShi> getJingLiRunQuShi(String date);
 
-    List<LinJinHuanKuanQi> getLinJinHuanKuan(Date date);
+    List<LinJinHuanKuanQi> getLinJinHuanKuan(String date);
 }

get-data/src/main/java/com/huimv/getdata/service/IErpXiaoShouService.java

@@ -10,15 +10,15 @@ import java.util.Date;
 import java.util.List;
 
 public interface IErpXiaoShouService {
-    List<XiaoShouWanChenLvJinE> getWanChengLv(Date date);
+    List<XiaoShouWanChenLvJinE> getWanChengLv(String date);
 
-    List<BaiFangKeHu> getBaiFangKeHu(Date date);
+    List<BaiFangKeHu> getBaiFangKeHu(String date);
 
-    List<XiaoShouFaPiaoJinE> getXiaoShouFaPiaoJinE(Date date);
+    List<XiaoShouFaPiaoJinE> getXiaoShouFaPiaoJinE(String date);
 
-    List<XiaoShouFaHuoJinEKeHuGongXian> getXiaoShouFaHuoJinEKeHuGongXian(Date date);
+    List<XiaoShouFaHuoJinEKeHuGongXian> getXiaoShouFaHuoJinEKeHuGongXian(String date);
 
-    List<XiaoShouFeiYong> getXiaoShouFeiYong(Date date);
+    List<XiaoShouFeiYong> getXiaoShouFeiYong(String date);
 
-    List<YvQiHeTongMingXi> getYvQiHeTongMingXi(Date date);
+    List<YvQiHeTongMingXi> getYvQiHeTongMingXi(String date);
 }

get-data/src/main/java/com/huimv/getdata/service/impl/ErpCaiGouServiceImpl.java

@@ -31,67 +31,67 @@ public class ErpCaiGouServiceImpl implements IErpCaiGouService {
         private ErpCaiGouMapper erpCaiGouMapper;
 
     @Override
-    public List<DingDanJinE> getDingDanJinE(Date date) {
+    public List<DingDanJinE> getDingDanJinE(String date) {
         return erpCaiGouMapper.getDingDanJinE(date);
     }
 
     @Override
-    public List<CaiGouRuKu> getCaiGouRuku(Date date) {
+    public List<CaiGouRuKu> getCaiGouRuku(String date) {
         return erpCaiGouMapper.getCaiGouRuku(date);
     }
 
     @Override
-    public List<FaPiaoJinE> getCaiGouFaPiao(Date date) {
+    public List<FaPiaoJinE> getCaiGouFaPiao(String date) {
         return erpCaiGouMapper.getCaiGouFaPiao(date);
     }
 
     @Override
-    public List<LeiJiRuKu> getLeiJiRuKu(Date date) {
+    public List<LeiJiRuKu> getLeiJiRuKu(String date) {
         return erpCaiGouMapper.getLeiJiRuKu(date);
     }
 
     @Override
-    public List<ShouLiaoJinE> getShouLiaoJinE(Date date) {
+    public List<ShouLiaoJinE> getShouLiaoJinE(String date) {
         return erpCaiGouMapper.getShouLiaoJinE(date);
     }
 
     @Override
-    public List<JiaoHuoShuliang> getJiaoHuoShuLiang(Date date) {
+    public List<JiaoHuoShuliang> getJiaoHuoShuLiang(String date) {
         return erpCaiGouMapper.getJiaoHuoShuLiang(date);
     }
 
     @Override
-    public List<CaiGouShuLiang> getCaiGouShuLiang(Date date) {
+    public List<CaiGouShuLiang> getCaiGouShuLiang(String date) {
         return erpCaiGouMapper.getCaiGouShuLiang(date);
     }
 
     @Override
-    public List<CaiGouDingDanShuLiangJinE> getCaiGouDingDanShuLiangJinE(Date date) {
+    public List<CaiGouDingDanShuLiangJinE> getCaiGouDingDanShuLiangJinE(String date) {
         return erpCaiGouMapper.getCaiGouDingDanShuLiangJinE(date);
     }
 
     @Override
-    public List<DaiJianShuLiang> getDaiJianShuLiang(Date date) {
+    public List<DaiJianShuLiang> getDaiJianShuLiang(String date) {
         return erpCaiGouMapper.getDaiJianShuLiang(date);
     }
 
     @Override
-    public List<CaiGouYueJun> getCaiGouYueJun(Date date) {
+    public List<CaiGouYueJun> getCaiGouYueJun(String date) {
         return erpCaiGouMapper.getCaiGouYueJun(date);
     }
 
     @Override
-    public List<YingFuZhangKuan> getYingFuZhangKuang(Date date) {
+    public List<YingFuZhangKuan> getYingFuZhangKuang(String date) {
         return erpCaiGouMapper.getYingFuZhangKuang(date);
     }
 
     @Override
-    public List<ZuiDiKuChun> getZuiDiKuChun(Date date) {
+    public List<ZuiDiKuChun> getZuiDiKuChun(String date) {
         return erpCaiGouMapper.getZuiDiKuChun(date);
     }
 
     @Override
-    public List<CaiGouDingDanShuLiangJinE> getCaiGouHeTongShuLiangJinE(Date date) {
+    public List<CaiGouDingDanShuLiangJinE> getCaiGouHeTongShuLiangJinE(String date) {
         return erpCaiGouMapper.getCaiGouHeTongShuLiangJinE(date);
     }
 }

get-data/src/main/java/com/huimv/getdata/service/impl/ErpCenterServiceImpl.java

@@ -34,22 +34,22 @@ public class ErpCenterServiceImpl implements IErpCenterService {
     private ErpCenterMapper erpCenterMapper;
 
     @Override
-    public List<XiaoShouE> getXiaoShouE(Date date) {
+    public List<XiaoShouE> getXiaoShouE(String date) {
         return erpCenterMapper.getXiaoShouE(date);
     }
 
     @Override
-    public List<DangQianYvQi> getDangQianYvQi(Date date) {
+    public List<DangQianYvQi> getDangQianYvQi(String date) {
         return erpCenterMapper.getDangQianYvQi(date);
     }
 
     @Override
-    public List<CaiGouJinE> getCaiGouJinE(Date date) {
+    public List<CaiGouJinE> getCaiGouJinE(String date) {
         return erpCenterMapper.getCaiGouJinE(date);
     }
 
     @Override
-    public List<YangMaoZhiCaiGouJinE> getYangMaoZhiCaiGouJinE(Date date) {
+    public List<YangMaoZhiCaiGouJinE> getYangMaoZhiCaiGouJinE(String date) {
         return erpCenterMapper.getYangMaoZhiCaiGouJinE(date);
     }
 }

get-data/src/main/java/com/huimv/getdata/service/impl/ErpHrServiceImpl.java

@@ -28,7 +28,7 @@ public class ErpHrServiceImpl implements IErpHrService {
     private ErpHrMapper erpHrMapper;
 
     @Override
-    public List<YuanGongShuLiang> getYuanGongRenShu(Date date) {
+    public List<YuanGongShuLiang> getYuanGongRenShu(String date) {
         return erpHrMapper.getYuanGongRenShu(date);
     }
 }

get-data/src/main/java/com/huimv/getdata/service/impl/ErpKuCunServiceImpl.java

@@ -34,82 +34,88 @@ public class ErpKuCunServiceImpl implements IErpKuCunService {
 
 
     @Override
-    public List<YuanCaiLiaoKuCun> getYuanCaiLiaoCunLiang(Date date) {
+    public List<YuanCaiLiaoKuCun> getYuanCaiLiaoCunLiang(String date) {
         return erpKuCunMapper.getYuanCaiLiaoCunLiang(date);
     }
 
     @Override
-    public List<YangMaoZhiChuKu> getYangMaoZhiKuCun(Date date) {
+    public List<YangMaoZhiChuKu> getYangMaoZhiKuCun(String date) {
        return erpKuCunMapper.getYangMaoZhiKuCun(date);
     }
 
     @Override
-    public List<YuanCaiLiaoDangRiRuKu> getYuanCaiLiaoDangRi(Date date) {
+    public List<YuanCaiLiaoDangRiRuKu> getYuanCaiLiaoDangRi(String date) {
         return erpKuCunMapper.getYuanCaiLiaoDangRi(date);
     }
 
     @Override
-    public List<ChengPinRuKu> getChengPinDangRi(Date date,int type) {
-        if (type == 1){
+    public List<ChengPinRuKu> getChengPinDangRi(String date,String type) {
+        if (type == null){
+            return erpKuCunMapper.getChengPinDangRiAll(date);
+        }
+        if ("1".equals(type)){
             return erpKuCunMapper.getChengPinDangRi(date);
-        }else if (type == 2){
+        }else if ("2".equals(type)){
             return erpKuCunMapper.getWuJinDangRi(date);
-        }else if (type == 3){
+        }else if ("3".equals(type)){
             return erpKuCunMapper.getBaoCaiDangRi(date);
         }
         return null;
     }
 
     @Override
-    public List<ChengPinRuKu> getYangMaoZhiDangRi(Date date) {
+    public List<ChengPinRuKu> getYangMaoZhiDangRi(String date) {
        return erpKuCunMapper.getYangMaoZhiDangRi(date);
     }
 
     @Override
-    public List<YuanCaiLiaoChuKu> getYuanCaiLiaoChuKu(Date date) {
+    public List<YuanCaiLiaoChuKu> getYuanCaiLiaoChuKu(String date) {
        return erpKuCunMapper.getYuanCaiLiaoChuKu(date);
     }
 
     @Override
-    public List<ChenPinChuKu> getChengPinChuKu(Date date, int type) {
-        if (type == 1){
+    public List<ChenPinChuKu> getChengPinChuKu(String date, String type) {
+        if (type == null){
+            return erpKuCunMapper.getChengPinChuKuAll(date);
+        }
+        if ("1".equals(type)){
            return erpKuCunMapper.getChengPinChuKu(date);
-        }else if (type == 2){
+        }else if ("2".equals(type)){
             return erpKuCunMapper.getWuJinChuKu(date);
         }
-        else if (type == 3){
+        else if ("3".equals(type)){
             return  erpKuCunMapper.getBaoCaiChuKu(date);
         }
        return null;
     }
 
     @Override
-    public List<YangMaoZhiChuKu> getYangMaoZhiChuKu(Date date) {
+    public List<YangMaoZhiChuKu> getYangMaoZhiChuKu(String date) {
        return erpKuCunMapper.getYangMaoZhiChuKu(date);
     }
 
     @Override
-    public List<KunCunQuShi> getKunCunQuShi(Date date) {
+    public List<KunCunQuShi> getKunCunQuShi(String date) {
        return erpKuCunMapper.getKunCunQuShi(date);
     }
 
     @Override
-    public List<YangMaoZhiChuKu> getChuKuShuLiang(Date date) {
+    public List<YangMaoZhiChuKu> getChuKuShuLiang(String date) {
        return erpKuCunMapper.getChuKuShuLiang(date);
     }
 
     @Override
-    public List<WuLiaoKuMingXi> getWuLiaoMingXi(Date date) {
+    public List<WuLiaoKuMingXi> getWuLiaoMingXi(String date) {
        return erpKuCunMapper.getWuLiaoMingXi(date);
     }
 
     @Override
-    public List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShang(Date date) {
+    public List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShang(String date) {
        return erpKuCunMapper.getYangMaoZhiGongYingShang(date);
     }
 
     @Override
-    public List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShangLeiJi(Date date) {
+    public List<YangMaoZhiGongYingShang> getYangMaoZhiGongYingShangLeiJi(String date) {
        return erpKuCunMapper.getYangMaoZhiGongYingShangLeiJi(date);
     }
 }

get-data/src/main/java/com/huimv/getdata/service/impl/ErpShengChanServiceImpl.java

@@ -28,7 +28,7 @@ public class ErpShengChanServiceImpl implements IErpShengChanService {
     private ErpShengChanMapper erpShengChanMapper;
 
     @Override
-    public List<ShiJiChanLiang> getShiJiChanLiang(Date date) {
+    public List<ShiJiChanLiang> getShiJiChanLiang(String date) {
         return erpShengChanMapper.getShiJiChanLiang(date);
     }
 }

get-data/src/main/java/com/huimv/getdata/service/impl/ErpVoucherServiceImpl.java

@@ -28,47 +28,47 @@ public class ErpVoucherServiceImpl implements IErpVoucherService {
     private ErpVoucherMapper erpVoucherMapper;
 
     @Override
-    public List<ErpVoucher> getShouRuJinE(Date date) {
+    public List<ErpVoucher> getShouRuJinE(String date) {
         return erpVoucherMapper.getShouRuJinE(date);
     }
 
     @Override
-    public List<ErpVoucher> getDangQianYueYingYeE(Date date) {
+    public List<ErpVoucher> getDangQianYueYingYeE(String date) {
         return erpVoucherMapper.getDangQianYueYingYeE(date);
     }
 
     @Override
-    public List<ErpVoucher> getDangQianYueJingLiRun(Date date) {
+    public List<ErpVoucher> getDangQianYueJingLiRun(String date) {
         return  erpVoucherMapper.getDangQianYueJingLiRun(date);
     }
 
     @Override
-    public List<ErpVoucher> getDangQianZiJinYvE(Date date) {
+    public List<ErpVoucher> getDangQianZiJinYvE(String date) {
         return  erpVoucherMapper.getDangQianZiJinYvE(date);
     }
 
     @Override
-    public List<ErpVoucher> getDangYueJieKuanYvE(Date date) {
+    public List<ErpVoucher> getDangYueJieKuanYvE(String date) {
         return  erpVoucherMapper.getDangYueJieKuanYvE(date);
     }
 
     @Override
-    public List<ErpVoucher> getGuoNeiWaiSouRu(Date date) {
+    public List<ErpVoucher> getGuoNeiWaiSouRu(String date) {
         return  erpVoucherMapper.getGuoNeiWaiSouRu(date);
     }
 
     @Override
-    public List<ChanPinShouRu> getChanPinShouRu(Date date) {
+    public List<ChanPinShouRu> getChanPinShouRu(String date) {
         return  erpVoucherMapper.getChanPinShouRu(date);
     }
 
     @Override
-    public List<JingLiRunQuShi> getJingLiRunQuShi(Date date) {
+    public List<JingLiRunQuShi> getJingLiRunQuShi(String date) {
         return  erpVoucherMapper.getJingLiRunQuShi(date);
     }
 
     @Override
-    public List<LinJinHuanKuanQi> getLinJinHuanKuan(Date date) {
+    public List<LinJinHuanKuanQi> getLinJinHuanKuan(String date) {
         return  erpVoucherMapper.getLinJinHuanKuan(date);
     }
 }

get-data/src/main/java/com/huimv/getdata/service/impl/ErpXiaoShouServiceImpl.java

@@ -31,32 +31,32 @@ public class ErpXiaoShouServiceImpl implements IErpXiaoShouService {
     private ErpXiaoShouMapper erpXiaoShouMapper;
 
     @Override
-    public List<XiaoShouWanChenLvJinE> getWanChengLv(Date date) {
+    public List<XiaoShouWanChenLvJinE> getWanChengLv(String date) {
         return erpXiaoShouMapper.getWanChengLv(date);
     }
 
     @Override
-    public List<BaiFangKeHu> getBaiFangKeHu(Date date) {
+    public List<BaiFangKeHu> getBaiFangKeHu(String date) {
          return erpXiaoShouMapper.getBaiFangKeHu(date);
     }
 
     @Override
-    public List<XiaoShouFaPiaoJinE> getXiaoShouFaPiaoJinE(Date date) {
+    public List<XiaoShouFaPiaoJinE> getXiaoShouFaPiaoJinE(String date) {
          return erpXiaoShouMapper.getXiaoShouFaPiaoJinE(date);
     }
 
     @Override
-    public List<XiaoShouFaHuoJinEKeHuGongXian> getXiaoShouFaHuoJinEKeHuGongXian(Date date) {
+    public List<XiaoShouFaHuoJinEKeHuGongXian> getXiaoShouFaHuoJinEKeHuGongXian(String date) {
          return erpXiaoShouMapper.getXiaoShouFaHuoJinEKeHuGongXian(date);
     }
 
     @Override
-    public List<XiaoShouFeiYong> getXiaoShouFeiYong(Date date) {
+    public List<XiaoShouFeiYong> getXiaoShouFeiYong(String date) {
          return erpXiaoShouMapper.getXiaoShouFeiYong(date);
     }
 
     @Override
-    public List<YvQiHeTongMingXi> getYvQiHeTongMingXi(Date date) {
+    public List<YvQiHeTongMingXi> getYvQiHeTongMingXi(String date) {
          return erpXiaoShouMapper.getYvQiHeTongMingXi(date);
     }
 }

get-data/src/main/resources/com/huimv/getdata/mapper/ErpCaiGouMapper.xml

@@ -14,63 +14,71 @@ INNER JOIN  T_PUR_CONTRACTENTRY_F B ON A.FID = B.FID
     </select>
     <select id="getCaiGouRuku" resultType="com.huimv.getdata.entity.caigou.CaiGouRuKu"
             parameterType="java.util.Date">
-SElECT DISTINCT B.FBILLAMOUNT_LC,A.FDATE , A.FDEMANDORGID FROM  T_STK_INSTOCK A
+SElECT DISTINCT B.FBILLAMOUNT_LC  FBILLAMOUNTLC ,A.FDATE , A.FDEMANDORGID FROM  T_STK_INSTOCK A
+        INNER JOIN  T_STK_INSTOCKFIN B ON A.FID = B.FID
         <if test="date !=null">
             where  A.FDATE >= #{date}
         </if>
-INNER JOIN  T_STK_INSTOCKFIN B ON A.FID = B.FID
+
     </select>
 
     <select id="getCaiGouFaPiao" resultType="com.huimv.getdata.entity.caigou.FaPiaoJinE"
             parameterType="java.util.Date">
-        SELECT    B.FALLAMOUNT ,A.FDATE ,A.FPURCHASEORGID   FROM  T_PUR_POORDER A
+        SELECT    B.FALLAMOUNT ,A.FDATE ,A.FPURCHASEORGID ,C.FQTY  FROM  T_PUR_POORDER A
+        INNER JOIN T_PUR_POORDERENTRY C ON A.FID  = C.FID
+        INNER JOIN  T_PUR_POORDERENTRY_F B ON B.FENTRYID  = C.FENTRYID
         <if test="date !=null">
             where  A.FDATE >= #{date}
         </if>
-INNER JOIN  T_PUR_POORDERENTRY_F B ON A.FID  = B.FID
+
     </select>
     <select id="getLeiJiRuKu" resultType="com.huimv.getdata.entity.caigou.LeiJiRuKu"
             parameterType="java.util.Date">
        SELECT B.FREALQTY ,A.FDATE ,A.FDEMANDORGID FROM T_STK_INSTOCK A
+        INNER JOIN  T_STK_INSTOCKENTRY B ON A.FID = B.FID
         <if test="date !=null">
             where  A.FDATE >= #{date}
         </if>
-INNER JOIN  T_STK_INSTOCKENTRY B ON A.FID = B.FID
+
 
     </select>
     <select id="getShouLiaoJinE" resultType="com.huimv.getdata.entity.caigou.ShouLiaoJinE"
             parameterType="java.util.Date">
         SELECT B.FINSTOCKQTY ,A.FDATE  ,A.FSTOCKORGID
  FROM  T_PUR_RECEIVE A
+        INNER JOIN T_PUR_RECEIVEENTRY_S B ON A.FID = B.FID
         <if test="date !=null">
             where  A.FDATE >= #{date}
         </if>
-INNER JOIN T_PUR_RECEIVEENTRY_S B ON A.FID = B.FID
+
 
     </select>
     <select id="getJiaoHuoShuLiang" resultType="com.huimv.getdata.entity.caigou.JiaoHuoShuliang"
             parameterType="java.util.Date">
         SELECT A.FDATE  ,A.FSTOCKORGID  ,B.FACTRECEIVEQTY FROM  T_PUR_RECEIVE  A
+        INNER JOIN   T_PUR_RECEIVEENTRY B  ON  A.FID = B.FID
         <if test="date !=null">
             where  A.FDATE >= #{date}
         </if>
-INNER JOIN   T_PUR_RECEIVEENTRY B  ON  A.FID = B.FID
+
     </select>
     <select id="getCaiGouShuLiang" resultType="com.huimv.getdata.entity.caigou.CaiGouShuLiang"
             parameterType="java.util.Date">
 
-        SELECT A.FDATE  ,A.FPURCHASEORGID  ,B.FQTY FROM  T_PUR_POORDER  A
+        SELECT DISTINCT A.FDATE  ,A.FPURCHASEORGID  ,B.FQTY FROM  T_PUR_POORDER  A
+        INNER JOIN   T_PUR_POORDERENTRY B  ON  A.FID = B.FID
         <if test="date !=null">
             where  A.FDATE >= #{date}
         </if>
-INNER JOIN   T_PUR_POORDERENTRY B  ON  A.FID = B.FID
+
     </select>
     <select id="getCaiGouDingDanShuLiangJinE" resultType="com.huimv.getdata.entity.caigou.CaiGouDingDanShuLiangJinE"
-            parameterType="java.util.Date">
-        SELECT DISTINCT D.FNAME ,A.FDATE ,A.FPURCHASEORGID , B.FQTY ,C.FALLAMOUNT ,( C.FALLAMOUNT /B.FQTY ) danJia  FROM T_PUR_POORDER A
+            parameterType="java.lang.String">
+        SELECT DISTINCT D.FNAME ,A.FDATE ,A.FPURCHASEORGID , B.FQTY ,C.FALLAMOUNT ,( C.FALLAMOUNT /B.FQTY ) danJia  ,E.FNAME gys  FROM T_PUR_POORDER A
 INNER JOIN T_PUR_POORDERENTRY B ON A.FID = B.FID
 INNER JOIN T_PUR_POORDERENTRY_F C  ON B.FENTRYID = C.FENTRYID
 INNER JOIN T_BD_MATERIAL_L  D ON D.FMATERIALID = B.FMATERIALID
+        INNER JOIN T_BD_SUPPLIER_L  E ON A.FSUPPLIERID = E.FSUPPLIERID
         <if test="date !=null">
             where  A.FDATE >= #{date}
         </if>
@@ -95,26 +103,30 @@ INNER JOIN  T_PUR_POORDERENTRY  B ON A.FID = B.FID
     </select>
     <select id="getYingFuZhangKuang" resultType="com.huimv.getdata.entity.caigou.YingFuZhangKuan"
             parameterType="java.util.Date">
-        SELECT A.FDATE ,A.FBGLSHSJDW ,A.FPURCHASEORGID , A.FPAYORGID, B.FPURPOSEID ,C.FNAME ,B.FNOTVERIFICATEAMOUNT FROM  T_AP_PAYBILL 	A
+        SELECT DISTINCT A.FDATE ,A.FBGLSHSJDW ,A.FPURCHASEORGID , A.FPAYORGID, B.FPURPOSEID ,C.FNAME ,B.FNOTVERIFICATEAMOUNT ,B.FQTY  ,D.FNAME wuLiaoName
+        ,E.FBOOKINGDATE  FROM  T_AP_PAYBILL 	A
 INNER JOIN  T_AP_PAYBILLENTRY B ON A.FID = B.FID
 INNER JOIN  T_CN_RECPAYPURPOSE_L C ON C.FID = B.FPURPOSEID
-WHERE B.FNOTVERIFICATEAMOUNT >0
+        INNER JOIN  T_BD_MATERIAL_L  D ON B.FMATERIALID =D.FMATERIALID
+        LEFT JOIN T_AP_PAYBILL_O  E ON E.FID = A.FID
+        WHERE B.FNOTVERIFICATEAMOUNT >0
         <if test="date !=null">
             AND  A.FDATE >= #{date}
         </if>
     </select>
     <select id="getZuiDiKuChun" resultType="com.huimv.getdata.entity.caigou.ZuiDiKuChun"
             parameterType="java.util.Date">
-        SELECT  DISTINCT C.FINSTOCKQTY, B.FACTRECEIVEQTY ,A.FDATE ,A.FSTOCKORGID ,( B.FACTRECEIVEQTY -  C.FINSTOCKQTY)   as test,D.FNAME
-,E.FMINSTOCK ,F.FAVBQTY
-FROM  T_PUR_RECEIVE  A
-INNER JOIN  T_PUR_RECEIVEENTRY B ON A.FID = B.FID
-INNER JOIN    T_PUR_RECEIVEENTRY_S C  ON  B.FENTRYID = C.FENTRYID
-INNER JOIN T_BD_MATERIAL_L  D ON D.FMATERIALID = B.FMATERIALID
-INNER JOIN t_BD_MaterialStock E ON E.FMATERIALID = D.FMATERIALID
-LEFT JOIN T_STK_INVENTORY F ON F.FMATERIALID = E.FMATERIALID
+        SELECT  DISTINCT C.FINSTOCKQTY, B.FACTRECEIVEQTY ,A.FDATE ,A.FSTOCKORGID ,( B.FACTRECEIVEQTY -  C.FINSTOCKQTY)   as shengYv,D.FNAME
+        ,E.FMINSTOCK ,F.FAVBQTY
+        FROM  T_PUR_RECEIVE  A
+        INNER JOIN  T_PUR_RECEIVEENTRY B ON A.FID = B.FID
+        INNER JOIN    T_PUR_RECEIVEENTRY_S C  ON  B.FENTRYID = C.FENTRYID
+        INNER JOIN T_BD_MATERIAL_L  D ON D.FMATERIALID = B.FMATERIALID
+        INNER JOIN t_BD_MaterialStock E ON E.FMATERIALID = D.FMATERIALID
+        LEFT JOIN T_STK_INVENTORY F ON F.FMATERIALID = E.FMATERIALID
+        WHERE  (B.FACTRECEIVEQTY -  C.FINSTOCKQTY)  &lt; E.FMINSTOCK
         <if test="date !=null">
-            WHERE  A.FDATE >= #{date}
+            AND  A.FDATE >= #{date}
         </if>
 
     </select>

get-data/src/main/resources/com/huimv/getdata/mapper/ErpKuCunMapper.xml

@@ -5,9 +5,10 @@
 
     <select id="getYuanCaiLiaoCunLiang" resultType="com.huimv.getdata.entity.kucun.YuanCaiLiaoKuCun"
             parameterType="java.util.Date">
-        SELECT DISTINCT  A.FSTOCKORGID ,A.FUPDATETIME , A.FBASEQTY , B.FNAME  ,C.FMATERIALID ,C.FNAME wuLiaoName  FROM T_STK_INVENTORY A
-INNER JOIN t_BD_Stock_L	B  ON B.FSTOCKID = A.FSTOCKID
-INNER JOIN T_BD_MATERIAL_L C ON C.FMATERIALID = A.FMATERIALID
+        SELECT DISTINCT  A.FSTOCKORGID ,A.FUPDATETIME , A.FBASEQTY , B.FNAME  ,C.FMATERIALID ,C.FNAME wuLiaoName ,D.FNUMBER  FROM T_STK_INVENTORY A
+        INNER JOIN t_BD_Stock_L	B  ON B.FSTOCKID = A.FSTOCKID
+        INNER JOIN T_BD_MATERIAL D ON D.FMATERIALID= A.FMATERIALID
+        INNER JOIN T_BD_MATERIAL_L C ON C.FMATERIALID = A.FMATERIALID
         <if test="date !=null">
             where  A.FUPDATETIME >= #{date}
         </if>
@@ -61,6 +62,9 @@ INNER JOIN T_STK_MISCELLANEOUSENTRY B ON A.FID = B.FID
     </if>)
 
     </select>
+
+
+
     <select id="getChengPinDangRi" resultType="com.huimv.getdata.entity.kucun.ChengPinRuKu"
             parameterType="java.util.Date">
 
@@ -93,7 +97,7 @@ INNER JOIN T_STK_MISCELLANEOUSENTRY  B ON A.FID = B.FID
     </select>
     <select id="getYangMaoZhiDangRi" resultType="com.huimv.getdata.entity.kucun.ChengPinRuKu"
             parameterType="java.util.Date">
-SELECT DISTINCT  B.FREALQTY, A.FDATE , A.FSTOCKORGID , B.FMATERIALID , D.FNAME ,C.FNUMBER
+SELECT DISTINCT  B.FREALQTY, A.FDATE , A.FSTOCKORGID , B.FMATERIALID , D.FNAME ,C.FNUMBER fnumber
 FROM T_STK_INSTOCK A
 INNER JOIN T_STK_INSTOCKENTRY B ON A.FID = B.FID
  INNER JOIN  T_BD_MATERIAL C  ON B.FMATERIALID  = C.FMATERIALID
@@ -103,7 +107,7 @@ INNER JOIN T_STK_INSTOCKENTRY B ON A.FID = B.FID
             and  A.FDATE >= #{date}
         </if>
 UNION ALL
-SELECT DISTINCT B.FREALQTY, A.FDATE , A.FSTOCKORGID , B.FMATERIALID , D.FNAME ,C.FNUMBER
+SELECT DISTINCT B.FREALQTY, A.FDATE , A.FSTOCKORGID , B.FMATERIALID , D.FNAME ,C.FNUMBER fnumber
 FROM T_PRD_INSTOCK A
 INNER JOIN T_PRD_INSTOCKENTRY B ON A.FID = B.FID
  INNER JOIN  T_BD_MATERIAL C  ON B.FMATERIALID  = C.FMATERIALID
@@ -113,7 +117,7 @@ INNER JOIN T_PRD_INSTOCKENTRY B ON A.FID = B.FID
             and  A.FDATE >= #{date}
         </if>
  UNION ALL
-SELECT DISTINCT B.FQTY  FREALQTY, A.FDATE , A.FSTOCKORGID , B.FMATERIALID , D.FNAME ,C.FNUMBER
+SELECT DISTINCT B.FQTY  FREALQTY, A.FDATE , A.FSTOCKORGID , B.FMATERIALID , D.FNAME ,C.FNUMBER fnumber
 FROM T_STK_MISCELLANEOUS A
 INNER JOIN T_STK_MISCELLANEOUSENTRY B ON A.FID = B.FID
  INNER JOIN  T_BD_MATERIAL C  ON B.FMATERIALID  = C.FMATERIALID
@@ -362,5 +366,66 @@ INNER JOIN T_STK_MISCELLANEOUSENTRY  B ON A.FID = B.FID
             and  A.FDATE >= #{date}
         </if>
     </select>
+    <select id="getChengPinDangRiAll" resultType="com.huimv.getdata.entity.kucun.ChengPinRuKu"
+            parameterType="java.lang.String">
+
+        SELECT DISTINCT B.FREALQTY, A.FDATE , A.FSTOCKORGID , B.FMATERIALID  ,E.FNAME ,C.FNUMBER ,D.FNAME wuLiaoName
+        FROM T_STK_INSTOCK A
+        INNER JOIN T_STK_INSTOCKENTRY B ON A.FID = B.FID
+        INNER JOIN  T_BD_MATERIAL C  ON B.FMATERIALID  = C.FMATERIALID
+        INNER JOIN  T_BD_MATERIAL_L D  ON D.FMATERIALID  = C.FMATERIALID
+        INNER JOIN t_BD_Stock_L  E ON E.FSTOCKID = B.FSTOCKID
+        <if test="date !=null">
+            and  A.FDATE >= #{date}
+        </if>
+        UNION ALL
+        SELECT DISTINCT B.FREALQTY, A.FDATE , A.FSTOCKORGID , B.FMATERIALID  ,E.FNAME ,C.FNUMBER ,D.FNAME wuLiaoName
+        FROM T_PRD_INSTOCK A
+        INNER JOIN T_PRD_INSTOCKENTRY  B ON A.FID = B.FID
+        INNER JOIN  T_BD_MATERIAL C  ON B.FMATERIALID  = C.FMATERIALID
+        INNER JOIN  T_BD_MATERIAL_L D  ON D.FMATERIALID  = C.FMATERIALID
+        INNER JOIN t_BD_Stock_L  E ON E.FSTOCKID = B.FSTOCKID
+        <if test="date !=null">
+            and  A.FDATE >= #{date}
+        </if>
+        UNION ALL
+        SELECT DISTINCT B.FQTY FREALQTY, A.FDATE , A.FSTOCKORGID , B.FMATERIALID  ,E.FNAME,C.FNUMBER ,D.FNAME wuLiaoName
+        FROM T_STK_MISCELLANEOUS  A
+        INNER JOIN T_STK_MISCELLANEOUSENTRY  B ON A.FID = B.FID
+        INNER JOIN  T_BD_MATERIAL C  ON B.FMATERIALID  = C.FMATERIALID
+        INNER JOIN  T_BD_MATERIAL_L D  ON D.FMATERIALID  = C.FMATERIALID
+        INNER JOIN t_BD_Stock_L  E ON E.FSTOCKID = B.FSTOCKID
+        <if test="date !=null">
+            and  A.FDATE >= #{date}
+        </if>
+
+
+    </select>
+    <select id="getChengPinChuKuAll" resultType="com.huimv.getdata.entity.kucun.ChenPinChuKu"
+            parameterType="java.lang.String">
+
+        SELECT DISTINCT B.FSALUNITQTY, A.FDATE , A.FSTOCKORGID ,F.FMATERIALID ,E.FNAME ,C.FNUMBER ,D.FNAME wuLiaoName
+        FROM T_SAL_OUTSTOCK A
+        INNER JOIN T_SAL_OUTSTOCKENTRY F ON F.FID = A.FID
+        INNER JOIN T_SAL_OUTSTOCKENTRY_F B ON F.FENTRYID = B.FENTRYID
+        INNER JOIN  T_BD_MATERIAL C  ON F.FMATERIALID  = C.FMATERIALID
+        INNER JOIN  T_BD_MATERIAL_L D  ON D.FMATERIALID  = C.FMATERIALID
+        INNER JOIN t_BD_Stock_L  E ON E.FSTOCKID = F.FSTOCKID
+        <if test="date !=null">
+            WHERE  A.FDATE >= #{date}
+        </if>
+
+        UNION ALL
+        SELECT DISTINCT B.FQTY FSALUNITQTY, A.FDATE , A.FSTOCKORGID , B.FMATERIALID ,E.FNAME ,C.FNUMBER ,D.FNAME  wuLiaoName
+        FROM T_PRD_INSTOCK A
+        INNER JOIN T_STK_MISDELIVERYENTRY B ON A.FID = B.FID
+        INNER JOIN  T_BD_MATERIAL C  ON B.FMATERIALID  = C.FMATERIALID
+        INNER JOIN  T_BD_MATERIAL_L D  ON D.FMATERIALID  = C.FMATERIALID
+        INNER JOIN t_BD_Stock_L  E ON E.FSTOCKID = B.FSTOCKID
+        <if test="date !=null">
+            WHERE  A.FDATE >= #{date}
+        </if>
+
+    </select>
 
 </mapper>

get-data/src/main/resources/com/huimv/getdata/mapper/ErpVoucherMapper.xml

@@ -44,8 +44,10 @@ inner join T_BD_ACCOUNT KM ON KM.FACCTID=D.FACCOUNTID
     </select>
     <select id="getDangQianZiJinYvE" resultType="com.huimv.getdata.entity.voucher.ErpVoucher"
             parameterType="java.util.Date">
-select DISTINCT  D.FCREDIT ,M.FDATE ,M.FACCTORGID   from T_GL_VOUCHER M
+select DISTINCT  D.FCREDIT ,M.FDATE ,M.FACCTORGID ,KM.FNAME    from T_GL_VOUCHER M
 inner join T_GL_VOUCHERENTRY D on D.FVOUCHERID=M.FVOUCHERID
+        inner join T_BD_ACCOUNT_L KM ON KM.FACCTID=D.FACCOUNTID
+
         <if test="date !=null">
            where  m.FDATE >= #{date}
         </if>
@@ -55,20 +57,24 @@ ORDER BY M.FDATE DESC
     <select id="getDangYueJieKuanYvE" resultType="com.huimv.getdata.entity.voucher.ErpVoucher"
             parameterType="java.util.Date">
         select  D.FCREDIT ,M.FDATE ,M.FACCTORGID   from T_GL_VOUCHER M
+        inner join T_GL_VOUCHERENTRY D on D.FVOUCHERID=M.FVOUCHERID
+        inner join T_BD_ACCOUNT KM ON KM.FACCTID=D.FACCOUNTID
+        WHERE KM.FNumber IN ('2001','2004','2501')
         <if test="date !=null">
             where  m.FDATE >= #{date}
         </if>
-inner join T_GL_VOUCHERENTRY D on D.FVOUCHERID=M.FVOUCHERID
+
     </select>
     <select id="getGuoNeiWaiSouRu" resultType="com.huimv.getdata.entity.voucher.ErpVoucher"
             parameterType="java.util.Date">
 SELECT    M.FNAME ,D.FCREDIT , B.FDATE ,B.FACCTORGID from  T_BD_ACCOUNT_L  M
 INNER JOIN T_GL_VOUCHERENTRY D ON  M.FACCTID= D.FACCOUNTID
 INNER JOIN   T_GL_VOUCHER B ON B.FVOUCHERID  = D.FVOUCHERID
+
+ WHERE M.FNAME in ('国内销售收入','国内销售收入2','国外销售收入')
         <if test="date !=null">
-            where  B.FDATE >= #{date}
+            and  B.FDATE >= #{date}
         </if>
- WHERE M.FNAME in ('国内销售收入','国内销售收入2','国外销售收入')
 
     </select>
     <select id="getChanPinShouRu" resultType="com.huimv.getdata.entity.voucher.ChanPinShouRu"

get-data/src/main/resources/com/huimv/getdata/mapper/ErpXiaoShouMapper.xml

@@ -6,14 +6,15 @@
     <select id="getWanChengLv" resultType="com.huimv.getdata.entity.xiaoshou.XiaoShouWanChenLvJinE"
             parameterType="java.util.Date">
 
-        SELECT DISTINCT C.FALLAMOUNT_LC ,C.FALLAMOUNT  , A.FCUSTID ,A.FSALEDEPTID , A.FSALERID , A.FSALEORGID ,A.FDATE  ,B.FQTY, B.FMATERIALID ,D.FNAME wuLiaoName ,E.FRETURNQTY,
-E.FBASERETURNQTY ,F.FNAME ,F.fdeptname, (C.FALLAMOUNT_LC / B.FQTY ) '销售单价'
+        SELECT DISTINCT A.FBILLNO , C.FALLAMOUNT_LC ,C.FALLAMOUNT  , A.FCUSTID ,A.FSALEDEPTID , A.FSALERID , A.FSALEORGID ,A.FDATE  ,B.FQTY, B.FMATERIALID ,D.FNAME wuLiaoName ,E.FRETURNQTY,
+E.FBASERETURNQTY ,F.FNAME ,F.fdeptname, (C.FALLAMOUNT_LC / B.FQTY )  xiaoShouDanJia ,  G.FNAME  keHuName
  FROM  T_SAL_ORDER A
  INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID
  INNER JOIN T_SAL_ORDERENTRY_F C ON C.FENTRYID = B.FENTRYID
  INNER JOIN T_BD_MATERIAL_L D ON D.FMATERIALID  = B.FMATERIALID
  INNER JOIN T_SAL_ORDERENTRY_R E ON E.FENTRYID = B.FENTRYID
  LEFT JOIN V_BD_SALESMAN_L F ON F.fid = A.FSALERID
+        LEFT JOIN  T_BD_CUSTOMER_L G ON G.FCUSTID = A.FCUSTID
         <if test="date !=null">
             where A.FDATE >= #{date}
         </if>
@@ -28,7 +29,7 @@ E.FBASERETURNQTY ,F.FNAME ,F.fdeptname, (C.FALLAMOUNT_LC / B.FQTY ) '销售单
     <select id="getXiaoShouFaPiaoJinE" resultType="com.huimv.getdata.entity.xiaoshou.XiaoShouFaPiaoJinE"
             parameterType="java.util.Date">
 
-        SELECT A.FDATE, A.FSETTLEORGID , A.FSALEORGID ,A.FSALEERID ,B.FALLAMOUNT ,A.FSETACCOUNTTYPE FROM 	 T_AR_RECEIVABLE A
+        SELECT A.FDATE, A.FSETTLEORGID , A.FSALEORGID ,A.FSALEERID ,B.FALLAMOUNT ,A.FSETACCOUNTTYPE ,A.FBILLNO FROM 	 T_AR_RECEIVABLE A
 	INNER JOIN 	 T_AR_RECEIVABLEENTRY B ON A.FID = B.FID
 	WHERE A.FSETACCOUNTTYPE = 3
         <if test="date !=null">
@@ -39,7 +40,9 @@ E.FBASERETURNQTY ,F.FNAME ,F.fdeptname, (C.FALLAMOUNT_LC / B.FQTY ) '销售单
             resultType="com.huimv.getdata.entity.xiaoshou.XiaoShouFaHuoJinEKeHuGongXian"
             parameterType="java.util.Date">
 
-SELECT  DISTINCT A.FSALEORGID ,A.FDATE ,A.FSTOCKORGID ,A.FCUSTOMERID,A.FSALESMANID , B.FREALQTY , C.FALLAMOUNT_LC ,D.FNAME  FROM  T_SAL_OUTSTOCK A
+SELECT  DISTINCT A.FSALEORGID ,A.FDATE ,A.FSTOCKORGID ,A.FCUSTOMERID,A.FSALESMANID , B.FREALQTY , C.FALLAMOUNT_LC ,D.FNAME   ,A.FBILLNO
+        F.FNAME xiaoShouName
+        FROM  T_SAL_OUTSTOCK A
 INNER JOIN  T_SAL_OUTSTOCKENTRY B ON A.FID = B.FID
 INNER JOIN  T_SAL_OUTSTOCKENTRY_F C ON C.FENTRYID = B.FENTRYID
 INNER JOIN T_BD_CUSTOMER_L D ON D.FCUSTID=A.FCUSTOMERID

huimv-farm/src/main/java/vip/xiaonuo/Application.java

@@ -13,6 +13,7 @@
 package vip.xiaonuo;
 
 import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/ErpBdOrg.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -30,7 +32,7 @@ public class ErpBdOrg implements Serializable {
 
     private Integer forgid;
 
-    private LocalDateTime fcreatedate;
+    private Date fcreatedate;
 
     private String fname;
 

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/CaiGouDingDan.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class CaiGouDingDan {
     private Double FQTY;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FPURCHASEORGID;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/CaiGouDingDanShuLiangJinE.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,10 +9,13 @@ import java.util.Date;
 public class CaiGouDingDanShuLiangJinE {
 
     private String fname;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FPURCHASEORGID;
     private Double FQTY;
     private Double FALLAMOUNT;
     private Double danJia ;
+    private String gys;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/CaiGouRuKu.java

@@ -1,5 +1,10 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.getdata.entity.caigou
@@ -7,5 +12,11 @@ package vip.xiaonuo.erp.entity.caigou;
  * @Author : yuxuexuan
  * @Create : 2025-01-04 15:08
  **/
+@Data
 public class CaiGouRuKu {
+    private Double FBILLAMOUNTLC;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
+    private Integer FDEMANDORGID;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/CaiGouShuLiang.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class CaiGouShuLiang {
     private Double FQTY;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
-    private Integer FSTOCKORGID;
+    private Integer FPURCHASEORGID;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/CaiGouYueJun.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class CaiGouYueJun {
     private Double FQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FPURCHASEORGID;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/DaiJianShuLiang.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -9,6 +10,7 @@ public class DaiJianShuLiang {
 
     private Double FINSTOCKQTY;
     private Double FACTRECEIVEQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     private Double DAIJIAN;

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/DingDanJinE.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class DingDanJinE {
     private Double FALLAMOUNT;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FPURCHASEORGID;
 

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/FaPiaoJinE.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,8 @@ import java.util.Date;
 @Data
 public class FaPiaoJinE {
     private Double FALLAMOUNT;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FPURCHASEORGID;
+    private Double FQTY;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/JiaoHuoShuliang.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class JiaoHuoShuliang {
     private Double FACTRECEIVEQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FSTOCKORGID;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/LeiJiRuKu.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class LeiJiRuKu {
     private Double FREALQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FDEMANDORGID;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/RuKuJinE.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class RuKuJinE {
     private Double FREALQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FDEMANDORGID;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/ShouLiaoJinE.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class ShouLiaoJinE {
     private Double FINSTOCKQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FSTOCKORGID;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/YingFuZhangKuan.java

@@ -1,12 +1,16 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sun.jna.platform.win32.OaIdl;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class YingFuZhangKuan {
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
+
     private String  FBGLSHSJDW;
     //采购组织
     private int FPURCHASEORGID;
@@ -17,5 +21,10 @@ public class YingFuZhangKuan {
     private String FNAME;
     //未核销金额
     private Double FNOTVERIFICATEAMOUNT;
+    private Double FQTY;
+    private String wuLiaoName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FBOOKINGDATE;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/ZuiDiKuChun.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.caigou;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,6 +11,7 @@ public class ZuiDiKuChun {
     private Double FINSTOCKQTY;
     //交货数量
     private Double FACTRECEIVEQTY;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     //剩余数量

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/center/CaiGouJinE.java

@@ -1,12 +1,15 @@
 package vip.xiaonuo.erp.entity.center;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class CaiGouJinE {
-    private Date fdate;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
     //部门id
     private int FPURCHASEDEPTID;
     //组织ID

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/center/DangQianYvQi.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.center;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -12,6 +13,7 @@ public class DangQianYvQi {
     private  int  FSALEORGID;
     //收款组织
     private  int  FPAYORGID;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Double FNOTVERIFICATEAMOUNT;
 

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/center/XiaoShouE.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.center;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -12,6 +13,7 @@ public class XiaoShouE {
     private  int  FSALEORGID;
     //收款组织
     private  int  FPAYORGID;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Double FREALRECAMOUNTFOR;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/center/YangMaoZhiCaiGouJinE.java

@@ -1,12 +1,14 @@
 package vip.xiaonuo.erp.entity.center;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class YangMaoZhiCaiGouJinE {
-    private Date fdate;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
     //部门
     private int FPURCHASEDEPTID;
     //组织

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/kucun/ChenPinChuKu.java

@@ -1,6 +1,7 @@
 package vip.xiaonuo.erp.entity.kucun;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,8 +9,11 @@ import java.util.Date;
 @Data
 public class ChenPinChuKu {
     private Double FSALUNITQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     private int FMATERIALID;
     private String FNAME;
+    private String fnumber;
+    private String wuLiaoName;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/kucun/ChengPinRuKu.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,9 +8,11 @@ import java.util.Date;
 @Data
 public class ChengPinRuKu {
     private Double FREALQTY;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     private int FMATERIALID;
     private String FNAME;
-    private String FNUMBER;
+    private String fnumber;
+    private String wuLiaoName;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/kucun/KunCunQuShi.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/kucun/WuLiaoKuMingXi.java

@@ -1,12 +1,14 @@
 package vip.xiaonuo.erp.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class WuLiaoKuMingXi {
-    private Date fdate;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FDATE;
     private int FSTOCKORGID;
     //交货数量
     private Double FACTRECEIVEQTY;
@@ -14,8 +16,8 @@ public class WuLiaoKuMingXi {
     private Double FINSTOCKQTY;
     //待检数量
     private Double daiJian;
-    private Date wuLiaoName ;
-    private Date FNUMBER;
-    private Date FNAME;
-    private Date FMATERIALID;
+    private String wuLiaoName ;
+    private String fnumber;
+    private String FNAME;
+    private String FMATERIALID;
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/kucun/YangMaoZhiChuKu.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.erp.entity.kucun;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,6 +8,7 @@ import java.util.Date;
 @Data
 public class YangMaoZhiChuKu {
     private Double FSALUNITQTY;
+@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FSTOCKORGID;
     private int FMATERIALID;