Merge branch 'master' of http://139.196.39.194:9021/yuansh/FBS_MES

src/main/java/org/jeecg/modules/fbsDispatchList/mapper/xml/FbsDispatchListMapper.xml

@@ -6,7 +6,7 @@
          SELECT top 6 <!--c.cWhName '仓库',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
                 a.iQuantity - a.fOutQuantity '已做发货单未出库数据',b.dDate '到货日期'-->
                 c.cWhName warehouseName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
-                a.iQuantity - a.fOutQuantity sendSum,b.,CONVERT(varchar(30),b.dDate,23) planSendDate
+                a.iQuantity - a.fOutQuantity sendSum,CONVERT(varchar(30),b.dDate,23) planSendDate
         FROM
              DispatchLists a
              left join DispatchList b on a.DLID  = b.DLID

src/main/java/org/jeecg/modules/fbsInventory/controller/FbsInventoryController.java

@@ -45,7 +45,33 @@ import com.alibaba.fastjson.JSON;
 public class FbsInventoryController {
 	@Autowired
 	private IFbsInventoryService fbsInventoryService;
-	
+
+	 /**
+	  * 安全库存（仓库管理看板）
+ 	  * @return
+	  */
+	 @RequestMapping(value = "/getStockList")
+	 public Result<List<Map<String,Object>>> getStockList(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+
+		 try {
+			 List<Map<String,Object>> map=fbsInventoryService.getStockList();
+			 result.setResult(map);
+			 result.success("操作成功");
+
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+
+		 return result;
+	 }
+
+
+
+
+
+
 	/**
 	  * 分页列表查询
 	 * @param fbsInventory

src/main/java/org/jeecg/modules/fbsInventory/mapper/FbsInventoryMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsInventory.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsInventory.entity.FbsInventory;
@@ -21,4 +22,10 @@ public interface FbsInventoryMapper extends BaseMapper<FbsInventory> {
     * @return java.util.List<org.jeecg.modules.fbsInventory.entity.FbsInventory>
     */
     List<FbsInventory> getInventoryGetByOrderId(@Param("moId")String moId);
+
+    /**
+     * 安全库存
+     * @return
+     */
+    List<Map<String,Object>> getStockList();
 }

src/main/java/org/jeecg/modules/fbsInventory/mapper/xml/FbsInventoryMapper.xml

@@ -10,4 +10,15 @@
         WHERE
         m.MoId = #{moId}
     </select>
+
+    <select id="getStockList" resultType="java.util.HashMap">
+
+        select top 20 a.iQuantity realStockSum,b.iSafeNum safeStockSum ,b.cInvCode materialCode,b.cInvName materialName,cInvStd specs from
+
+        (select cInvCode,sum(iQuantity) as iQuantity  from CurrentStock group by cInvCode) a
+
+        left join Inventory b on a.cInvCode = b.cInvCode
+        where b.iSafeNum is not null
+
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsInventory/service/IFbsInventoryService.java

@@ -4,6 +4,7 @@ import org.jeecg.modules.fbsInventory.entity.FbsInventory;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 存库档案
@@ -22,4 +23,10 @@ public interface IFbsInventoryService extends IService<FbsInventory> {
     */
     List<FbsInventory> getInventoryGetByOrderId(String moId);
 
+    /**
+     * 安全库存
+     * @return
+     */
+    List<Map<String,Object>> getStockList();
+
 }

src/main/java/org/jeecg/modules/fbsInventory/service/impl/FbsInventoryServiceImpl.java

@@ -9,7 +9,9 @@ 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: 存库档案
@@ -21,11 +23,16 @@ import java.util.List;
 @DS("multi-datasource1")
 public class FbsInventoryServiceImpl extends ServiceImpl<FbsInventoryMapper, FbsInventory> implements IFbsInventoryService {
 
-    @Autowired
+    @Resource
     FbsInventoryMapper fbsInventoryMapper;
 
     @Override
     public List<FbsInventory> getInventoryGetByOrderId(String moId) {
         return fbsInventoryMapper.getInventoryGetByOrderId(moId);
     }
+
+    @Override
+    public List<Map<String,Object>> getStockList(){
+        return fbsInventoryMapper.getStockList();
+    }
 }

src/main/java/org/jeecg/modules/fbsPerson/mapper/xml/FbsPersonMapper.xml

@@ -21,15 +21,4 @@
              where cpersonCode=#{code}
     </select>
 
-
-    <select id="selNowDispatchList" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
-        SELECT
-            a.*,b.firstTime
-        FROM
-            fbs_workshop_dispatch_list a
-            left join fbs_working_statistics b on a.id = b.pk_workshop_dispatch_list and b.del_falg='0' and b.state='1'
-        WHERE
-            a.del_flag = '0' <!--and a.state ='1'-->
-
-    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -10,9 +10,9 @@
             a.*,b.first_time as firstTime
         FROM
             fbs_workshop_dispatch_list a
-            left join fbs_working_statistics b on a.id = b.pk_workshop_dispatch_list and b.del_flag='0' and b.state='1'
+            left join fbs_working_statistics b on a.id = b.pk_workshop_dispatch_list and b.del_flag='0'
         WHERE
-            a.del_flag = '0' <!--and a.state ='1'-->
+            a.del_flag = '0' and a.state ='1'
 
     </select>