diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptLineMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptLineMobController.java
index c198635..a895750 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptLineMobController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptLineMobController.java
@@ -77,19 +77,37 @@ public class WmItemRecptLineMobController extends BaseController {
             WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmItemRecptLine.getWarehouseId());
             wmItemRecptLine.setWarehouseCode(warehouse.getWarehouseCode());
             wmItemRecptLine.setWarehouseName(warehouse.getWarehouseName());
+        }else if(StringUtils.isNotNull(wmItemRecptLine.getWarehouseCode())){
+            WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmItemRecptLine.getWarehouseCode());
+            wmItemRecptLine.setWarehouseId(warehouse.getWarehouseId());
+            wmItemRecptLine.setWarehouseCode(warehouse.getWarehouseCode());
+            wmItemRecptLine.setWarehouseName(warehouse.getWarehouseName());
         }
+
         if(StringUtils.isNotNull(wmItemRecptLine.getLocationId())){
             WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmItemRecptLine.getLocationId());
             wmItemRecptLine.setLocationCode(location.getLocationCode());
             wmItemRecptLine.setLocationName(location.getLocationName());
+        } else if(StringUtils.isNotNull(wmItemRecptLine.getLocationCode())){
+            WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmItemRecptLine.getLocationCode());
+            wmItemRecptLine.setLocationId(location.getLocationId());
+            wmItemRecptLine.setLocationCode(location.getLocationCode());
+            wmItemRecptLine.setLocationName(location.getLocationName());
         }
+
         if(StringUtils.isNotNull(wmItemRecptLine.getAreaId())){
             WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmItemRecptLine.getAreaId());
             wmItemRecptLine.setAreaCode(area.getAreaCode());
             wmItemRecptLine.setAreaName(area.getAreaName());
+        } else if(StringUtils.isNotNull(wmItemRecptLine.getAreaCode())){
+            WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmItemRecptLine.getAreaCode());
+            wmItemRecptLine.setAreaId(area.getAreaId());
+            wmItemRecptLine.setAreaCode(area.getAreaCode());
+            wmItemRecptLine.setAreaName(area.getAreaName());
         }
         wmItemRecptLine.setCreateBy(getUsername());
-        return toAjax(wmItemRecptLineService.insertWmItemRecptLine(wmItemRecptLine));
+        wmItemRecptLineService.insertWmItemRecptLine(wmItemRecptLine);
+        return AjaxResult.success(wmItemRecptLine);
     }
 
     /**
@@ -105,20 +123,38 @@ public class WmItemRecptLineMobController extends BaseController {
             WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmItemRecptLine.getWarehouseId());
             wmItemRecptLine.setWarehouseCode(warehouse.getWarehouseCode());
             wmItemRecptLine.setWarehouseName(warehouse.getWarehouseName());
+        }else if(StringUtils.isNotNull(wmItemRecptLine.getWarehouseCode())){
+            WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(wmItemRecptLine.getWarehouseCode());
+            wmItemRecptLine.setWarehouseId(warehouse.getWarehouseId());
+            wmItemRecptLine.setWarehouseCode(warehouse.getWarehouseCode());
+            wmItemRecptLine.setWarehouseName(warehouse.getWarehouseName());
         }
+
         if(StringUtils.isNotNull(wmItemRecptLine.getLocationId())){
             WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmItemRecptLine.getLocationId());
             wmItemRecptLine.setLocationCode(location.getLocationCode());
             wmItemRecptLine.setLocationName(location.getLocationName());
+        } else if(StringUtils.isNotNull(wmItemRecptLine.getLocationCode())){
+            WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationCode(wmItemRecptLine.getLocationCode());
+            wmItemRecptLine.setLocationId(location.getLocationId());
+            wmItemRecptLine.setLocationCode(location.getLocationCode());
+            wmItemRecptLine.setLocationName(location.getLocationName());
         }
+
         if(StringUtils.isNotNull(wmItemRecptLine.getAreaId())){
             WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmItemRecptLine.getAreaId());
             wmItemRecptLine.setAreaCode(area.getAreaCode());
             wmItemRecptLine.setAreaName(area.getAreaName());
+        } else if(StringUtils.isNotNull(wmItemRecptLine.getAreaCode())){
+            WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaCode(wmItemRecptLine.getAreaCode());
+            wmItemRecptLine.setAreaId(area.getAreaId());
+            wmItemRecptLine.setAreaCode(area.getAreaCode());
+            wmItemRecptLine.setAreaName(area.getAreaName());
         }
         return toAjax(wmItemRecptLineService.updateWmItemRecptLine(wmItemRecptLine));
     }
 
+
     /**
      * 删除物料入库单行
      */
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java
index 25211ad..827e1f4 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmItemRecptMobController.java
@@ -113,6 +113,18 @@ public class WmItemRecptMobController extends BaseController {
         return toAjax(wmItemRecptService.updateWmItemRecpt(wmItemRecpt));
     }
 
+    /**
+     * 获取物料入库单详细信息
+     */
+    @ApiOperation("获取物料入库单详细信息接口")
+    @PreAuthorize("@ss.hasPermi('mes:wm:itemrecpt:query')")
+    @GetMapping(value = "/{recptId}")
+    public AjaxResult getInfo(@PathVariable("recptId") Long recptId)
+    {
+        return AjaxResult.success(wmItemRecptService.selectWmItemRecptByRecptId(recptId));
+    }
+
+
     /**
      * 删除物料入库单
      */
diff --git a/ktg-system/src/main/resources/mapper/system/UserTaskMapper.xml b/ktg-system/src/main/resources/mapper/system/UserTaskMapper.xml
index 80dd860..b48f241 100644
--- a/ktg-system/src/main/resources/mapper/system/UserTaskMapper.xml
+++ b/ktg-system/src/main/resources/mapper/system/UserTaskMapper.xml
@@ -17,7 +17,7 @@
     </resultMap>
 
     <select id="listTodoList" parameterType="String" resultMap="UserTaskResult">
-        select task_type,task_code,task_name,t.`status`,su.nick_name as create_by,su.create_time
+        select task_type,task_id,task_code,task_name,t.`status`,su.nick_name as create_by,t.create_time
         from (
                  select 'ITEMRECPT' as task_type, recpt_id as task_id,recpt_code as task_code,recpt_name  as task_name,`status`,create_by,create_time,update_by,update_time
                  from wm_item_recpt wir
@@ -76,7 +76,7 @@
     </select>
 
     <select id="listFinishedList" parameterType="String" resultMap="UserTaskResult">
-        select task_type,task_code,task_name,t.`status`,su.nick_name as create_by,su.create_time
+        select task_type,task_id,task_code,task_name,t.`status`,su.nick_name as create_by,t.create_time
         from (
                  select 'ITEMRECPT' as task_type, recpt_id as task_id,recpt_code as task_code,recpt_name  as task_name,`status`,create_by,create_time,update_by,update_time
                  from wm_item_recpt wir
@@ -130,7 +130,7 @@
              ) t
              left join sys_user su
                  on t.create_by = su.user_name
-        order by create_time, task_type desc
+        order by create_time desc, task_type asc
     </select>
 
 </mapper>
\ No newline at end of file