1

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

@@ -1,5 +1,7 @@
 package com.huimv.getdata.controller;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.huimv.getdata.entity.center.CaiGouJinE;
 import com.huimv.getdata.entity.center.DangQianYvQi;
 import com.huimv.getdata.entity.center.XiaoShouE;

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

@@ -20,4 +20,6 @@ public class WuLiaoKuMingXi {
     private String fnumber;
     private String FNAME;
     private String FMATERIALID;
+    private Double FBILLAMOUNTLC;
+    private Double  FSTOCKBASEQTY;
 }

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

@@ -8,11 +8,18 @@ import java.util.Date;
 @Data
 public class ShiJiChanLiang {
     private double FREALQTY;
-@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     //入库组织
     private int FSTOCKORGID;
     //生产组织
     private int FPRDORGID;
 
+    private String wuLiaoName;
+
+    private String FNAME;
+
+    private String cheJianName;
+    private int FWORKSHOPID;
+
 }

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

@@ -21,7 +21,7 @@ public class XiaoShouFaHuoJinEKeHuGongXian {
     //实发数量
     private Double FREALQTY;
     //价税合计（本位币
-    private Double FALLAMOUNT_LC;
+    private Double FALLAMOUNTLC;
     //客户名字
     private String FNAME;
     private String FBILLNO;

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 public class XiaoShouWanChenLvJinE {
     //完成率(价税合计本位币)
-    private Double FALLAMOUNT_LC;
+    private Double FALLAMOUNTLC;
     private String FBILLNO;
     //销售订单金额(价税合计)
     private Double FALLAMOUNT;

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

@@ -10,6 +10,7 @@ public class YvQiHeTongMingXi {
 
     private Integer FSALEORGID;
     private String FBILLNO;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private String FDATE;
     private String FBILLTYPEID;
     //合同名字
@@ -19,7 +20,7 @@ public class YvQiHeTongMingXi {
     //销售数量
     private String FQTY;
     //价税合计（本位币）
-    private String FALLAMOUNT_LC;
+    private Double FALLAMOUNTLC;
     //出库日期
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date chuKuDate;

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

@@ -232,10 +232,11 @@ INNER JOIN T_STK_MISDELIVERYENTRY B ON A.FID = B.FID
     </select>
     <select id="getWuLiaoMingXi" resultType="com.huimv.getdata.entity.kucun.WuLiaoKuMingXi"
             parameterType="java.util.Date">
-        SELECT DISTINCT A.FDATE , A.FSTOCKORGID ,B.FACTRECEIVEQTY , F.FINSTOCKQTY ,(B.FACTRECEIVEQTY  -F.FINSTOCKQTY ) daiJian,D.FNAME wuLiaoName,C.FNUMBER,E.FNAME ,B.FMATERIALID
+        SELECT DISTINCT A.FDATE , A.FSTOCKORGID ,B.FACTRECEIVEQTY , F.FINSTOCKQTY ,(B.FACTRECEIVEQTY  -F.FINSTOCKQTY ) daiJian,D.FNAME wuLiaoName,C.FNUMBER,E.FNAME  ,B.FSTOCKBASEQTY,B.FMATERIALID,G.FBILLAMOUNT_LC
 FROM T_PUR_RECEIVE A
 INNER JOIN T_PUR_RECEIVEENTRY B ON A.FID = B.FID
-INNER JOIN T_PUR_RECEIVEENTRY_S F ON F.FENTRYID = B.FENTRYID
+        INNER JOIN T_PUR_RECEIVEFIN G ON G.FID = A.FID
+        INNER JOIN T_PUR_RECEIVEENTRY_S F ON F.FENTRYID = B.FENTRYID
  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

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

@@ -4,8 +4,12 @@
 
     <select id="getShiJiChanLiang" resultType="com.huimv.getdata.entity.shengcan.ShiJiChanLiang"
             parameterType="java.util.Date">
-        SELECT B.FREALQTY , A.FDATE , A.FSTOCKORGID ,A.FPRDORGID FROM T_PRD_INSTOCK A
-INNER JOIN T_PRD_INSTOCKENTRY  B ON A.FID  = B.FID
+        SELECT B.FREALQTY , A.FDATE , A.FSTOCKORGID ,A.FPRDORGID ,C.FNAME wuLiaoName ,D.FNAME ,E.FNAME cheJianName , B.FWORKSHOPID  FROM T_PRD_INSTOCK A
+        INNER JOIN T_PRD_INSTOCKENTRY  B ON A.FID  = B.FID
+        INNER JOIN T_BD_MATERIAL_l  C ON C.FMATERIALID  = B.FMATERIALID
+        INNER JOIN T_BD_STOCK_L  D ON D.FSTOCKID  = B.FSTOCKID
+        INNER JOIN T_BD_DEPARTMENT_l  E ON E.FDEPTID  = B.FWORKSHOPID
+
         <if test="date !=null">
             where  A.FDATE >= #{date}
         </if>

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

@@ -41,11 +41,12 @@ E.FBASERETURNQTY ,F.FNAME ,F.fdeptname, (C.FALLAMOUNT_LC / B.FQTY )  xiaoShouDan
             parameterType="java.util.Date">
 
 SELECT  DISTINCT A.FSALEORGID ,A.FDATE ,A.FSTOCKORGID ,A.FCUSTOMERID,A.FSALESMANID , B.FREALQTY , C.FALLAMOUNT_LC ,D.FNAME   ,A.FBILLNO
-        F.FNAME xiaoShouName
+       , 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
+        LEFT JOIN V_BD_SALESMAN_L F ON F.fid = A.FSALESMANID
         <if test="date !=null">
             where A.FDATE >= #{date}
         </if>
@@ -66,13 +67,14 @@ INNER JOIN T_BD_ACCOUNT C ON  C.FACCTID = B.FACCOUNTID
     </select>
     <select id="getYvQiHeTongMingXi" resultType="com.huimv.getdata.entity.xiaoshou.YvQiHeTongMingXi"
             parameterType="java.util.Date">
-        SELECT DISTINCT A.FBILLNO , A.FDATE ,A.FBILLTYPEID   ,C.FNAME , D.FNAME keHuName ,E.FQTY  ,F.FALLAMOUNT_LC , G.FDATE chuKuDate  FROM T_CRM_CONTRACT A
-INNER JOIN T_BAS_BILLTYPE  B ON B.FBILLTYPEID = A.FBILLTYPEID
-INNER JOIN T_BAS_BILLTYPE_L C ON A.FBILLTYPEID = C.FBILLTYPEID
-INNER JOIN T_BD_CUSTOMER_L D ON D.FCUSTID=A.FCUSTID
-INNER JOIN T_CRM_CONTRACTENTRY E  ON E.FID  = A.FID
-LEFT JOIN T_CRM_CONTRACTENTRY_F F  ON F.FID  = A.FID
-LEFT JOIN T_SAL_OUTSTOCK G  ON G.FBILLTYPEID  = A.FBILLTYPEID
+        SELECT DISTINCT  A.FBILLNO , A.FDATE ,A.FBILLTYPEID   ,C.FNAME , D.FNAME keHuName ,E.FQTY  ,F.FALLAMOUNT_LC , G.FDATE chuKuDate
+        ,A.FSALEORGID FROM T_CRM_CONTRACT A
+        INNER JOIN T_BAS_BILLTYPE  B ON B.FBILLTYPEID = A.FBILLTYPEID
+        INNER JOIN T_BAS_BILLTYPE_L C ON A.FBILLTYPEID = C.FBILLTYPEID
+        INNER JOIN T_BD_CUSTOMER_L D ON D.FCUSTID=A.FCUSTID
+        INNER JOIN T_CRM_CONTRACTENTRY E  ON E.FID  = A.FID
+        LEFT JOIN T_CRM_CONTRACTENTRY_F F  ON F.FID  = A.FID
+        LEFT JOIN T_SAL_OUTSTOCK G  ON G.FBILLTYPEID  = A.FBILLTYPEID
         <if test="date !=null">
             where A.FDATE >= #{date}
         </if>

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

@@ -20,4 +20,6 @@ public class WuLiaoKuMingXi {
     private String fnumber;
     private String FNAME;
     private String FMATERIALID;
+    private Double FBILLAMOUNTLC;
+    private Double  FSTOCKBASEQTY;
 }

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

@@ -8,11 +8,19 @@ import java.util.Date;
 @Data
 public class ShiJiChanLiang {
     private double FREALQTY;
-@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     //入库组织
     private int FSTOCKORGID;
     //生产组织
     private int FPRDORGID;
 
+    private String wuLiaoName;
+
+    private String FNAME;
+
+    private String cheJianName;
+    private int FWORKSHOPID;
+
+
 }

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

@@ -21,7 +21,7 @@ public class XiaoShouFaHuoJinEKeHuGongXian {
     //实发数量
     private Double FREALQTY;
     //价税合计（本位币
-    private Double FALLAMOUNT_LC;
+    private Double FALLAMOUNTLC;
     //客户名字
     private String FNAME;
     private String FBILLNO;

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 public class XiaoShouFeiYong {
     private int facctorgid;
-@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+        @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private String fname;
     private Double FCREDIT;

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

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 public class XiaoShouWanChenLvJinE {
     //完成率(价税合计本位币)
-    private Double FALLAMOUNT_LC;
+    private Double FALLAMOUNTLC;
     private String FBILLNO;
     //销售订单金额(价税合计)
     private Double FALLAMOUNT;

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

@@ -19,7 +19,7 @@ public class YvQiHeTongMingXi {
     //销售数量
     private String FQTY;
     //价税合计（本位币）
-    private String FALLAMOUNT_LC;
+    private Double FALLAMOUNTLC;
     //出库日期
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date chuKuDate;

huimv-farm/src/main/java/vip/xiaonuo/quality/service/impl/QualityTargetServiceImpl.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.quality.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,8 @@ import vip.xiaonuo.quality.service.IQualityTargetService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * <p>
  * 质量管控指标 服务实现类
@@ -31,6 +34,14 @@ public class QualityTargetServiceImpl extends ServiceImpl<QualityTargetMapper, Q
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
         queryWrapper.orderByDesc("id").last(" limit 1");
         QualityTarget qualityTarget = targetMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(qualityTarget)){
+            qualityTarget =   new QualityTarget();
+            qualityTarget.setCreateTime(new Date());
+            qualityTarget.setDefectiveRate("0");
+            qualityTarget.setProduceOneRate("0");
+            qualityTarget.setProduceRate("0");
+            qualityTarget.setUnqualifiedBatch("0");
+        }
         return qualityTarget;
     }
 }