11111

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/controller/FbsArrivalVouchsController.java

@@ -77,6 +77,10 @@ public class FbsArrivalVouchsController {
 		 return result;
 	 }
 
+	 /**
+	  * 近6个月质量目标合格率比较
+	  * @return
+	  */
 	@RequestMapping(value = "/getLastSixMonthQualityTargetCompare")
 	public Result<List<Map<String,Object>>> getLastSixMonthQualityTargetCompare(){
 		Result<List<Map<String,Object>>> result=new Result<>();

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/controller/FbsPuArrivalvouchController.java

@@ -86,6 +86,16 @@ public class FbsPuArrivalvouchController {
 
 		 try {
 			 List<Map<String,Object>> map=fbsPuArrivalvouchService.getWatingInList();
+
+			 if(map.size() > 0){
+				 int i = 1;
+				 for(Map o:map){
+					 o.put("index",String.valueOf(i));
+					 i++;
+				 }
+
+			 }
+
 			 result.setResult(map);
 			 result.success("操作成功");
 

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsArrivalVouchsMapper.xml

@@ -28,7 +28,7 @@
 
     <select id="getLastSixMonthQualityTargetCompare" resultType="java.util.HashMap">
 
-        select  CONVERT(varchar(7), b.dDate,23) month, sum(a.iQuantity) target, sum(a.fRealQuantity ),
+        select  top 6 CONVERT(varchar(7), b.dDate,23) month, sum(a.iQuantity) target, sum(a.fRealQuantity ),
         sum(a.fValidQuantity) real,sum(a.fValidInQuan)
         from  PU_ArrivalVouchs a
         left join PU_ArrivalVouch b on a.id = b.id

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsPuArrivalvouchMapper.xml

@@ -36,7 +36,7 @@
        <!-- SELECT b.cVenCode '供应商编码',c.cVenName '供应商名称',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
                 fValidQuantity - fRealQuantity '已到货未入库数据',b.dportdate '到货日期'-->
            SELECT b.cVenCode '供应商编码',c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
-                a.fValidQuantity - a.fRealQuantity arriveSum,CONVERT(varchar(30),b.dportdate,23) arriveDate
+                a.fValidQuantity - a.fValidInQuan arriveSum,CONVERT(varchar(30),b.dDate ,23) arriveDate
         FROM
              PU_ArrivalVouchs a
              left join PU_ArrivalVouch b on a.id = b.id