袁少华 4 年之前
父節點
當前提交
0e40244492

+ 40 - 1
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/controller/FbsArrivalVouchsController.java

@@ -45,7 +45,46 @@ import com.alibaba.fastjson.JSON;
 public class FbsArrivalVouchsController {
 	@Autowired
 	private IFbsArrivalVouchsService fbsArrivalVouchsService;
-	
+
+
+	 /**
+	  * 未来3天的到货计划(品质管理看板)
+	  * @return
+	  */
+	 @RequestMapping(value = "/getWillArriveList")
+	 public Result<List<FbsArrivalVouchs>> getWillArriveList(){
+		 Result<List<FbsArrivalVouchs>> result=new Result<>();
+
+		 try {
+			 List<FbsArrivalVouchs> map=fbsArrivalVouchsService.getWillArriveList();
+
+			 if(map.size() > 0){
+			 	 int i = 1;
+				 for(FbsArrivalVouchs o:map){
+					 o.setIndex(String.valueOf(i));
+					 i++;
+				 }
+			 }
+
+			 result.setResult(map);
+			 result.success("操作成功");
+
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败:"+e.getMessage());
+		 }
+
+		 return result;
+	 }
+
+
+
+
+
+
+
+
+
 	/**
 	  * 分页列表查询
 	 * @param fbsArrivalVouchs

+ 28 - 0
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/entity/FbsArrivalVouchs.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.fbsPuArrivalvouch.entity;
 import java.io.Serializable;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -479,4 +480,31 @@ public class FbsArrivalVouchs implements Serializable {
 	/**cfactorycode*/
 	@Excel(name = "cfactorycode", width = 15)
 	private String cfactorycode;
+
+
+	@TableField(exist = false)
+	private String index;//行号
+
+	@TableField(exist = false)
+	private String arriveDate;//计划到货日期
+
+	@TableField(exist = false)
+	private String vendorName;//供应商
+
+	@TableField(exist = false)
+	private String materialCode;//物料号
+
+	@TableField(exist = false)
+	private String materialName;//名称
+
+	@TableField(exist = false)
+	private String specs;//型号规格
+
+	@TableField(exist = false)
+	private String memo;//备注
+
+	@TableField(exist = false)
+	private String arriveSum;//数量
+
+
 }

+ 5 - 0
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/FbsArrivalVouchsMapper.java

@@ -13,5 +13,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version: V1.0
  */
 public interface FbsArrivalVouchsMapper extends BaseMapper<FbsArrivalVouchs> {
+    /**
+     * 未来3天的到货计划
+     * @return
+     */
+    public List<FbsArrivalVouchs> getWillArriveList();
 
 }

+ 12 - 0
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsArrivalVouchsMapper.xml

@@ -2,4 +2,16 @@
 <!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.FbsArrivalVouchsMapper">
 
+    <select id="getWillArriveList" resultType="org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs">
+
+        select  b.dDate arriveDate,c.cVenName vendorName,a.cInvCode materialCode,d.cInvName materialName,
+        a.iQuantity arriveSum,d.cInvStd specs,b.cMemo memo
+            from PU_ArrivalVouchs a
+            left join PU_ArrivalVouch b on a.id = b.id
+            left join Vendor c on c.cVenCode = b.cVenCode
+            left join Inventory d on d.cInvCode = a.cInvCode
+            where DATEDIFF(dd,getdate()+3,b.dDate) &gt; 0 and DATEDIFF(dd,getdate()+3,b.dDate) &lt; 4
+
+    </select>
+
 </mapper>

+ 4 - 0
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/IFbsArrivalVouchsService.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.fbsPuArrivalvouch.service;
 import org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 采购到货退货单主表(表体)
  * @author: jeecg-boot
@@ -11,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IFbsArrivalVouchsService extends IService<FbsArrivalVouchs> {
 
+    public List<FbsArrivalVouchs> getWillArriveList();
+
 }

+ 10 - 0
src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/impl/FbsArrivalVouchsServiceImpl.java

@@ -8,6 +8,9 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * @Description: 采购到货退货单主表(表体)
  * @author: jeecg-boot
@@ -17,5 +20,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 @DS("multi-datasource1")
 public class FbsArrivalVouchsServiceImpl extends ServiceImpl<FbsArrivalVouchsMapper, FbsArrivalVouchs> implements IFbsArrivalVouchsService {
+    @Resource
+    private FbsArrivalVouchsMapper fbsArrivalVouchsMapper;
+
 
+    @Override
+    public List<FbsArrivalVouchs> getWillArriveList() {
+        return fbsArrivalVouchsMapper.getWillArriveList();
+    }
 }