Explorar el Código

仓库管理看板

袁少华 hace 4 años
padre
commit
3641aedd22

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

@@ -45,7 +45,37 @@ import com.alibaba.fastjson.JSON;
 public class FbsPuArrivalvouchController {
 	@Autowired
 	private IFbsPuArrivalvouchService fbsPuArrivalvouchService;
-	
+
+	 /**
+	  * 收料待检
+	  * @return
+	  */
+	 @RequestMapping(value = "/getWatingCheckList")
+	 public Result<List<Map<String,Object>>> getWatingCheckList(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+
+		 try {
+			 List<Map<String,Object>> map=fbsPuArrivalvouchService.getWatingCheckList();
+			 result.setResult(map);
+			 result.success("操作成功");
+
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败:"+e.getMessage());
+		 }
+
+		 return result;
+	 }
+
+
+
+
+
+
+
+
+
+
 	/**
 	  * 分页列表查询
 	 * @param fbsPuArrivalvouch

+ 6 - 0
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/FbsPuArrivalvouchMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsPuArrivalvouch.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch;
@@ -13,5 +14,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version: V1.0
  */
 public interface FbsPuArrivalvouchMapper extends BaseMapper<FbsPuArrivalvouch> {
+    /**
+     * 收料待检
+     * @return
+     */
+    List<Map<String,Object>> getWatingCheckList();
 
 }

+ 14 - 0
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsPuArrivalvouchMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.fbsPuArrivalvouch.mapper.FbsPuArrivalvouchMapper">
 
+    <select id="getWatingCheckList" resultType="java.util.HashMap">
+
+       <!-- SELECT b.cVenCode '供应商编码',c.cVenName '供应商名称',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
+                iQuantity - fInspectQuantity '待检数量',b.dportdate '到货日期'-->
+        SELECT b.cVenCode '供应商编码',c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
+                a.iQuantity - a.fInspectQuantity arriveSum,b.dportdate 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
+        order by b.dportdate
+
+    </select>
 </mapper>

+ 4 - 1
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/IFbsPuArrivalvouchService.java

@@ -3,6 +3,9 @@ package org.jeecg.modules.fbsPuArrivalvouch.service;
 import org.jeecg.modules.fbsPuArrivalvouch.entity.FbsPuArrivalvouch;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 采购到货退货单主表(表头)
  * @author: jeecg-boot
@@ -10,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @version: V1.0
  */
 public interface IFbsPuArrivalvouchService extends IService<FbsPuArrivalvouch> {
-
+    public List<Map<String,Object>> getWatingCheckList();
 }

+ 9 - 0
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/impl/FbsPuArrivalvouchServiceImpl.java

@@ -8,6 +8,10 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 采购到货退货单主表(表头)
  * @author: jeecg-boot
@@ -17,5 +21,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 @DS("multi-datasource1")
 public class FbsPuArrivalvouchServiceImpl extends ServiceImpl<FbsPuArrivalvouchMapper, FbsPuArrivalvouch> implements IFbsPuArrivalvouchService {
+    @Resource
+    private FbsPuArrivalvouchMapper fbsPuArrivalvouchMapper;
 
+    public List<Map<String,Object>> getWatingCheckList(){
+        return fbsPuArrivalvouchMapper.getWatingCheckList();
+    }
 }