Kaynağa Gözat

看板及后台

chenc 4 yıl önce
ebeveyn
işleme
aadc3b9337

+ 2 - 2
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/controller/FbsPuArrivalvouchController.java

@@ -474,11 +474,11 @@ public class FbsPuArrivalvouchController {
 			 for(Map<String,Object> m:map){
 				 ArrayList<String> list = new ArrayList<>();
 				 ArrayList<String> list2 = new ArrayList<>();
-				 String par = FileList.getAllFileName(upAnomalous+m.get("cinvcode"),list);
+				 String par = FileList.getAllFileName(upAnomalous+m.get("ccheckcode"),list);
 				 if(par.equals("true")){
 
 				 	for(String L:list){
-				 		L = m.get("cinvcode")+ "/" + L;
+				 		L = m.get("ccheckcode")+ "/" + L;
 						list2.add(L);
 					}
 				 	m.put("images",list2);

+ 24 - 4
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsPuArrivalvouchMapper.xml

@@ -91,7 +91,7 @@
         <!-- SELECT b.cVenCode '供应商编码',c.cVenName '供应商名称',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
                  fValidQuantity - fRealQuantity '已到货未入库数据',b.dportdate '到货日期'-->
         SELECT b.cVenCode cVenCode,c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
-        a.fRealQuantity arriveSum,CONVERT(varchar(30),b.dDate ,112) arriveDate,a.cItemName cItemName
+        a.iQuantity arriveSum,CONVERT(varchar(30),b.dDate ,112) arriveDate,a.cItemName cItemName
         FROM
         PU_ArrivalVouchs a
         left join PU_ArrivalVouch b on a.id = b.id
@@ -100,7 +100,7 @@
         where
         <!--(a.fValidQuantity - a.fValidInQuan) &gt; 0-->
         (a.iQuantity - a.fRealQuantity) &gt; 0
-        order by b.dportdate desc
+        order by b.dDate desc
 
     </select>
 
@@ -269,7 +269,7 @@
             ) qq ON pp.cPOID = qq.CPOCODE-->
 
 
-        SELECT CONVERT
+        <!--SELECT CONVERT
         ( VARCHAR ( 30 ), q.DDATE, 23 ) ddate,
         q.CVENCODE cvencode,
         q.CINVCODE cinvcode,
@@ -285,7 +285,27 @@
         CONVERT ( VARCHAR ( 30 ), q.DDATE, 23 ),
         q.CVENCODE,
         q.CINVCODE,
-        i.cInvName
+        i.cInvName-->
+
+        SELECT CONVERT
+        ( VARCHAR ( 30 ), q.DDATE, 23 ) ddate,
+        q.CVENCODE cvencode,
+        q.CINVCODE cinvcode,
+        i.cInvName cinvName,
+        q.FDTQUANTITY fdtquantity,
+        q.FDISQUANTITY fdisquantity,
+        q.FQUANTITY fquantity,
+        Q.CCHECKCODE as ccheckcode,
+        q.CINSPECTCODE as cinspectcode
+        FROM
+        QMCHECKVOUCHER q
+        LEFT JOIN Inventory i ON q.CINVCODE = i.cInvCode
+
+        where datediff(m,CONVERT ( VARCHAR ( 30 ), q.DDATE, 23 ),getdate()) <![CDATA[< ]]>3
+        and q.FDISQUANTITY is not null
+
+        ORDER BY q.DDATE desc
+
             </select>
 
 </mapper>