根据库位查询物品

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/TaskService.java

@@ -36,6 +36,8 @@ public interface TaskService extends SuperService<TTask> {
      */
     Map<String,Object>scheduleTaskDaypageList(Map<String,Object>map);
 
+    Map<String,Object>scheduleTaskByResource(Map<String,Object>map);
+
      /**
       * 生产资源正在执行的任务
       * @param map

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -634,6 +634,12 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         return retMap;
     }
 
+
+    @Override
+    public Map<String, Object> scheduleTaskByResource(Map<String, Object> map) {
+        return null;
+    }
+
     List<Map<String,Object>>getTtileList(List<Map<String,Object>>list){
         List<Map<String,Object>>l = new ArrayList<Map<String,Object>>();
         for(int i=0;i<list.size();i++){

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StockInfoMapper.xml

@@ -24,7 +24,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
-        storge_id, lock_status, goods_type, goods_id, num, unique_code, turn_task_no, feed_task_no,
+        storge_id, lock_status, goods_type, goods_id, num, unique_code, turn_task_no, feed_task_no,storgeNo,
         categoryDesc,brandName,brandNo,specification,weight,spec_id,lockNum,availableNum
     </sql>
 
@@ -69,8 +69,9 @@
     </select>
 
     <select id="getGoodsListBystorgeId" resultMap="BaseResultMap" parameterType="map">
-        select a.*,b.categoryDesc,b.name as brandName,b.no as brandNo,b.specification,0 as lockNum,0 as availableNum from imcs_s_stock_info a
+        select a.*,b.categoryDesc,b.name as brandName,b.no as brandNo,b.specification,0 as lockNum,0 as availableNum,s.`no` storgeNo from imcs_s_stock_info a
         left join view_stock_goods b on a.goods_id  = b.id
+        left join imcs_s_storge s on a.storge_id = s.id
         where 1=1
         <if test="storgeId != null and storgeId != ''">
             and a.storge_id = #{storgeId} and b.id is not null

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/TaskController.java

@@ -62,6 +62,14 @@ public class TaskController extends SuperController<TaskService, Long, TTask, TT
     }
 
 
+    @ApiOperation(value = "任务-按照生产资源", notes = "任务-按照生产资源")
+    @PostMapping("/scheduleTaskByResource")
+    public R<Map<String,Object>> scheduleTaskByResource(@RequestBody Map<String,Object> map) {
+        Map<String,Object> returnMap = baseService.scheduleTaskByResource(map);
+        return success(returnMap);
+    }
+
+
     @ApiOperation(value = "大屏-正在执行的任务", notes = "大屏-正在执行的任务")
     @PostMapping("/getBigScreenTaskList")
     public R<Map<String,Object>> getExeTaskByResourceList(@RequestBody Map<String,Object> map) {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/edgeLibrary/entity/StockInfo.java

@@ -64,6 +64,12 @@ public class StockInfo extends Entity<Long> {
     @Excel(name = "锁定状态(1-正常0-锁定)")
     private String lockStatus;
 
+
+    @ApiModelProperty(value = "库位编码")
+    @Length(max = 4, message = "库位编码")
+    @TableField(exist = false)
+    @Excel(name = "锁定状态(1-正常0-锁定)")
+    private String storgeNo;
     /**
      * 物品类型
      */