11111

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

@@ -47,7 +47,7 @@ public class FbsPuArrivalvouchController {
 	private IFbsPuArrivalvouchService fbsPuArrivalvouchService;
 
 	 /**
-	  * 收料待检
+	  * 收料待检(仓库管理看板)
 	  * @return
 	  */
 	 @RequestMapping(value = "/getWatingCheckList")
@@ -68,7 +68,7 @@ public class FbsPuArrivalvouchController {
 	 }
 
      /**
-      * 收料待检
+      * 收料待检(仓库管理看板)
       * @return
       */
      @RequestMapping(value = "/getCheckSum")
@@ -76,6 +76,36 @@ public class FbsPuArrivalvouchController {
          return fbsPuArrivalvouchService.getCheckSum();
      }
 
+	 /**
+	  * 已到货待入库数据(仓库管理看板)
+	  * @return
+	  */
+	 @RequestMapping(value = "/getWatingInList")
+	 public Result<List<Map<String,Object>>> getWatingInList(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+
+		 try {
+			 List<Map<String,Object>> map=fbsPuArrivalvouchService.getWatingInList();
+			 result.setResult(map);
+			 result.success("操作成功");
+
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+
+		 return result;
+	 }
+
+	 /**
+	  * 已入库数据(仓库管理看板)
+	  * @return
+	  */
+     @RequestMapping(value = "/getInSum")
+     public int getInSum(){
+         return fbsPuArrivalvouchService.getInSum();
+     }
+
 
 
 

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

@@ -26,4 +26,16 @@ public interface FbsPuArrivalvouchMapper extends BaseMapper<FbsPuArrivalvouch> {
      */
     int getCheckSum();
 
+   /**
+     * 已到货待入库数据
+     * @return
+     */
+    List<Map<String,Object>> getWatingInList();
+
+    /**
+     * 已入库数据
+     * @return
+     */
+    int getInSum();
+
 }

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

@@ -29,4 +29,31 @@
           where  (a.iQuantity - a.fInspectQuantity) <= 0
 
     </select>
+
+
+    <select id="getWatingInList" resultType="java.util.HashMap">
+
+       <!-- 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
+        FROM
+             PU_ArrivalVouchs a
+             left join PU_ArrivalVouch b on a.id = b.id
+             left join Vendor c on b.cVenCode = c.cVenCode
+             left join Inventory d on a.cInvCode = d.cInvCode
+          where  (a.fValidQuantity - a.fRealQuantity) &gt; 0
+        order by b.dportdate desc
+
+    </select>
+
+     <select id="getInSum" resultType="int">
+          SELECT count(1)
+        FROM
+             PU_ArrivalVouchs a
+             left join PU_ArrivalVouch b on a.id = b.id
+             left join Vendor c on b.cVenCode = c.cVenCode
+             left join Inventory d on a.cInvCode = d.cInvCode
+          where  (a.fValidQuantity - a.fRealQuantity) &lt;= 0
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/IFbsPuArrivalvouchService.java

@@ -13,7 +13,11 @@ import java.util.Map;
  * @version： V1.0
  */
 public interface IFbsPuArrivalvouchService extends IService<FbsPuArrivalvouch> {
-    public List<Map<String,Object>> getWatingCheckList();
+    List<Map<String,Object>> getWatingCheckList();
 
     int getCheckSum();
+
+    List<Map<String,Object>> getWatingInList();
+
+    int getInSum();
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/impl/FbsPuArrivalvouchServiceImpl.java

@@ -31,4 +31,14 @@ public class FbsPuArrivalvouchServiceImpl extends ServiceImpl<FbsPuArrivalvouchM
     public int getCheckSum(){
         return fbsPuArrivalvouchMapper.getCheckSum();
     }
+
+
+    public List<Map<String,Object>> getWatingInList(){
+        return fbsPuArrivalvouchMapper.getWatingInList();
+    }
+
+    public int getInSum(){
+        return fbsPuArrivalvouchMapper.getInSum();
+    }
+
 }