diff --git a/.gitignore b/.gitignore
index 5a1639f..d1b3d36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ lms/nladmin-system/nlsso-server/target/
 lms/nladmin-system/.idea/
 acs/nladmin-system/.idea/
 acs/nladmin-system/nlsso-server/target/
+acs/.idea/
+lms/.idea/
+lms/nladmin-system/nlsso-server/nlsso-server.iml
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java
index 6a3e914..2321e49 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/WuliaoDto.java
@@ -6,6 +6,7 @@ import lombok.Data;
 public class WuliaoDto {
     String productDescription;
     String supplierName;
+    String ingotBatch;
     Double count1;
     Double count2;
     Double count3;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
index 82e3238..078fe6f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.xml
@@ -56,6 +56,8 @@
                 WHERE
                     m.PalletSN = p.vehicle_code2
                   AND (p.region_code='YL' or p.region_code='YLHC')
+                  AND p.vehicle_code2 != ''
+				  AND p.vehicle_code2 IS NOT NULL
             ) a
         GROUP BY
             PalletSN;
@@ -95,7 +97,7 @@
                 FROM
                     sch_base_point
                 WHERE
-                    region_code IN ( 'YL','YLHC', 'HW', 'HWK' )
+                    region_code IN ( 'YL','YLHC' )
             ) a,
             (
                 SELECT
@@ -128,19 +130,22 @@
         SELECT
             supplierName,
             productDescription,
+            ingotBatch,
             count(*) AS count1,
-            COUNT(DISTINCT p.vehicle_code2) AS count2,
+            COUNT( DISTINCT p.vehicle_code2 ) AS count2,
             sum( incomingWeight ) AS count3,
             sum( incomingLength ) AS count4
         FROM
             sch_base_material m
-                LEFT JOIN sch_base_point p ON p.vehicle_code2 = m.PalletSN
+            INNER JOIN sch_base_point p ON p.vehicle_code2 = m.PalletSN
         WHERE
             p.region_code LIKE '%YL%'
-          AND p.vehicle_code2 != ''
-	AND p.vehicle_code2 IS NOT NULL
+            AND p.point_code LIKE 'HJ%'
+            AND p.vehicle_code2 != ''
+            AND p.vehicle_code2 IS NOT NULL
         GROUP BY
             supplierName,
+            ingotBatch,
             productDescription
     </select>
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
index 234fa87..82e3964 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
@@ -46,16 +46,22 @@ public class BoardServiceImpl implements BoardService {
     }
 
     public JSONObject rk() {
-        KcDto kcDto = boardMapper.kc();
+        //库存情况
+        /*KcDto kcDto = boardMapper.kc();
+        kcDto.setList(boardMapper.wuliao());*/
+        KcDto kcDto = new KcDto();
         kcDto.setList(boardMapper.wuliao());
+        //货位占用
         HwDto hwDto = boardMapper.hw();
+        //库内物料
         List<WlDto> knList = boardMapper.kn();
-        List<WlDto> wrkList = boardMapper.wrk();
+        //未入库物料
+        //List<WlDto> wrkList = boardMapper.wrk();
         RkDto rkDto = new RkDto();
         rkDto.setKc(kcDto);
         rkDto.setHw(hwDto);
         rkDto.setKn(knList);
-        rkDto.setWrk(wrkList);
+        //rkDto.setWrk(wrkList);
         return JSONObject.parseObject(JSON.toJSONString(rkDto, SerializerFeature.WriteNullStringAsEmpty));
     }
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java
index 943e8fb..b546037 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java
@@ -70,13 +70,4 @@ public class AcsToWmsController {
     public ResponseEntity<Object> notify(@RequestBody JSONObject param) {
         return new ResponseEntity<>(acsToWmsService.notify(param), HttpStatus.OK);
     }
-
-//    @PostMapping("/notify")
-//    @Log("acs通知wms")
-//    @ApiOperation("acs通知wms")
-//    //@SaCheckPermission("@el.check('schBaseTask:add')")
-//    @SaIgnore
-//    public ResponseEntity<Object> notify(@RequestBody JSONObject param) {
-//        return new ResponseEntity<>(acsToWmsService.notify(param), HttpStatus.OK);
-//    }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/AcsToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/AcsToWmsService.java
index cc74c00..26caca7 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/AcsToWmsService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/AcsToWmsService.java
@@ -12,6 +12,9 @@ public interface AcsToWmsService {
     /** ACS请求接口 */
     BaseResponse acsApply(JSONObject param);
 
+    /** 手持请求接口 */
+    BaseResponse pdaApply(JSONObject param);
+
     /** 任务反馈 */
     BaseResponse status(JSONObject param);
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
index 996788c..3cbe373 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
@@ -11,6 +11,7 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.RedisUtils;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.system.service.logicflow.dao.Stage;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.system.service.param.ISysParamService;
@@ -27,6 +28,7 @@ import org.nl.wms.sch.point.service.impl.SchBasePointServiceImpl;
 import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task.service.dao.SchBaseTask;
 import org.nl.wms.sch.task_manage.AbstractTask;
+import org.nl.wms.sch.task_manage.GeneralDefinition;
 import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
 import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
 import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
@@ -93,18 +95,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @SneakyThrows
     public BaseResponse acsApply(JSONObject param) {
         String requestNo = param.getString("requestNo");
-        String requestMethodCode = param.getString("request_medthod_code"); // 获取请求方法名
-        String requestMethodName = param.getString("request_medthod_name");
         BaseResponse result = BaseResponse.build(requestNo);
-        String device_code = param.getString("device_code");
-        param.put("config_code",requestMethodCode);
+        param.put("user_id", GeneralDefinition.ACS_ID);
+        param.put("person_name",GeneralDefinition.ACS_NAME);
+        param.put("create_mode","2");
         try {
-            if(ObjectUtil.isEmpty(requestMethodCode)){
-                throw new BadRequestException("任务类型不正确!requestMethodCode："+requestMethodName+",device_code："+device_code);
-            }
-            AbstractTask task = taskFactory.getTask(requestMethodCode);
-            // 执行创建任务
-            task.apply(param);
+            result = this.apply(param);
         } catch (Exception e) {
             String message =  e.getMessage();
             log.error("ACS请求LMS出现错误: {}{}", e,e.getMessage());
@@ -112,12 +108,60 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             result.setMessage(message);
             result.setRequestNo(requestNo);
             // 消息通知
-            noticeService.createNotice("异常信息：" + message, "acsApply: " + param.getString("request_medthod_code"),
+            noticeService.createNotice("异常信息：" + message, "请求信息: " + param.getString("request_medthod_code"),
                     NoticeTypeEnum.EXCEPTION.getCode());
         }
          return result;
     }
 
+    @Override
+    @SneakyThrows
+    public BaseResponse pdaApply(JSONObject param){
+        String requestNo = param.getString("requestNo");
+        BaseResponse result = BaseResponse.build(requestNo);
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        if(ObjectUtil.isEmpty(param.getString("user_id"))){
+            param.put("user_id",currentUserId);
+            param.put("person_name",nickName);
+        }
+        param.put("create_mode","3");
+        try {
+            result = this.apply(param);
+        } catch (Exception e) {
+            String message =  e.getMessage();
+            log.error("请求LMS出现错误: {}{}", e,e.getMessage());
+            result.setCode(HttpStatus.HTTP_BAD_REQUEST);
+            result.setMessage(message);
+            result.setRequestNo(requestNo);
+            // 消息通知
+            noticeService.createNotice("异常信息：" + message, "请求信息: " + param.getString("request_medthod_code"),
+                    NoticeTypeEnum.EXCEPTION.getCode());
+        }
+        return result;
+    }
+
+    @SneakyThrows
+    public BaseResponse apply(JSONObject param){
+        String requestNo = param.getString("requestNo");
+        BaseResponse result = BaseResponse.build(requestNo);
+        String requestMethodCode = param.getString("request_medthod_code");
+        String requestMethodName = param.getString("request_medthod_name");
+        String device_code = param.getString("device_code");
+        //设置任务类型
+        param.put("config_code",requestMethodCode);
+        AbstractTask task = taskFactory.getTask(requestMethodCode);
+        if(ObjectUtil.isEmpty(requestMethodCode)){
+            throw new BadRequestException("任务类型不能为空!requestMethodCode："+requestMethodName+",device_code："+device_code);
+        }
+        if(ObjectUtil.isNull(task)){
+            throw new BadRequestException("任务类型不正确!requestMethodCode："+requestMethodName+",device_code："+device_code);
+        }
+        // 执行创建任务
+        task.apply(param);
+        return result;
+    }
+
     /**
      * 任务反馈
      */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java
index bc3c8d0..9ccf3c3 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java
@@ -18,12 +18,10 @@ import org.nl.wms.sch.material.service.dao.Material;
 import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper;
 import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
 import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper;
-import org.nl.wms.sch.workorder.controller.service.IWorkorderService;
-import org.nl.wms.sch.workorder.controller.service.dao.Workorder;
+import org.nl.wms.sch.workorder.service.IWorkorderService;
+import org.nl.wms.sch.workorder.service.dao.Workorder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
index 454d237..c6bacb9 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
@@ -57,7 +57,6 @@ public class PdaServiceImpl implements PdaService {
 
     @Override
     public PdaResponseVo dwzt(JSONObject param) {
-//        acsToWmsService.notify(param);
         return PdaResponseVo.pdaResultOk("回温状态查询成功");
     }
 
@@ -66,7 +65,7 @@ public class PdaServiceImpl implements PdaService {
         param.put("request_medthod_code", "YCLRKTask");
         param.put("request_medthod_name", "原材料入库");
         param.put("device_code",param.getString("start_point"));
-        BaseResponse baseResponse=acsToWmsService.acsApply(param);
+        BaseResponse baseResponse=acsToWmsService.pdaApply(param);
         return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
     }
     @Override
@@ -74,7 +73,7 @@ public class PdaServiceImpl implements PdaService {
         param.put("request_medthod_code", "YCLCKTask");
         param.put("request_medthod_name", "原材料出库");
         param.put("device_code",param.getString("start_point"));
-        BaseResponse baseResponse=acsToWmsService.acsApply(param);
+        BaseResponse baseResponse=acsToWmsService.pdaApply(param);
         return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
     }
 
@@ -83,7 +82,7 @@ public class PdaServiceImpl implements PdaService {
         param.put("request_medthod_code", "POINTTask");
         param.put("request_medthod_name", "点对点任务");
         param.put("device_code",param.getString("start_point"));
-        BaseResponse baseResponse=acsToWmsService.acsApply(param);
+        BaseResponse baseResponse=acsToWmsService.pdaApply(param);
         return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
     }
 
@@ -150,7 +149,7 @@ public class PdaServiceImpl implements PdaService {
         param.put("device_code","FBC01");
         param.put("start_point","FBC01");
         param.put("next_point","DKT01");
-        BaseResponse baseResponse=acsToWmsService.acsApply(param);
+        BaseResponse baseResponse=acsToWmsService.pdaApply(param);
         return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
     }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java
index a49d528..efcc3be 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java
@@ -54,5 +54,4 @@ public class PointDetailController {
         }
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java
index 36a9310..f535769 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java
@@ -10,4 +10,5 @@ public class PointDetailAdd {
     private String mode;
     private String time;
     private String workorder_code;
+    private String status;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
index 0677b4f..75ae41e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
@@ -107,6 +107,14 @@ public class SchBasePointController {
         return new ResponseEntity<>(schBasePointService.getPointList(region),HttpStatus.OK);
     }
 
+    @PostMapping("/getPointsByRegionCodes")
+    @Log("获取区域下拉框")
+    @ApiOperation("获取区域下拉框")
+    //@SaCheckPermission("@el.check('schBaseRegion:list')")
+    public ResponseEntity<Object> getPointsByRegionCodes(@RequestBody(required = false) String RegionCodes){
+        return new ResponseEntity<>(schBasePointService.getPointsByRegionCodes(RegionCodes),HttpStatus.OK);
+    }
+
     @PostMapping("/outbound")
     @Log("原材料异常出库")
     @ApiOperation("原材料异常出库")
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
index 0da87d9..a90575b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
@@ -56,6 +56,13 @@ public interface ISchBasePointService extends IService<SchBasePoint> {
      */
     List<SchBasePoint> getPointList(SchBasePoint region);
 
+    /**
+     * 获取点位
+     * @param RegionCodes
+     * @return
+     */
+    List<SchBasePoint> getPointsByRegionCodes(String RegionCodes);
+
     /**
      * 更改固化室点位状态
      * @param jsonObject
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java
index 2e0fe47..edd6aca 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java
@@ -1,6 +1,8 @@
 package org.nl.wms.sch.point.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
 
 import java.util.List;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
index 52b2366..d6b5fdd 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
@@ -24,10 +24,7 @@ import org.nl.wms.util.PointUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -192,6 +189,18 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
                 .eq(SchBasePoint::getIs_has_workder, 1));
     }
 
+    @Override
+    public List<SchBasePoint> getPointsByRegionCodes(String RegionCodes) {
+        Set<String> regions = new HashSet<>();
+        String[] split = RegionCodes.split(",");
+        regions.addAll(Arrays.asList(split));
+        return pointMapper.selectList(new LambdaQueryWrapper<SchBasePoint>()
+                .in(ObjectUtil.isNotEmpty(RegionCodes),SchBasePoint::getRegion_code,regions)
+                .eq(SchBasePoint::getIs_has_workder, 1)
+                .orderByAsc(SchBasePoint::getPoint_code)
+        );
+    }
+
     @Override
     public void updateStatus(JSONObject jsonObject) {
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java
index 5c40a0b..60f8982 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java
@@ -41,6 +41,14 @@ public class ReportController {
         return new ResponseEntity<>(TableDataInfo.build(reportService.queryYlDetail(whereJson,page)),HttpStatus.OK);
     }
 
+    @GetMapping("/yl/outdetail")
+    @Log("原料库工单库存明细")
+    @ApiOperation("原料库工单库存明细")
+    //@SaCheckPermission("@el.check('material:list')")
+    public ResponseEntity<Object> queryYlOutDetail(ReportQuery whereJson, PageQuery page){
+        return new ResponseEntity<>(TableDataInfo.build(reportService.queryYlOutDetail(whereJson,page)),HttpStatus.OK);
+    }
+
     @GetMapping("/yl/in")
     @Log("原材入库明细")
     @ApiOperation("原材入库明细")
@@ -74,6 +82,13 @@ public class ReportController {
         return new ResponseEntity<>(TableDataInfo.build(reportService.queryHwIn(whereJson,page)),HttpStatus.OK);
     }
 
+    @GetMapping("/hw/inpending")
+    @Log("回温间待入库明细")
+    @ApiOperation("回温间待入库明细")
+    public ResponseEntity<Object> queryHwInPending(ReportQuery whereJson, PageQuery page){
+        return new ResponseEntity<>(TableDataInfo.build(reportService.queryHwInPending(whereJson,page)),HttpStatus.OK);
+    }
+
     @GetMapping("/hw/out")
     @Log("回温间出库存明细")
     @ApiOperation("回温间出库明细")
@@ -82,6 +97,14 @@ public class ReportController {
         return new ResponseEntity<>(TableDataInfo.build(reportService.queryHwOut(whereJson,page)),HttpStatus.OK);
     }
 
+    @GetMapping("/hw/outpending")
+    @Log("回温间待出库存明细")
+    @ApiOperation("回温间待出库明细")
+    //@SaCheckPermission("@el.check('material:list')")
+    public ResponseEntity<Object> queryHwOutPending(ReportQuery whereJson, PageQuery page){
+        return new ResponseEntity<>(TableDataInfo.build(reportService.queryHwOutPending(whereJson,page)),HttpStatus.OK);
+    }
+
     @SneakyThrows
     @GetMapping("/yl/detail/download")
     @Log("查询详情导出")
@@ -127,15 +150,30 @@ public class ReportController {
         reportService.queryHwInDownload(whereJson,page,response);
     }
 
+    @SneakyThrows
+    @GetMapping("/hw/inpending/download")
+    @Log("待入库明细导出")
+    @ApiOperation("查询详情导出")
+    public void queryHwInPendingDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
+        reportService.queryHwInPendingDownload(whereJson,page,response);
+    }
+
     @SneakyThrows
     @GetMapping("/hw/out/download")
     @Log("查询详情导出")
     @ApiOperation("查询详情导出")
-    //@SaCheckPermission("@el.check('material:list')")
     public void queryHwOutDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
         reportService.queryHwOutDownload(whereJson,page,response);
     }
 
+    @SneakyThrows
+    @GetMapping("/hw/outpending/download")
+    @Log("查询详情导出")
+    @ApiOperation("查询详情导出")
+    public void queryHwOutPendingDownload(ReportQuery whereJson, PageQuery page, HttpServletResponse response){
+        reportService.queryHwOutPendingDownload(whereJson,page,response);
+    }
+
     @GetMapping("/getSupplierNameList")
     @Log("查询供应商名称列表")
     @ApiOperation("查询供应商名称列表")
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java
index d05250a..d624286 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java
@@ -3,10 +3,7 @@ package org.nl.wms.sch.report.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.sch.report.service.dto.HwDto;
-import org.nl.wms.sch.report.service.dto.ReportDto;
-import org.nl.wms.sch.report.service.dto.ReportQuery;
-import org.nl.wms.sch.report.service.dto.YlDto;
+import org.nl.wms.sch.report.service.dto.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -27,10 +24,22 @@ public interface IReportService extends IService<ReportDto> {
 
     IPage<HwDto> queryHwIn(ReportQuery whereJson, PageQuery pageable);
 
+    IPage<HwDto> queryHwInPending(ReportQuery whereJson, PageQuery pageable);
+
     IPage<HwDto> queryHwOut(ReportQuery whereJson, PageQuery pageable);
 
+    IPage<HwDto> queryHwOutPending(ReportQuery whereJson, PageQuery pageable);
+
     IPage<YlDto> queryYlDetail(ReportQuery whereJson, PageQuery pageable);
 
+    /**
+     * 查询工单库存
+     * @param whereJson
+     * @param pageable
+     * @return
+     */
+    IPage<YCLKCDto> queryYlOutDetail(ReportQuery whereJson, PageQuery pageable);
+
     IPage<YlDto> queryYlIn(ReportQuery whereJson, PageQuery pageable);
 
     IPage<YlDto> queryYlOut(ReportQuery whereJson, PageQuery pageable);
@@ -42,9 +51,15 @@ public interface IReportService extends IService<ReportDto> {
     void queryYlOutDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
 
     void queryHwDetailDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
+
     void queryHwInDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
+
+    void queryHwInPendingDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
+
     void queryHwOutDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
 
+    void queryHwOutPendingDownload(ReportQuery whereJson, PageQuery pageable, HttpServletResponse response) throws IOException;
+
     List<String> getSupplierNameList();
 
     List<String> getProductDescriptionList();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java
index e76701d..9bb44d4 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java
@@ -3,10 +3,7 @@ package org.nl.wms.sch.report.service.dao.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Select;
-import org.nl.wms.sch.report.service.dto.HwDto;
-import org.nl.wms.sch.report.service.dto.ReportDto;
-import org.nl.wms.sch.report.service.dto.ReportQuery;
-import org.nl.wms.sch.report.service.dto.YlDto;
+import org.nl.wms.sch.report.service.dto.*;
 
 import java.util.List;
 
@@ -28,6 +25,8 @@ public interface ReportMapper extends BaseMapper<ReportDto> {
      */
     IPage<YlDto> queryYlDetail(IPage<YlDto> pages, ReportQuery query);
 
+    IPage<YCLKCDto> queryYlOutDetail(IPage<YCLKCDto> pages, ReportQuery query);
+
     IPage<YlDto> queryYlIn(IPage<YlDto> pages, ReportQuery query);
 
     IPage<YlDto> queryYlOut(IPage<YlDto> pages, ReportQuery query);
@@ -36,8 +35,12 @@ public interface ReportMapper extends BaseMapper<ReportDto> {
 
     IPage<HwDto> queryHwIn(IPage<HwDto> pages, ReportQuery query);
 
+    IPage<HwDto> queryHwInPending(IPage<HwDto> pages, ReportQuery query);
+
     IPage<HwDto> queryHwOut(IPage<HwDto> pages, ReportQuery query);
 
+    IPage<HwDto> queryHwOutPending(IPage<HwDto> pages, ReportQuery query);
+
     @Select("select supplierName from sch_base_material group by supplierName")
     List<String> getSupplierNameList();
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
index 0a413d1..1cc2bc2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
@@ -75,6 +75,78 @@
         ORDER BY point_code ASC
     </select>
 
+    <select id="queryYlOutDetail" resultType="org.nl.wms.sch.report.service.dto.YCLKCDto">
+        SELECT
+        p.point_code AS pointCode,
+        p.region_name AS regionName,
+        p.vehicle_code2 AS subTray,
+        p.vehicle_code AS motherTray,
+        ANY_VALUE (t.somtOrderNo) AS somtOrderNo,
+        ANY_VALUE (t.moname) AS moname,
+        ANY_VALUE (t.status) AS status,
+        ANY_VALUE (t.mode) AS mode,
+        p.update_time AS updateTime,
+        ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
+        ANY_VALUE ( m2.productDescription ) AS productDescription,
+        ANY_VALUE ( m2.supplierName ) AS supplierName,
+        ANY_VALUE ( m2.ingotBatch ) AS ingotBatch,
+        ANY_VALUE ( m2.number ) AS number
+        FROM
+        pdm_bd_workorder_two t
+        LEFT JOIN sch_base_point p ON t.palletSN = p.vehicle_code2
+        LEFT JOIN (
+        SELECT
+        m.PalletSN AS PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch,
+        count( * ) AS number
+        FROM
+        sch_base_material m
+        WHERE
+        1 = 1
+        <if test="query.lotSN  != null">
+            and m.lotSN like  CONCAT('%', #{query.lotSN}, '%')
+        </if>
+        GROUP BY
+        m.PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch
+        ) m2 ON t.palletSN = m2.PalletSN
+        WHERE
+        p.vehicle_code2 != ''
+        AND p.vehicle_code2 IS NOT NULL
+        AND t.STATUS IN ( '0','1')
+        AND p.region_code IN ( 'YL','YLHC','KJHC' )
+        <if test="query.supplierName  != null">
+            and m2.supplierName like CONCAT('%', #{query.supplierName}, '%')
+        </if>
+        <if test="query.productDescription  != null">
+            and m2.productDescription like  CONCAT('%', #{query.productDescription}, '%')
+        </if>
+        <if test="query.point_code  != null">
+            and p.point_code like  CONCAT('%', #{query.point_code}, '%')
+        </if>
+        <if test="query.region_code  != null">
+            and p.region_code like  CONCAT('%', #{query.region_code}, '%')
+        </if>
+        <if test="query.ingotBatch  != null">
+            and m2.ingotBatch like  CONCAT('%', #{query.ingotBatch}, '%')
+        </if>
+        <if test="query.number  != null">
+            and m2.number =  #{query.number}
+        </if>
+        <if test="query.status  != null">
+            and t.status =  #{query.status}
+        </if>
+        GROUP BY
+        pointCode
+        ORDER BY point_code ASC
+    </select>
+
     <select id="queryYlIn" resultType="org.nl.wms.sch.report.service.dto.YlDto">
         SELECT
         m.lotSN,
@@ -160,9 +232,6 @@
     </select>
 
     <select id="queryHwDetail" resultType="org.nl.wms.sch.report.service.dto.HwDto">
-        SELECT a.*,( SELECT count( * ) FROM sch_base_material m2 WHERE m2.PalletSN = a.subTray ) as number
-        FROM
-        (
         SELECT
         p.point_code AS pointCode,
         p.point_name AS pointName,
@@ -172,26 +241,50 @@
         p.vehicle_code AS motherTray,
         p.update_time AS updateTime,
         ANY_VALUE ( v.standing_time ) AS standingTime,
-        ANY_VALUE ( m.siliconGrade ) AS siliconGrade,
-        ANY_VALUE ( m.productDescription ) AS productDescription,
-        ANY_VALUE ( m.supplierName ) AS supplierName,
-        ANY_VALUE ( m.ingotBatch ) AS ingotBatch,
+        ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
+        ANY_VALUE ( m2.productDescription ) AS productDescription,
+        ANY_VALUE ( m2.supplierName ) AS supplierName,
+        ANY_VALUE ( m2.ingotBatch ) AS ingotBatch,
+        ANY_VALUE ( m2.number ) AS number,
         TIMESTAMPDIFF(
         HOUR,
         p.update_time,
         curtime()) AS usedTime
         FROM
         sch_base_point p
-        LEFT JOIN sch_base_material m ON p.vehicle_code2 = m.PalletSN
         LEFT JOIN sch_base_vehiclematerialgroup v ON p.point_code = v.point_code
+        LEFT JOIN (
+        SELECT
+        m.PalletSN AS PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch,
+        count( * ) AS number
+        FROM
+        sch_base_material m
         WHERE
-        vehicle_code2 != ''
-        AND vehicle_code2 IS NOT NULL
+        1 = 1
+        <if test="query.lotSN  != null">
+            and m.lotSN like  CONCAT('%', #{query.lotSN}, '%')
+        </if>
+        GROUP BY
+        m.PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch
+        ) m2 ON p.vehicle_code2 = m2.PalletSN
+        WHERE
+        p.vehicle_code2 != ''
+        AND p.vehicle_code2 IS NOT NULL
+        AND p.point_code LIKE 'XHW%'
+        AND v.group_bind_material_status = '2'
         <if test="query.supplierName  != null">
-            and m.supplierName like CONCAT('%', #{query.supplierName}, '%')
+            and m2.supplierName like CONCAT('%', #{query.supplierName}, '%')
         </if>
         <if test="query.productDescription  != null">
-            and m.productDescription like  CONCAT('%', #{query.productDescription}, '%')
+            and m2.productDescription like  CONCAT('%', #{query.productDescription}, '%')
         </if>
         <if test="query.point_code  != null">
             and p.point_code like  CONCAT('%', #{query.point_code}, '%')
@@ -199,52 +292,68 @@
         <if test="query.region_code  != null">
             and p.region_code like  CONCAT('%', #{query.region_code}, '%')
         </if>
-        <if test="query.lotSN  != null">
-            and m.lotSN like  CONCAT('%', #{query.lotSN}, '%')
-        </if>
         <if test="query.ingotBatch  != null">
-            and m.ingotBatch like  CONCAT('%', #{query.ingotBatch}, '%')
+            and m2.ingotBatch like  CONCAT('%', #{query.ingotBatch}, '%')
+        </if>
+        <if test="query.number  != null">
+            and m2.number =  #{query.number}
         </if>
         GROUP BY
         pointCode
         ORDER BY pointCode ASC
-        ) a
     </select>
 
     <select id="queryHwIn" resultType="org.nl.wms.sch.report.service.dto.HwDto">
-        SELECT a.*,( SELECT count( * ) FROM sch_base_material m2 WHERE m2.PalletSN = a.subTray ) as number
-        FROM
-        (
         SELECT
         p.point_code AS pointCode,
-        p.point_name AS pointName,
-        p.region_code AS regionCode,
         p.region_name AS regionName,
         p.vehicle_code2 AS subTray,
         p.vehicle_code AS motherTray,
         p.update_time AS updateTime,
-        ANY_VALUE ( v.standing_time ) AS standingTime,
-        ANY_VALUE ( m.siliconGrade ) AS siliconGrade,
-        ANY_VALUE ( m.productDescription ) AS productDescription,
-        ANY_VALUE ( m.supplierName ) AS supplierName,
-        ANY_VALUE ( m.ingotBatch ) AS ingotBatch,
+        ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
+        ANY_VALUE ( m2.productDescription ) AS productDescription,
+        ANY_VALUE ( m2.supplierName ) AS supplierName,
+        ANY_VALUE ( m2.ingotBatch ) AS ingotBatch,
+        ANY_VALUE ( m2.number ) AS number,
         TIMESTAMPDIFF(
         HOUR,
         p.update_time,
         curtime()) AS usedTime
         FROM
         sch_base_task t
-        LEFT JOIN sch_base_point p on t.point_code2=p.point_code and t.point_code2 like 'XHW%'
-        LEFT JOIN sch_base_material m ON p.vehicle_code2 = m.PalletSN
-        LEFT JOIN sch_base_vehiclematerialgroup v ON p.point_code = v.point_code
+        LEFT JOIN sch_base_point p ON t.point_code2 = p.point_code
+        LEFT JOIN (
+        SELECT
+        m.PalletSN AS PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch,
+        count( * ) AS number
+        FROM
+        sch_base_material m
+        WHERE
+        1 = 1
+        <if test="query.lotSN  != null">
+            and m.lotSN like  CONCAT('%', #{query.lotSN}, '%')
+        </if>
+        GROUP BY
+        m.PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch
+        ) m2 ON t.vehicle_code2 = m2.PalletSN
         WHERE
         p.vehicle_code2 != ''
         AND p.vehicle_code2 IS NOT NULL
+        AND t.point_code2 LIKE 'XHW%'
+        AND t.task_status in ('5')
         <if test="query.supplierName  != null">
-            and m.supplierName like CONCAT('%', #{query.supplierName}, '%')
+            and m2.supplierName like CONCAT('%', #{query.supplierName}, '%')
         </if>
         <if test="query.productDescription  != null">
-            and m.productDescription like  CONCAT('%', #{query.productDescription}, '%')
+            and m2.productDescription like  CONCAT('%', #{query.productDescription}, '%')
         </if>
         <if test="query.point_code  != null">
             and p.point_code like  CONCAT('%', #{query.point_code}, '%')
@@ -252,52 +361,139 @@
         <if test="query.region_code  != null">
             and p.region_code like  CONCAT('%', #{query.region_code}, '%')
         </if>
-        <if test="query.lotSN  != null">
-            and m.lotSN like  CONCAT('%', #{query.lotSN}, '%')
-        </if>
         <if test="query.ingotBatch  != null">
-            and m.ingotBatch like  CONCAT('%', #{query.ingotBatch}, '%')
+            and m2.ingotBatch like  CONCAT('%', #{query.ingotBatch}, '%')
+        </if>
+        <if test="query.number  != null">
+            and m2.number =  #{query.number}
+        </if>
+        GROUP BY
+        pointCode
+        ORDER BY p.update_time DESC, pointCode ASC
+    </select>
+
+    <select id="queryHwInPending" resultType="org.nl.wms.sch.report.service.dto.HwDto">
+        SELECT
+        p.point_code AS pointCode,
+        p.region_name AS regionName,
+        p.vehicle_code2 AS subTray,
+        p.vehicle_code AS motherTray,
+        p.update_time AS updateTime,
+        ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
+        ANY_VALUE ( m2.productDescription ) AS productDescription,
+        ANY_VALUE ( m2.supplierName ) AS supplierName,
+        ANY_VALUE ( m2.ingotBatch ) AS ingotBatch,
+        ANY_VALUE ( m2.number ) AS number
+        FROM
+        pdm_bd_workorder_two t
+        LEFT JOIN sch_base_point p ON t.palletSN = p.vehicle_code2
+        LEFT JOIN (
+        SELECT
+        m.PalletSN AS PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch,
+        count( * ) AS number
+        FROM
+        sch_base_material m
+        WHERE
+        1 = 1
+        <if test="query.lotSN  != null">
+            and m.lotSN like  CONCAT('%', #{query.lotSN}, '%')
+        </if>
+        GROUP BY
+        m.PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch
+        ) m2 ON t.palletSN = m2.PalletSN
+        WHERE
+        p.vehicle_code2 != ''
+        AND p.vehicle_code2 IS NOT NULL
+        AND t.STATUS IN ( '0','1','2' )
+        AND p.region_code IN ( 'YL','YLHC','KJHC' )
+        <if test="query.point_code  != null">
+            and p.point_code like  CONCAT('%', #{query.point_code}, '%')
+        </if>
+        <if test="query.lotSN  != null">
+            and m2.lotSN like  CONCAT('%', #{query.lotSN}, '%')
+        </if>
+        <if test="query.supplierName  != null">
+            and m2.supplierName like CONCAT('%', #{query.supplierName}, '%')
+        </if>
+        <if test="query.productDescription  != null">
+            and m2.productDescription like  CONCAT('%', #{query.productDescription}, '%')
+        </if>
+        <if test="query.ingotBatch  != null">
+            and m2.ingotBatch like  CONCAT('%', #{query.ingotBatch}, '%')
+        </if>
+        <if test="query.number  != null">
+            and m2.number =  #{query.number}
         </if>
         GROUP BY
         pointCode
         ORDER BY p.update_time DESC, pointCode ASC
-        ) a
     </select>
 
     <select id="queryHwOut" resultType="org.nl.wms.sch.report.service.dto.HwDto">
-        SELECT a.*,( SELECT count( * ) FROM sch_base_material m2 WHERE m2.PalletSN = a.subTray ) as number
-        FROM
-        (
         SELECT
         p.point_code AS pointCode,
-        p.point_name AS pointName,
-        p.region_code AS regionCode,
         p.region_name AS regionName,
-        p.vehicle_code2 AS subTray,
-        p.vehicle_code AS motherTray,
+        ANY_VALUE ( p2.point_code ) AS pointCode2,
+        ANY_VALUE ( p2.region_name ) AS regionName2,
+        ANY_VALUE ( t.vehicle_code2 ) AS subTray,
+        ANY_VALUE ( t.vehicle_code ) AS motherTray,
         p.update_time AS updateTime,
         ANY_VALUE ( v.standing_time ) AS standingTime,
-        ANY_VALUE ( m.siliconGrade ) AS siliconGrade,
-        ANY_VALUE ( m.productDescription ) AS productDescription,
-        ANY_VALUE ( m.supplierName ) AS supplierName,
-        ANY_VALUE ( m.ingotBatch ) AS ingotBatch,
+        ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
+        ANY_VALUE ( m2.productDescription ) AS productDescription,
+        ANY_VALUE ( m2.supplierName ) AS supplierName,
+        ANY_VALUE ( m2.ingotBatch ) AS ingotBatch,
+        ANY_VALUE ( m2.number ) AS number,
         TIMESTAMPDIFF(
         HOUR,
         p.update_time,
         curtime()) AS usedTime
         FROM
         sch_base_task t
-        LEFT JOIN sch_base_point p on t.point_code2=p.point_code and t.point_code1 like 'XHW%'
-        LEFT JOIN sch_base_material m ON p.vehicle_code2 = m.PalletSN
-        LEFT JOIN sch_base_vehiclematerialgroup v ON p.point_code = v.point_code
+        LEFT JOIN sch_base_point p ON t.point_code1 = p.point_code
+        LEFT JOIN sch_base_point p2 ON t.point_code2 = p2.point_code
+        LEFT JOIN sch_base_vehiclematerialgroup v ON t.vehicle_code2 = v.vehicle_code
+        LEFT JOIN (
+        SELECT
+        m.PalletSN AS PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch,
+        count( * ) AS number
+        FROM
+        sch_base_material m
+        WHERE
+        1 = 1
+        <if test="query.lotSN  != null">
+            and m.lotSN like  CONCAT('%', #{query.lotSN}, '%')
+        </if>
+        GROUP BY
+        m.PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch
+        ) m2 ON t.vehicle_code2 = m2.PalletSN
         WHERE
         p.vehicle_code2 != ''
         AND p.vehicle_code2 IS NOT NULL
+        AND t.is_delete = '0'
+        AND t.point_code1 LIKE 'XHW%'
+        AND t.point_code2 LIKE 'FHW%'
         <if test="query.supplierName  != null">
-            and m.supplierName like CONCAT('%', #{query.supplierName}, '%')
+            and m2.supplierName like CONCAT('%', #{query.supplierName}, '%')
         </if>
         <if test="query.productDescription  != null">
-            and m.productDescription like  CONCAT('%', #{query.productDescription}, '%')
+            and m2.productDescription like  CONCAT('%', #{query.productDescription}, '%')
         </if>
         <if test="query.point_code  != null">
             and p.point_code like  CONCAT('%', #{query.point_code}, '%')
@@ -305,16 +501,89 @@
         <if test="query.region_code  != null">
             and p.region_code like  CONCAT('%', #{query.region_code}, '%')
         </if>
-        <if test="query.lotSN  != null">
-            and m.lotSN like  CONCAT('%', #{query.lotSN}, '%')
-        </if>
         <if test="query.ingotBatch  != null">
-            and m.ingotBatch like  CONCAT('%', #{query.ingotBatch}, '%')
+            and m2.ingotBatch like  CONCAT('%', #{query.ingotBatch}, '%')
+        </if>
+        <if test="query.number  != null">
+            and m2.number =  #{query.number}
+        </if>
+        GROUP BY
+        pointCode
+        ORDER BY p.update_time DESC, pointCode ASC
+    </select>
+
+    <select id="queryHwOutPending" resultType="org.nl.wms.sch.report.service.dto.HwDto">
+        SELECT
+        p.point_code AS pointCode,
+        p.region_name AS regionName,
+        ANY_VALUE ( p2.point_code ) AS pointCode2,
+        ANY_VALUE ( p2.region_name ) AS regionName2,
+        ANY_VALUE ( t.vehicle_code2 ) AS subTray,
+        ANY_VALUE ( t.vehicle_code ) AS motherTray,
+        p.update_time AS updateTime,
+        ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
+        ANY_VALUE ( m2.productDescription ) AS productDescription,
+        ANY_VALUE ( m2.supplierName ) AS supplierName,
+        ANY_VALUE ( m2.ingotBatch ) AS ingotBatch,
+        ANY_VALUE ( m2.number ) AS number,
+        TIMESTAMPDIFF(
+        HOUR,
+        p.update_time,
+        curtime()) AS usedTime
+        FROM
+        sch_base_task t
+        LEFT JOIN sch_base_point p ON t.point_code1 = p.point_code
+        LEFT JOIN sch_base_point p2 ON t.point_code2 = p2.point_code
+        LEFT JOIN (
+        SELECT
+        m.PalletSN AS PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch,
+        count( * ) AS number
+        FROM
+        sch_base_material m
+        WHERE
+        1 = 1
+        <if test="query.lotSN  != null">
+            and m2.lotSN like  CONCAT('%', #{query.lotSN}, '%')
+        </if>
+        GROUP BY
+        m.PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch
+        ) m2 ON p.vehicle_code2 = m2.PalletSN
+        WHERE
+        p.vehicle_code2 != ''
+        AND p.vehicle_code2 IS NOT NULL
+        AND t.is_delete = '0'
+        AND t.task_status in ('1','2','3','4')
+        AND t.point_code1 LIKE 'XHW%'
+        AND t.point_code2 LIKE 'FHW%'
+        <if test="query.supplierName  != null">
+            and m2.supplierName like CONCAT('%', #{query.supplierName}, '%')
+        </if>
+        <if test="query.productDescription  != null">
+            and m2.productDescription like  CONCAT('%', #{query.productDescription}, '%')
+        </if>
+        <if test="query.point_code  != null">
+            and p.point_code like  CONCAT('%', #{query.point_code}, '%')
+        </if>
+        <if test="query.region_code  != null">
+            and p.region_code like  CONCAT('%', #{query.region_code}, '%')
+        </if>
+        <if test="query.ingotBatch  != null">
+            and m2.ingotBatch like  CONCAT('%', #{query.ingotBatch}, '%')
+        </if>
+        <if test="query.number  != null">
+            and m2.number =  #{query.number}
         </if>
         GROUP BY
         pointCode
         ORDER BY p.update_time DESC, pointCode ASC
-        ) a
     </select>
 
 </mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java
index 9c8d1e9..a4f4782 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/HwDto.java
@@ -14,6 +14,10 @@ public class HwDto implements Serializable {
     private String regionCode;
     /** 区域名称 */
     private String regionName;
+    /** 点位名称 */
+    private String pointCode2;
+    /** 区域名称 */
+    private String regionName2;
     /** 子托号 */
     private String subTray;
     /** 母拖号 */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java
index eae1a58..20d23f3 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java
@@ -29,4 +29,8 @@ public class ReportQuery implements Serializable {
 
     private String start_point;
     private String end_point;
+    //每托根数
+    private Integer number;
+    //工单状态
+    private Integer status;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/YCLKCDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/YCLKCDto.java
new file mode 100644
index 0000000..9f32cff
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/YCLKCDto.java
@@ -0,0 +1,38 @@
+package org.nl.wms.sch.report.service.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class YCLKCDto implements Serializable {
+    /** 点位编码 */
+    private String pointCode;
+    /** 区域名称 */
+    private String regionName;
+    /** 子托号 */
+    private String subTray;
+    /** 母拖号 */
+    private String motherTray;
+    /** 出库单号 */
+    private String somtOrderNo;
+    /** 生产工单 */
+    private String moname;
+    /** 工单状态 */
+    private String status;
+    /** 回温模式 */
+    private String mode;
+    /** 入库时间 */
+    private String updateTime;
+    /** 棒源等级 */
+    private String siliconGrade;
+    /** 物料名称 */
+    private String productDescription;
+    /** 供应商名称 */
+    private String supplierName;
+    /** 客户来料批次号 */
+    private String ingotBatch;
+    /** 数量 */
+    private String number;
+
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java
index 2265cb8..9dbbed9 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java
@@ -14,10 +14,7 @@ import org.nl.wms.sch.material.service.dao.Material;
 import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper;
 import org.nl.wms.sch.report.service.IReportService;
 import org.nl.wms.sch.report.service.dao.mapper.ReportMapper;
-import org.nl.wms.sch.report.service.dto.HwDto;
-import org.nl.wms.sch.report.service.dto.ReportDto;
-import org.nl.wms.sch.report.service.dto.ReportQuery;
-import org.nl.wms.sch.report.service.dto.YlDto;
+import org.nl.wms.sch.report.service.dto.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.nl.common.utils.PageUtil;
@@ -50,6 +47,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
         return pages;
     }
 
+    @Override
+    public IPage<YCLKCDto> queryYlOutDetail(ReportQuery query, PageQuery pageQuery){
+        IPage<YCLKCDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
+        pages = reportMapper.queryYlOutDetail(pages, query);
+        return pages;
+    }
+
     @Override
     public IPage<YlDto> queryYlIn(ReportQuery query, PageQuery pageQuery){
         IPage<YlDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
@@ -76,12 +80,24 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
         return pages;
     }
 
+    @Override
+    public IPage<HwDto> queryHwInPending(ReportQuery query, PageQuery pageQuery){
+        IPage<HwDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
+        pages = reportMapper.queryHwInPending(pages, query);
+        return pages;
+    }
+
     public IPage<HwDto> queryHwOut(ReportQuery query, PageQuery pageQuery){
         IPage<HwDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
         pages = reportMapper.queryHwOut(pages, query);
         return pages;
     }
 
+    public IPage<HwDto> queryHwOutPending(ReportQuery query, PageQuery pageQuery){
+        IPage<HwDto> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
+        pages = reportMapper.queryHwOutPending(pages, query);
+        return pages;
+    }
 
     @Override
     public void  queryYlDetailDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
@@ -169,8 +185,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
         for(HwDto detailDto:pages.getRecords()){
             Map<String, Object> mp = new LinkedHashMap<>();
             mp.put("点位编码",detailDto.getPointCode());
-            mp.put("点位名称",detailDto.getPointCode());
-            mp.put("区域编码",detailDto.getRegionCode());
             mp.put("区域名称",detailDto.getRegionName());
             mp.put("子托号",detailDto.getSubTray());
             mp.put("母拖号",detailDto.getMotherTray());
@@ -181,7 +195,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
             mp.put("客户来料批次号",detailDto.getIngotBatch());
             mp.put("回温时间",detailDto.getStandingTime());
             mp.put("已回温时间",detailDto.getUsedTime());
-            mp.put("数量",detailDto.getNumber());
+            mp.put("每托数量(根)",detailDto.getNumber());
             list.add(mp);
         }
         FileUtil.downloadExcel(list, response);
@@ -195,8 +209,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
         for(HwDto detailDto:pages.getRecords()){
             Map<String, Object> mp = new LinkedHashMap<>();
             mp.put("点位编码",detailDto.getPointCode());
-            mp.put("点位名称",detailDto.getPointCode());
-            mp.put("区域编码",detailDto.getRegionCode());
             mp.put("区域名称",detailDto.getRegionName());
             mp.put("子托号",detailDto.getSubTray());
             mp.put("母拖号",detailDto.getMotherTray());
@@ -205,9 +217,30 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
             mp.put("入库时间",detailDto.getUpdateTime());
             mp.put("棒源等级",detailDto.getSiliconGrade());
             mp.put("客户来料批次号",detailDto.getIngotBatch());
-            mp.put("回温时间",detailDto.getStandingTime());
             mp.put("已回温时间",detailDto.getUsedTime());
-            mp.put("数量",detailDto.getNumber());
+            mp.put("每托数量(根)",detailDto.getNumber());
+            list.add(mp);
+        }
+        FileUtil.downloadExcel(list, response);
+    }
+
+    @Override
+    public void  queryHwInPendingDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
+        pageQuery.setSize(99999);
+        IPage<HwDto> pages = this.queryHwInPending(query,pageQuery);
+        List<Map<String, Object>> list = new ArrayList<>();
+        for(HwDto detailDto:pages.getRecords()){
+            Map<String, Object> mp = new LinkedHashMap<>();
+            mp.put("待入库点位编码",detailDto.getPointCode());
+            mp.put("待入库区域名称",detailDto.getRegionName());
+            mp.put("子托号",detailDto.getSubTray());
+            mp.put("母拖号",detailDto.getMotherTray());
+            mp.put("物料名称",detailDto.getProductDescription());
+            mp.put("供应商名称",detailDto.getSupplierName());
+            mp.put("棒源等级",detailDto.getSiliconGrade());
+            mp.put("客户来料批次号",detailDto.getIngotBatch());
+            mp.put("每托数量(根)",detailDto.getNumber());
+            mp.put("更新时间",detailDto.getUpdateTime());
             list.add(mp);
         }
         FileUtil.downloadExcel(list, response);
@@ -221,9 +254,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
         for(HwDto detailDto:pages.getRecords()){
             Map<String, Object> mp = new LinkedHashMap<>();
             mp.put("点位编码",detailDto.getPointCode());
-            mp.put("点位名称",detailDto.getPointCode());
-            mp.put("区域编码",detailDto.getRegionCode());
             mp.put("区域名称",detailDto.getRegionName());
+            mp.put("目的点位编码",detailDto.getPointCode2());
+            mp.put("目的区域名称",detailDto.getRegionName2());
             mp.put("子托号",detailDto.getSubTray());
             mp.put("母拖号",detailDto.getMotherTray());
             mp.put("物料名称",detailDto.getProductDescription());
@@ -233,7 +266,32 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
             mp.put("客户来料批次号",detailDto.getIngotBatch());
             mp.put("回温时间",detailDto.getStandingTime());
             mp.put("已回温时间",detailDto.getUsedTime());
-            mp.put("数量",detailDto.getNumber());
+            mp.put("每托数量(根)",detailDto.getNumber());
+            list.add(mp);
+        }
+        FileUtil.downloadExcel(list, response);
+    }
+
+    @Override
+    public void  queryHwOutPendingDownload(ReportQuery query, PageQuery pageQuery, HttpServletResponse response) throws IOException {
+        pageQuery.setSize(99999);
+        IPage<HwDto> pages = this.queryHwOutPending(query,pageQuery);
+        List<Map<String, Object>> list = new ArrayList<>();
+        for(HwDto detailDto:pages.getRecords()){
+            Map<String, Object> mp = new LinkedHashMap<>();
+            mp.put("待出库点位编码",detailDto.getPointCode());
+            mp.put("待出库区域编码",detailDto.getRegionName());
+            mp.put("目的点位编码",detailDto.getPointCode2());
+            mp.put("目的区域名称",detailDto.getRegionName2());
+            mp.put("子托号",detailDto.getSubTray());
+            mp.put("母拖号",detailDto.getMotherTray());
+            mp.put("物料名称",detailDto.getProductDescription());
+            mp.put("供应商名称",detailDto.getSupplierName());
+            mp.put("入库时间",detailDto.getUpdateTime());
+            mp.put("棒源等级",detailDto.getSiliconGrade());
+            mp.put("客户来料批次号",detailDto.getIngotBatch());
+            mp.put("已回温时间",detailDto.getUsedTime());
+            mp.put("每托数量(根)",detailDto.getNumber());
             list.add(mp);
         }
         FileUtil.downloadExcel(list, response);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
index dc3d6cf..386cd3f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
@@ -28,6 +28,7 @@ import org.nl.wms.sch.task_manage.task.core.TaskStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.List;
@@ -161,18 +162,12 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
 
     @Override
     public void create(SchBaseTask entity) {
-        String currentUserId = SecurityUtils.getCurrentUserId();
-        String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         Assert.notNull(entity.getTask_status(), "任务状态不能为空!");
 
         entity.setTask_id(IdUtil.getSnowflake(1, 1).nextIdStr());
         entity.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr());
-        entity.setCreate_id(currentUserId);
-        entity.setCreate_name(nickName);
         entity.setCreate_time(now);
-        entity.setUpdate_id(currentUserId);
-        entity.setUpdate_name(nickName);
         entity.setUpdate_time(now);
         schBaseTaskMapper.insert(entity);
 
@@ -278,11 +273,12 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
     }
 
     /**
-     * 管理端一键移库
+     * 管理端一键移库：原材料缓存区---》原材料库存区
      *
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void move() {
         log.info("管理端发起一键移库！");
         List<SchBasePoint> schBasePointList = schBasePointService.list(new LambdaQueryWrapper<SchBasePoint>()
@@ -311,7 +307,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
             param.put("request_medthod_code", "POINTTask");
             param.put("request_medthod_name", "点对点任务");
             param.put("device_code", param.getString("start_point"));
-            BaseResponse baseResponse = acsToWmsService.acsApply(param);
+            acsToWmsService.pdaApply(param);
             nextList.remove(0);
         }
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
index 02803e8..831f9a0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.database.material.service.IMdBaseMaterialService;
 import org.nl.wms.database.material.service.dao.MdBaseMaterial;
 import org.nl.wms.ext.service.dto.to.BaseResponse;
@@ -190,7 +191,7 @@ public abstract class AbstractTask {
         if (taskConfig.getIs_check_workorder()) {
             // 校验工单
             // 根据对接位的父点位编码(设备)找到工单设备
-            SchBasePoint one = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
+            /*SchBasePoint one = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
                     .eq(SchBasePoint::getPoint_code, pointObj.getParent_point_code()));
             // 查找当前设备、生产中
             PdmBdWorkorder workorder = workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>()
@@ -203,7 +204,7 @@ public abstract class AbstractTask {
                     .eq(MdBaseMaterial::getMaterial_id,workorder.getMaterial_id()));
             param.put("workorder_code", workorder.getWorkorder_code()); // 静置时间
             // 设置任务数据
-            task.setVehicle_type(workorder.getVehicle_type());
+            task.setVehicle_type(workorder.getVehicle_type());*/
         }
         // 校验是否需要自动agv
         if (!pointObj.getIs_auto()) {
@@ -212,22 +213,36 @@ public abstract class AbstractTask {
         }
         // 2、创建申请任务
         task.setAcs_trace_id(param.getString("acs_trace_id"));
+        //设置任务类型
         task.setConfig_code(config_code);
+        //设置任务创建模式
         task.setCreate_mode(param.getString("create_mode"));
+        //记录母载具号
         task.setVehicle_code(param.getString("vehicle_code"));
+        //记录子载具号
+        task.setVehicle_code2(param.getString("vehicle_code2"));
         task.setVehicle_qty(param.getInteger("vehicle_qty"));
         task.setVehicle_type(param.getString("material_type"));
+        //设置任务状态为 申请状态(当前任务参数不全，不具备下发条件)
         task.setTask_status(TaskStatus.APPLY.getCode());
         task.setWorkshop_code(taskConfig.getWorkshop_code()); // 车间编码
         // 设置起/终点
         this.setTaskPoint(taskConfig, task, apply_point_code,param);
         task.setExt_group_data(JSONObject.toJSONString(param));
+        //设置操作人
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        if(ObjectUtil.isNotEmpty(param.getString("user_id"))){
+            currentUserId = param.getString("user_id");
+            nickName  = param.getString("person_name");
+        }
+        task.setRemark("任务申请");
+        task.setCreate_id(currentUserId);
+        task.setCreate_name(nickName);
+        task.setUpdate_id(currentUserId);
+        task.setUpdate_name(nickName);
         taskService.create(task);
 
-        // 3、判断是否直接找点下发
-//        if (taskConfig.getIs_immediate_create()) {
-//            this.create();
-//        }
     }
 
     public void updateTaskStatus(String task_code, TaskStatus status) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java
index fa9e62b..42e5c63 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java
@@ -39,10 +39,6 @@ public class AutoCreateTask {
             // 调用AbstractAcsTask类的每个子类的schedule()方法
             try {
                 Object obj = SpringContextHolder.getBean(clz);
-//                if (ObjectUtil.isEmpty(obj)) { // 如果spring中获取不到，就用newInstance创建
-//                    obj = clz.newInstance();
-//                }
-                //Method m = obj.getClass().getDeclaredMethod("schedule");
                 Method m = obj.getClass().getMethod("schedule");
                 m.invoke(obj);
             } catch (InvocationTargetException e) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateWorkOrderTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateWorkOrderTask.java
new file mode 100644
index 0000000..98e3973
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateWorkOrderTask.java
@@ -0,0 +1,38 @@
+
+package org.nl.wms.sch.task_manage;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.config.SpringContextHolder;
+import org.nl.wms.sch.workorder.service.IWorkorderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.lang.reflect.Method;
+import java.util.Set;
+
+
+@Slf4j
+@Component
+public class AutoCreateWorkOrderTask {
+
+    @Autowired
+    private IWorkorderService workorderService;
+
+    @SneakyThrows
+    public void run() {
+        log.info("定时任务AutoCreateWorkOrderTask开始执行:");
+        this.doExecute();
+        log.info("定时任务AutoCreateWorkOrderTask执行结束:");
+    }
+
+
+    /**
+     * 根据工单下发情况自动生成工单出库任务
+     */
+    private void doExecute() {
+        workorderService.batchCreateTask();
+    }
+
+}
+
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/WorkOrderTwoStatusEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/WorkOrderTwoStatusEnum.java
new file mode 100644
index 0000000..b22311b
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/WorkOrderTwoStatusEnum.java
@@ -0,0 +1,20 @@
+package org.nl.wms.sch.task_manage.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author: zds
+ * @Description: 出库工单状态枚举
+ * @Date: 2023/6/16
+ */
+@Getter
+@AllArgsConstructor
+public enum WorkOrderTwoStatusEnum {
+    UNPRODUCED(0, "未提交"),
+    ISSUED(1, "已提交"),
+    PRODUCING(2, "出库中"),
+    COMPLETE(3, "已出库");
+    private final Integer code;
+    private final String name;
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java
index 5ae5542..519b3db 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java
@@ -9,7 +9,6 @@ import org.apache.commons.lang.StringUtils;
 import org.nl.common.exception.BadRequestException;
 import org.nl.wms.ext.service.WmsToAcsService;
 import org.nl.wms.ext.service.dto.to.BaseResponse;
-import org.nl.wms.pdm.service.IPdmBdWorkorderService;
 import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
 import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
 import org.nl.wms.sch.point.service.ISchBasePointService;
@@ -24,6 +23,7 @@ import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
 import org.nl.wms.sch.task_manage.task.TaskType;
 import org.nl.wms.sch.task_manage.task.core.TaskStatus;
 import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper;
+import org.nl.wms.sch.workorder.service.IWorkorderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
@@ -52,7 +52,7 @@ public class POINTTask extends AbstractTask {
     @Autowired
     private ISchBaseTaskconfigService taskConfigService;
     @Autowired
-    private IPdmBdWorkorderService workorderService;
+    private IWorkorderService workorderService;
     @Autowired
     private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
     @Autowired
@@ -90,7 +90,11 @@ public class POINTTask extends AbstractTask {
             pointService.update(schBasePoint);
             nextSchBasePoint.setIng_task_code(task.getTask_code());
             pointService.update(nextSchBasePoint);
-
+            //去回温库的任务，更细工单表
+            if(nextSchBasePoint.getPoint_code().contains("XHW")){
+                //pdm_bd_workorder_two任务完成时，status改为2出库中
+                workorderService.update(schBasePoint.getVehicle_code2(),"2");
+            }
             //下发
             this.renotifyAcs(task);
         }
@@ -161,6 +165,10 @@ public class POINTTask extends AbstractTask {
                         .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode2)
                         .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
                                 GroupBindMaterialStatusEnum.BOUND.getValue()));
+                if(endPointObj.getPoint_code().contains("XHW")){
+                    //pdm_bd_workorder_two任务完成时，status改为3
+                    workorderService.update(vehicleCode2,"3");
+                }
             }
             if (ObjectUtil.isNotEmpty(one)) {
 //                throw new BadRequestException(vehicleCode + " => " + startPointObj.getVehicle_type() + "的组盘信息未找到");
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
index bc09fff..7ad82a5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
@@ -14,7 +14,6 @@ import org.nl.wms.ext.service.dto.to.BaseResponse;
 import org.nl.wms.mes.domain.Head;
 import org.nl.wms.mes.domain.QPMES065Request;
 import org.nl.wms.mes.domain.QPMES065RequestBody;
-import org.nl.wms.pdm.service.IPdmBdWorkorderService;
 import org.nl.wms.sch.data.service.dao.mapper.MaterialDataMapper;
 import org.nl.wms.sch.data.service.dto.MaterialDataDto;
 import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
@@ -33,6 +32,7 @@ import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
 import org.nl.wms.sch.task_manage.task.TaskType;
 import org.nl.wms.sch.task_manage.task.core.TaskStatus;
 import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper;
+import org.nl.wms.sch.workorder.service.IWorkorderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
@@ -66,7 +66,7 @@ public class YCLCKTask extends AbstractTask {
     @Autowired
     private ISchBaseTaskconfigService taskConfigService;
     @Autowired
-    private IPdmBdWorkorderService workorderService;
+    private IWorkorderService workorderService;
     @Autowired
     private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
     @Autowired
@@ -82,7 +82,6 @@ public class YCLCKTask extends AbstractTask {
     protected void create() throws BadRequestException {
         // 获取任务
         List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-
         for (SchBaseTask task : tasks) {
             JSONObject jsonObject = JSONObject.parseObject(task.getExt_group_data());
             String region;
@@ -102,10 +101,10 @@ public class YCLCKTask extends AbstractTask {
                 log.info("原材料出库未找到所需点位！");
                 continue;
             }
-            // 设置起点并修改创建成功状态
+            // 设置终点并修改创建成功状态
             task.setPoint_code2(point.getPoint_code());
             task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
+            task.setRemark("任务下发");
             SchBasePoint schBasePoint = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
                     .eq(SchBasePoint::getPoint_code, task.getPoint_code1()));
             task.setVehicle_code(schBasePoint.getVehicle_code());
@@ -114,10 +113,9 @@ public class YCLCKTask extends AbstractTask {
 
             //发起任务时先把点位占用，防止发起重复任务
             point.setIng_task_code(task.getTask_code());
-//            point.setVehicle_qty(point.getVehicle_qty() - 1);
-//            point.setVehicle_type(materialType);
             pointService.update(point);
-
+            //pdm_bd_workorder_two任务下发时，status改为2
+            workorderService.update(schBasePoint.getVehicle_code2(),"2");
             //下发
             this.renotifyAcs(task);
         }
@@ -230,6 +228,9 @@ public class YCLCKTask extends AbstractTask {
             taskObj.setTask_status(TaskStatus.FINISHED.getCode());
             taskObj.setGroup_id(ObjectUtil.isNotEmpty(one)?one.getGroup_id():null);
             taskObj.setRemark("任务完成");
+            //pdm_bd_workorder_two任务完成时，status改为3
+            workorderService.update(vehicleCode2,"3");
+
             List<Material> materialList = materialMapper.selectList(new LambdaQueryWrapper<Material>()
                     .eq(Material::getPalletSN, taskObj.getVehicle_code2())
                     .eq(Material::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue()));
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/controller/WorkorderController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/WorkorderController.java
similarity index 72%
rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/controller/WorkorderController.java
rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/WorkorderController.java
index 55fde3d..e8bf7ef 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/controller/WorkorderController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/WorkorderController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.sch.workorder.controller.controller;
+package org.nl.wms.sch.workorder.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -6,9 +6,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
-import org.nl.wms.sch.workorder.controller.service.IWorkorderService;
-import org.nl.wms.sch.workorder.controller.service.dao.Workorder;
-import org.nl.wms.sch.workorder.controller.service.dto.WorkorderQuery;
+import org.nl.wms.pdm.service.dao.PointDetailAdd;
+import org.nl.wms.sch.workorder.service.IWorkorderService;
+import org.nl.wms.sch.workorder.service.dao.Workorder;
+import org.nl.wms.sch.workorder.service.dto.WorkorderQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -58,4 +59,13 @@ public class WorkorderController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @PostMapping("/batchChange")
+    @Log("批量更新工单状态")
+    @ApiOperation("批量更新工单状态")
+    public ResponseEntity<Object> batchChange(@RequestBody PointDetailAdd pointDetailAdd){
+        log.info("批量新增原材料出库任务："+pointDetailAdd.toString());
+        workorderService.batchChange(pointDetailAdd);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dao/mapper/WorkorderMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dao/mapper/WorkorderMapper.java
deleted file mode 100644
index c75d495..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dao/mapper/WorkorderMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.nl.wms.sch.workorder.controller.service.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.sch.workorder.controller.service.dao.Workorder;
-
-/**
-* @author lyd
-* @date 2023-05-16
-**/
-public interface WorkorderMapper extends BaseMapper<Workorder> {
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/impl/WorkorderServiceImpl.java
deleted file mode 100644
index 2889957..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/impl/WorkorderServiceImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.nl.wms.sch.workorder.controller.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.sch.workorder.controller.service.IWorkorderService;
-import org.nl.wms.sch.workorder.controller.service.dao.Workorder;
-import org.nl.wms.sch.workorder.controller.service.dao.mapper.WorkorderMapper;
-import org.nl.wms.sch.workorder.controller.service.dto.WorkorderQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Set;
-
-@Slf4j
-@Service
-public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder> implements IWorkorderService {
-
-    @Autowired
-    private WorkorderMapper workorderMapper;
-
-    @Override
-    public IPage<Workorder> queryAll(WorkorderQuery whereJson, PageQuery page){
-        IPage<Workorder> pages = new Page<>(page.getPage() + 1, page.getSize());
-        LambdaQueryWrapper<Workorder> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(StringUtils.isNotBlank(whereJson.getMoname()), Workorder::getMoname,whereJson.getMoname());
-        wrapper.like(StringUtils.isNotBlank(whereJson.getSomtOrderNo()), Workorder::getSomtOrderNo,whereJson.getSomtOrderNo());
-        wrapper.like(StringUtils.isNotBlank(whereJson.getPalletSN()), Workorder::getPalletSN,whereJson.getPalletSN());
-        wrapper.like(StringUtils.isNotBlank(whereJson.getLotSN()), Workorder::getLotSN,whereJson.getLotSN());
-        wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()), Workorder::getProductName,whereJson.getProductName());
-        wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()), Workorder::getSupplierCode,whereJson.getSupplierCode());
-        wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()), Workorder::getProductDescription,whereJson.getProductDescription());
-        wrapper.like(StringUtils.isNotBlank(whereJson.getStatus()), Workorder::getStatus,whereJson.getStatus());
-        pages = workorderMapper.selectPage(pages, wrapper);
-        return pages;
-    }
-
-    @Override
-    public void create(Workorder entity) {
-        workorderMapper.insert(entity);
-    }
-
-
-    @Override
-    public void deleteAll(Set<String> ids) {
-        // 真删除
-        workorderMapper.deleteBatchIds(ids);
-    }
-
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/IWorkorderService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/IWorkorderService.java
similarity index 54%
rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/IWorkorderService.java
rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/IWorkorderService.java
index b9f4eef..1d29241 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/IWorkorderService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/IWorkorderService.java
@@ -1,10 +1,11 @@
-package org.nl.wms.sch.workorder.controller.service;
+package org.nl.wms.sch.workorder.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.sch.workorder.controller.service.dao.Workorder;
-import org.nl.wms.sch.workorder.controller.service.dto.WorkorderQuery;
+import org.nl.wms.pdm.service.dao.PointDetailAdd;
+import org.nl.wms.sch.workorder.service.dao.Workorder;
+import org.nl.wms.sch.workorder.service.dto.WorkorderQuery;
 
 import java.util.Set;
 
@@ -25,10 +26,28 @@ public interface IWorkorderService extends IService<Workorder> {
     */
     void create(Workorder entity);
 
+    /**
+     *
+     * @param palletSN
+     * @param status
+     */
+    public void update(String palletSN,String status);
+
 
     /**
     * 多选删除
     * @param ids /
     */
     void deleteAll(Set<String> ids);
+
+    /**
+     * 批量更新工单状态
+     * @param pointDetailAdd
+     */
+    void batchChange( PointDetailAdd pointDetailAdd);
+
+    /**
+     * 批量生成工单出库任务
+     */
+    void batchCreateTask();
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dao/Workorder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/Workorder.java
similarity index 92%
rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dao/Workorder.java
rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/Workorder.java
index 3ebd424..59421bd 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dao/Workorder.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/Workorder.java
@@ -1,4 +1,4 @@
-package org.nl.wms.sch.workorder.controller.service.dao;
+package org.nl.wms.sch.workorder.service.dao;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
@@ -38,6 +38,8 @@ public class Workorder implements Serializable {
     private Integer status;
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
+    @ApiModelProperty(value = "回温模式")
+    private String mode;
 
     public void copyFrom(QPMES155RequestBody source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.java
new file mode 100644
index 0000000..9939f39
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.java
@@ -0,0 +1,19 @@
+package org.nl.wms.sch.workorder.service.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.sch.report.service.dto.ReportQuery;
+import org.nl.wms.sch.report.service.dto.YCLKCDto;
+import org.nl.wms.sch.workorder.service.dao.Workorder;
+
+import java.util.List;
+
+/**
+* @author lyd
+* @date 2023-05-16
+**/
+public interface WorkorderMapper extends BaseMapper<Workorder> {
+
+    void batchChange(List<String> pointCodes,String mode,String status);
+
+    List<YCLKCDto> getYlOutDetail();
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.xml
new file mode 100644
index 0000000..2254139
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.sch.workorder.service.dao.mapper.WorkorderMapper">
+    <update id="batchChange">
+        UPDATE pdm_bd_workorder_two
+        SET status = #{status},
+        mode = #{mode}
+        <where>
+            palletSN IN
+            <foreach collection="pointCodes" item="code" separator="," open="(" close=")">
+                #{code}
+            </foreach>
+            and status != #{status}
+        </where>
+    </update>
+
+    <select id="getYlOutDetail" resultType="org.nl.wms.sch.report.service.dto.YCLKCDto">
+        SELECT
+        p.point_code AS pointCode,
+        p.region_name AS regionName,
+        p.vehicle_code2 AS subTray,
+        p.vehicle_code AS motherTray,
+        ANY_VALUE (t.somtOrderNo) AS somtOrderNo,
+        ANY_VALUE (t.moname) AS moname,
+        ANY_VALUE (t.status) AS status,
+        ANY_VALUE (t.mode) AS mode,
+        p.update_time AS updateTime,
+        ANY_VALUE ( m2.siliconGrade ) AS siliconGrade,
+        ANY_VALUE ( m2.productDescription ) AS productDescription,
+        ANY_VALUE ( m2.supplierName ) AS supplierName,
+        ANY_VALUE ( m2.ingotBatch ) AS ingotBatch,
+        ANY_VALUE ( m2.number ) AS number
+        FROM
+        pdm_bd_workorder_two t
+        LEFT JOIN sch_base_point p ON t.palletSN = p.vehicle_code2
+        LEFT JOIN (
+        SELECT
+        m.PalletSN AS PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch,
+        count( * ) AS number
+        FROM
+        sch_base_material m
+        WHERE
+        1 = 1
+        GROUP BY
+        m.PalletSN,
+        m.siliconGrade,
+        m.productDescription,
+        m.supplierName,
+        m.ingotBatch
+        ) m2 ON t.palletSN = m2.PalletSN
+        WHERE
+        p.vehicle_code2 != ''
+        AND p.vehicle_code2 IS NOT NULL
+        AND t.STATUS = '1'
+        AND p.region_code IN ( 'YL','YLHC','KJHC' )
+        GROUP BY
+        pointCode
+        ORDER BY point_code ASC
+    </select>
+</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dto/WorkorderDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderDto.java
similarity index 84%
rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dto/WorkorderDto.java
rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderDto.java
index 9a903bb..a8dacd8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dto/WorkorderDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.sch.workorder.controller.service.dto;
+package org.nl.wms.sch.workorder.service.dto;
 
 import lombok.Data;
 
@@ -22,4 +22,6 @@ public class WorkorderDto implements Serializable {
     private String supplierCode;
     //客户名称
     private String supplierName;
+    //回温模式
+    private String mode;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dto/WorkorderQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderQuery.java
similarity index 86%
rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dto/WorkorderQuery.java
rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderQuery.java
index c3803ef..bd38d95 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/service/dto/WorkorderQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderQuery.java
@@ -1,4 +1,4 @@
-package org.nl.wms.sch.workorder.controller.service.dto;
+package org.nl.wms.sch.workorder.service.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,4 +23,6 @@ public class WorkorderQuery implements Serializable {
     private String moname;
     //出库单号
     private String somtOrderNo;
+    //回温模式
+    private String mode;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
new file mode 100644
index 0000000..f59c7e0
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
@@ -0,0 +1,145 @@
+package org.nl.wms.sch.workorder.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.pda.service.PdaService;
+import org.nl.wms.pdm.service.dao.PointDetailAdd;
+import org.nl.wms.sch.report.service.dto.YCLKCDto;
+import org.nl.wms.sch.task.service.ISchBaseTaskService;
+import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
+import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
+import org.nl.wms.sch.task_manage.enums.WorkOrderTwoStatusEnum;
+import org.nl.wms.sch.workorder.service.IWorkorderService;
+import org.nl.wms.sch.workorder.service.dao.Workorder;
+import org.nl.wms.sch.workorder.service.dao.mapper.WorkorderMapper;
+import org.nl.wms.sch.workorder.service.dto.WorkorderQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+@Slf4j
+@Service
+public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder> implements IWorkorderService {
+
+    @Autowired
+    private WorkorderMapper workorderMapper;
+    @Autowired
+    private ISchBaseTaskconfigService taskConfigService;
+    @Autowired
+    private ISchBaseTaskService taskService;
+    @Autowired
+    private PdaService pdaService;
+
+    @Override
+    public IPage<Workorder> queryAll(WorkorderQuery whereJson, PageQuery page){
+        IPage<Workorder> pages = new Page<>(page.getPage() + 1, page.getSize());
+        LambdaQueryWrapper<Workorder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(whereJson.getMoname()), Workorder::getMoname,whereJson.getMoname());
+        wrapper.like(StringUtils.isNotBlank(whereJson.getSomtOrderNo()), Workorder::getSomtOrderNo,whereJson.getSomtOrderNo());
+        wrapper.like(StringUtils.isNotBlank(whereJson.getPalletSN()), Workorder::getPalletSN,whereJson.getPalletSN());
+        wrapper.like(StringUtils.isNotBlank(whereJson.getLotSN()), Workorder::getLotSN,whereJson.getLotSN());
+        wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()), Workorder::getProductName,whereJson.getProductName());
+        wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()), Workorder::getSupplierCode,whereJson.getSupplierCode());
+        wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()), Workorder::getProductDescription,whereJson.getProductDescription());
+        wrapper.like(StringUtils.isNotBlank(whereJson.getStatus()), Workorder::getStatus,whereJson.getStatus());
+        pages = workorderMapper.selectPage(pages, wrapper);
+        return pages;
+    }
+
+    @Override
+    public void create(Workorder entity) {
+        workorderMapper.insert(entity);
+    }
+
+    @Override
+    public void update(String palletSN,String status){
+        if(ObjectUtil.isNotEmpty(palletSN)){
+            //更新已生成任务后的工单状态
+            UpdateWrapper<Workorder> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("palletSN",palletSN);
+            updateWrapper.ge("status","1");
+            updateWrapper.set("status",status);
+            workorderMapper.update(null,updateWrapper);
+        }
+    }
+    @Override
+    public void deleteAll(Set<String> ids) {
+        // 真删除
+        workorderMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchChange( PointDetailAdd pointDetailAdd){
+        //载具号集合
+        List<String> pointCodes = pointDetailAdd.getPointCodes();
+        //是否快速回温
+        String mode = pointDetailAdd.getMode();
+        //下发状态
+        String status = pointDetailAdd.getStatus();
+        //更新工单状态和回温模式
+        workorderMapper.batchChange(pointCodes,mode,status);
+    }
+    @Override
+    //@Transactional(rollbackFor = Exception.class)
+    public void batchCreateTask(){
+        String config_code = "YCLCKTask";
+        //查询可生成任务的工单
+        List<YCLKCDto> list =  workorderMapper.getYlOutDetail();
+        if(list.size()>0){
+            // 查询任务配置信息
+            SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
+                    .eq(SchBaseTaskconfig::getConfig_code, config_code));
+            Assert.notNull(taskConfig, "找不到任务配置文件，请确认YCLCKTask配置是否存在！");
+            // 获取任务配置最大生成任务数
+            Integer tcmn = taskConfig.getTask_create_max_num();
+            // 获取执行中的任务
+            List<SchBaseTask> unFinishTasksByTaskConfig = new ArrayList<SchBaseTask>();
+            JSONObject param=new JSONObject();
+            for(YCLKCDto workorder : list){
+                //子载具
+                String vehicle_code2 = workorder.getSubTray();
+                //母载具
+                String vehicle_code = workorder.getMotherTray();
+                //载具所在点位
+                String point_code = workorder.getPointCode();
+                //是否快速回温
+                String mode = workorder.getMode();
+                // 获取执行中的任务
+                unFinishTasksByTaskConfig = taskService.findUnFinishTasksByTaskConfig(config_code);
+                //执行中任务数量小于最大可生成任务数
+                if(unFinishTasksByTaskConfig.size() < tcmn){
+                    //设置出库任务参数
+                    param.put("start_point",point_code);
+                    param.put("mode",mode);
+                    param.put("vehicle_code",vehicle_code);
+                    param.put("vehicle_code2", vehicle_code2);
+                    param.put("user_id","1");
+                    param.put("person_name", "管理员");
+                    pdaService.yclck(param);
+                    //更新对应载具工单状态为已生成任务，不可在工单页面取消
+                    //pdm_bd_workorder_two任务生成时，status改为2
+                    this.update(vehicle_code2,"2");
+                }else{
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
index 40751fe..0394633 100644
--- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
@@ -6,11 +6,11 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:gc_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
-#      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+      #      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:123456}
-#      password: ${DB_PWD:P@ssw0rd}
+      password: ${DB_PWD:root}
+      #      password: ${DB_PWD:P@ssw0rd}
       # 初始连接数
       initial-size: 5
       # 最小连接数
@@ -148,7 +148,7 @@ sa-token:
     # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明）
   is-read-cookie: true
   is-print: false
-#  未登录 StpUtil.getTokenSession() 设置值，获取值 @SaIgnore 得忽略接口
+  #  未登录 StpUtil.getTokenSession() 设置值，获取值 @SaIgnore 得忽略接口
   token-session-check-login: false
   alone-redis:
     # Redis数据库索引（默认为0）
diff --git a/lms/nladmin-ui/src/views/wms/hw/detail/detail.js b/lms/nladmin-ui/src/views/wms/hw/detail/detail.js
index 03750fb..1aae28b 100644
--- a/lms/nladmin-ui/src/views/wms/hw/detail/detail.js
+++ b/lms/nladmin-ui/src/views/wms/hw/detail/detail.js
@@ -63,5 +63,5 @@ export function getIngotBatchList(data) {
   })
 }
 
-export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList }
+export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList, getIngotBatchList }
 
diff --git a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue
index 07494ad..ed3c2ec 100644
--- a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue
+++ b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue
@@ -87,163 +87,26 @@
               />
             </el-select>
           </el-form-item>
+
+          <el-form-item label="每托根数">
+            <el-input-number
+              v-model="query.number"
+              filterable
+              laceholder="每托根数"
+              clearable
+              controls-position="right"
+              :min="0"
+              :max="10000"
+              :step="10"
+              size="mini"
+            >
+            </el-input-number>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
-        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="母托盘编码">
-            <el-input v-model="form.vehicle_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="子托盘编码">
-            <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
-          </el-form-item>-->
-          <!-- <el-form-item v-if="false" label="来源载具">
-            <el-input v-model="form.source_vehicle_code" style="width: 240px;" />
-          </el-form-item> -->
-          <el-form-item label="托盘类型">
-            <el-radio-group v-model="form.vehicle_type" style="width: 240px">
-              <el-radio label="1">子托盘</el-radio>
-              <el-radio label="0">母托盘</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="回温开始时间">
-            <el-date-picker
-              v-model="form.instorage_time"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              style="width: 240px;"
-              placeholder="选择日期时间"
-            />
-          </el-form-item>
-          <el-form-item label="点位编码">
-            <el-select
-              v-model="form.point_code"
-              filterable
-              placeholder="请选择"
-              style="width: 240px;"
-              @change="setPointName"
-            >
-              <el-option
-                v-for="item in pointList"
-                :key="item.point_code"
-                :label="item.point_code"
-                :value="item.point_code"
-              >
-                <span style="float: left">{{ item.point_name }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
-              </el-option>
-            </el-select>
-            <!--            <el-input v-model="form.point_code" style="width: 240px;" />-->
-          </el-form-item>
-          <el-form-item label="点位名称">
-            <el-input v-model="form.point_name" style="width: 240px;" disabled />
-          </el-form-item>
-          <el-form-item label="是否满托">
-            <el-radio-group v-model="form.is_full" style="width: 240px">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="静置时间(分钟)">
-            <el-input-number
-              v-model.number="form.standing_time"
-              :min="1"
-              :max="999"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料数量">
-            <el-input-number
-              v-model.number="form.material_qty"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料重量">
-            <el-input-number
-              v-model.number="form.material_weight"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="工单编码">
-            <el-input v-model="form.workorder_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料来源">
-            <el-radio-group v-model="choose" size="mini" style="width: 240px;">
-              <el-radio-button label="物料" />
-              <el-radio-button label="工单" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料名称">
-            <el-input v-model="form.material_id" suffix-icon="el-icon-date" clearable style="width: 370px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料名称">
-            <el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input v-model="form.material_code" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料规格">
-            <el-input v-model="form.material_spec" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="组盘次数">
-            <el-input v-model="form.group_number" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="任务编码">
-            <el-input v-model="form.task_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="组盘状态">
-            <el-select
-              v-model="form.group_status"
-              size="mini"
-              placeholder="点位状态"
-              class="filter-item"
-              style="width: 240px;"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.group_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!--<el-form-item label="是否首个流程任务">
-            <el-input v-model="form.is_first_flow_task" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="流程编码">
-            <el-input v-model="form.flow_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="流程顺序">
-            <el-input v-model="form.flow_num" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="上一任务">
-            <el-input v-model="form.before_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="下一任务">
-            <el-input v-model="form.next_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-            <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"  height="300">
         <el-table-column v-permission="[]" label="操作" width="80px" align="center" fixed="right">
@@ -256,8 +119,6 @@
           </template>
         </el-table-column>
         <el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
-        <el-table-column prop="pointName" label="点位名称" :min-width="flexWidth('pointName',crud.data,'点位名称')" />
-        <el-table-column prop="regionCode" label="区域编码" :min-width="flexWidth('regionCode',crud.data,'区域编码')" />
         <el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" />
         <el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
         <el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
@@ -266,16 +127,15 @@
         <el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
         <el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
         <el-table-column prop="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
-        <el-table-column prop="updateTime" label="入库时间" :min-width="170" />
-        <el-table-column prop="standingTime" label="回温时间H" :min-width="70" />
-        <el-table-column prop="usedTime" label="已回温时间H" :min-width="70" />
-        <el-table-column label="是否完成" :min-width="70">
+        <el-table-column prop="updateTime" label="入库时间" :min-width="flexWidth('updateTime',crud.data,'入库时间')" />
+        <el-table-column prop="standingTime" label="回温时间H" :min-width="flexWidth('standingTime',crud.data,'回温时间H')" />
+        <el-table-column prop="usedTime" label="已回温时间H" :min-width="flexWidth('usedTime',crud.data,'已回温时间H')" />
+        <el-table-column label="是否完成" :min-width="90">
           <template slot-scope="scope">
             <span>{{ scope.row.standingTime > scope.row.usedTime ? '未完成' : '已完成' }}</span>
           </template>
         </el-table-column>
       </el-table>
-
       <el-dialog
     :visible.sync="dialogVisible"
     title="选择点位"
@@ -314,44 +174,10 @@ import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
 import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 
-const defaultForm = {
-  group_id: null,
-  vehicle_code: null,
-  vehicle_type: null,
-  material_id: null,
-  child_vehicle_code: null,
-  source_vehicle_code: null,
-  point_code: null,
-  point_name: null,
-  is_full: true,
-  pcsn: null,
-  instorage_time: null,
-  standing_time: null,
-  material_qty: null,
-  material_weight: null,
-  workorder_code: null,
-  group_number: null,
-  task_code: null,
-  ext_data: null,
-  workshop_code: null,
-  group_status: null,
-  table_name: null,
-  table_fk: null,
-  table_fk_id: null,
-  buss_move_id: null,
-  is_first_flow_task: true,
-  flow_code: null,
-  flow_num: null,
-  before_task_code: null,
-  next_task_code: null,
-  remark: null,
-  is_delete: false
-}
 export default {
-  name: 'VehicleMaterialGroup',
-  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
+  name: 'HwDetail',
   components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '回温间库存明细',
@@ -368,8 +194,7 @@ export default {
       query: {
         group_bind_material_status: '2',
         region_code: 'HW'
-      },
-      crudMethod: { ...crudMaterial }
+      }
     })
   },
   data() {
@@ -378,11 +203,8 @@ export default {
       },
       rules: {
       },
-      workShopList: [],
       pointList: [],
-      regionList: [],
       supplierNameList: [],
-      lotSNList: [],
       ingotBatchList: [],
       productDescriptionList: [],
       choose: '物料',
@@ -394,11 +216,8 @@ export default {
     }
   },
   created() {
-    this.getWorkShopList()
     this.getPointList()
-    this.getRegionList()
     this.getSupplierNameList()
-    // this.getLotSNList()
     this.getIngotBatchList()
     this.fetchPoints()
     this.getProductDescriptionList()
@@ -408,18 +227,8 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    getWorkShopList() { // 获取车间列表
-      crudMdBaseWorkShop.getWorkShopList().then(res => {
-        this.workShopList = res
-      })
-    },
-    getRegionList() {
-      crudSchBaseRegion.getRegionList().then(res => {
-        this.regionList = res
-      })
-    },
     getPointList() { // 获取点位列表
-      crudSchBasePoint.getPointList().then(res => {
+      crudSchBasePoint.getPointsByRegionCodes("HW").then(res => {
         this.pointList = res
       })
     },
@@ -428,11 +237,6 @@ export default {
         this.supplierNameList = res.content
       })
     },
-    getLotSNList() {
-      crudMaterial.getLotSNList().then(res => {
-        this.lotSNList = res.content
-      })
-    },
     getProductDescriptionList() {
       crudMaterial.getProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
@@ -443,28 +247,7 @@ export default {
         this.ingotBatchList = res.content
       })
     },
-    tableChanged(row) {
-      this.form.material_name = row.material_name
-      this.form.material_id = row.material_id
-      this.form.material_spec = row.material_spec
-      this.form.material_code = row.material_code
-      if (this.choose === '工单') {
-        this.form.workorder_code = row.workorder_code
-      }
-    },
-    clearMaterial() {
-      this.form.material_name = null
-      this.form.material_id = null
-      this.form.material_spec = null
-      this.form.material_code = null
-    },
-    setPointName(data) {
-      var point = this.pointList.find(item => item.point_code === data)
-      this.form.point_name = point.point_name
-    },
-    hand(value) {
-      this.crud.toQuery()
-    },handleButtonClick(row) {
+    handleButtonClick(row) {
       this.selectedRow = row;
       this.dialogVisible = true;
       this.fetchPoints();
@@ -472,7 +255,6 @@ export default {
     fetchPoints() {
       crudSchBasePoint.getCBPointList().then(res => {
         this.points = res;
-        alert(points);
       })
 
     },
diff --git a/lms/nladmin-ui/src/views/wms/hw/in/detail.js b/lms/nladmin-ui/src/views/wms/hw/in/detail.js
index 03750fb..1aae28b 100644
--- a/lms/nladmin-ui/src/views/wms/hw/in/detail.js
+++ b/lms/nladmin-ui/src/views/wms/hw/in/detail.js
@@ -63,5 +63,5 @@ export function getIngotBatchList(data) {
   })
 }
 
-export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList }
+export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList, getIngotBatchList }
 
diff --git a/lms/nladmin-ui/src/views/wms/hw/in/index.vue b/lms/nladmin-ui/src/views/wms/hw/in/index.vue
index df5445c..10ffd8d 100644
--- a/lms/nladmin-ui/src/views/wms/hw/in/index.vue
+++ b/lms/nladmin-ui/src/views/wms/hw/in/index.vue
@@ -87,168 +87,29 @@
               />
             </el-select>
           </el-form-item>
+
+          <el-form-item label="每托根数">
+            <el-input-number
+              v-model="query.number"
+              filterable
+              laceholder="每托根数"
+              clearable
+              controls-position="right"
+              :min="0"
+              :max="10000"
+              :step="10"
+              size="mini"
+            >
+            </el-input-number>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
-        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="母托盘编码">
-            <el-input v-model="form.vehicle_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="子托盘编码">
-            <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
-          </el-form-item>-->
-          <!-- <el-form-item v-if="false" label="来源载具">
-            <el-input v-model="form.source_vehicle_code" style="width: 240px;" />
-          </el-form-item> -->
-          <el-form-item label="托盘类型">
-            <el-radio-group v-model="form.vehicle_type" style="width: 240px">
-              <el-radio label="1">子托盘</el-radio>
-              <el-radio label="0">母托盘</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="回温开始时间">
-            <el-date-picker
-              v-model="form.instorage_time"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              style="width: 240px;"
-              placeholder="选择日期时间"
-            />
-          </el-form-item>
-          <el-form-item label="点位编码">
-            <el-select
-              v-model="form.point_code"
-              filterable
-              placeholder="请选择"
-              style="width: 240px;"
-              @change="setPointName"
-            >
-              <el-option
-                v-for="item in pointList"
-                :key="item.point_code"
-                :label="item.point_code"
-                :value="item.point_code"
-              >
-                <span style="float: left">{{ item.point_name }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
-              </el-option>
-            </el-select>
-            <!--            <el-input v-model="form.point_code" style="width: 240px;" />-->
-          </el-form-item>
-          <el-form-item label="点位名称">
-            <el-input v-model="form.point_name" style="width: 240px;" disabled />
-          </el-form-item>
-          <el-form-item label="是否满托">
-            <el-radio-group v-model="form.is_full" style="width: 240px">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="静置时间(分钟)">
-            <el-input-number
-              v-model.number="form.standing_time"
-              :min="1"
-              :max="999"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料数量">
-            <el-input-number
-              v-model.number="form.material_qty"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料重量">
-            <el-input-number
-              v-model.number="form.material_weight"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="工单编码">
-            <el-input v-model="form.workorder_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料来源">
-            <el-radio-group v-model="choose" size="mini" style="width: 240px;">
-              <el-radio-button label="物料" />
-              <el-radio-button label="工单" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料名称">
-            <el-input v-model="form.material_id" suffix-icon="el-icon-date" clearable style="width: 370px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料名称">
-            <el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input v-model="form.material_code" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料规格">
-            <el-input v-model="form.material_spec" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="组盘次数">
-            <el-input v-model="form.group_number" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="任务编码">
-            <el-input v-model="form.task_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="组盘状态">
-            <el-select
-              v-model="form.group_status"
-              size="mini"
-              placeholder="点位状态"
-              class="filter-item"
-              style="width: 240px;"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.group_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!--<el-form-item label="是否首个流程任务">
-            <el-input v-model="form.is_first_flow_task" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="流程编码">
-            <el-input v-model="form.flow_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="流程顺序">
-            <el-input v-model="form.flow_num" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="上一任务">
-            <el-input v-model="form.before_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="下一任务">
-            <el-input v-model="form.next_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-            <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="300" @selection-change="crud.selectionChangeHandler">
         <el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
-        <el-table-column prop="pointName" label="点位名称" :min-width="flexWidth('pointName',crud.data,'点位名称')" />
-        <el-table-column prop="regionCode" label="区域编码" :min-width="flexWidth('regionCode',crud.data,'区域编码')" />
         <el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" />
         <el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
         <el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
@@ -257,37 +118,9 @@
         <el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
         <el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
         <el-table-column prop="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
-        <el-table-column prop="updateTime" label="入库时间" :min-width="150" />
-        <el-table-column prop="standingTime" label="回温时间H" :min-width="70" />
-        <el-table-column prop="usedTime" label="已回温时间H" :min-width="70" />
-        <el-table-column label="是否完成" :min-width="70">
-          <template slot-scope="scope">
-            <span>{{ scope.row.standingTime > scope.row.usedTime ? '未完成' : '已完成' }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="updateTime" label="入库时间" :min-width="flexWidth('updateTime',crud.data,'入库时间')" />
+        <el-table-column prop="usedTime" label="已回温时间H" :min-width="flexWidth('usedTime',crud.data,'已回温时间H')" />
       </el-table>
-
-      <el-dialog
-        :visible.sync="dialogVisible"
-        title="选择点位"
-      >
-        <el-form ref="form" :model="form">
-          <el-form-item label="点位列表">
-            <el-select v-model="form.selectedPoint" placeholder="请选择点位">
-              <el-option
-                v-for="item in points"
-                :key="item.point_code"
-                :label="item.point_code"
-                :value="item.point_code"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="submitSelectedPoint">确认</el-button>
-        </div>
-      </el-dialog>
       <!--分页组件-->
       <pagination />
     </div>
@@ -296,53 +129,18 @@
 
 <script>
 import crudMaterial from './detail'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
-import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 
-const defaultForm = {
-  group_id: null,
-  vehicle_code: null,
-  vehicle_type: null,
-  material_id: null,
-  child_vehicle_code: null,
-  source_vehicle_code: null,
-  point_code: null,
-  point_name: null,
-  is_full: true,
-  pcsn: null,
-  instorage_time: null,
-  standing_time: null,
-  material_qty: null,
-  material_weight: null,
-  workorder_code: null,
-  group_number: null,
-  task_code: null,
-  ext_data: null,
-  workshop_code: null,
-  group_status: null,
-  table_name: null,
-  table_fk: null,
-  table_fk_id: null,
-  buss_move_id: null,
-  is_first_flow_task: true,
-  flow_code: null,
-  flow_num: null,
-  before_task_code: null,
-  next_task_code: null,
-  remark: null,
-  is_delete: false
-}
+
 export default {
-  name: 'VehicleMaterialGroup',
-  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
+  name: 'HwIn',
   components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '回温间库存明细',
@@ -357,8 +155,7 @@ export default {
         reset: false
       },
       query: {
-      },
-      crudMethod: { ...crudMaterial }
+      }
     })
   },
   data() {
@@ -367,29 +164,18 @@ export default {
       },
       rules: {
       },
-      workShopList: [],
       pointList: [],
-      regionList: [],
       supplierNameList: [],
-      lotSNList: [],
       ingotBatchList: [],
       productDescriptionList: [],
       choose: '物料',
-      dialogVisible: false,
-      form: {
-        selectedPoint: null
-      },
-      points: []
+      dialogVisible: false
     }
   },
   created() {
-    this.getWorkShopList()
     this.getPointList()
-    this.getRegionList()
     this.getSupplierNameList()
-    // this.getLotSNList()
     this.getIngotBatchList()
-    this.fetchPoints()
     this.getProductDescriptionList()
   },
   methods: {
@@ -397,18 +183,8 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    getWorkShopList() { // 获取车间列表
-      crudMdBaseWorkShop.getWorkShopList().then(res => {
-        this.workShopList = res
-      })
-    },
-    getRegionList() {
-      crudSchBaseRegion.getRegionList().then(res => {
-        this.regionList = res
-      })
-    },
     getPointList() { // 获取点位列表
-      crudSchBasePoint.getPointList().then(res => {
+      crudSchBasePoint.getPointsByRegionCodes("YL,YLHC,KJHC").then(res => {
         this.pointList = res
       })
     },
@@ -417,11 +193,6 @@ export default {
         this.supplierNameList = res.content
       })
     },
-    getLotSNList() {
-      crudMaterial.getLotSNList().then(res => {
-        this.lotSNList = res.content
-      })
-    },
     getProductDescriptionList() {
       crudMaterial.getProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
@@ -431,55 +202,6 @@ export default {
       crudMaterial.getIngotBatchList().then(res => {
         this.ingotBatchList = res.content
       })
-    },
-    tableChanged(row) {
-      this.form.material_name = row.material_name
-      this.form.material_id = row.material_id
-      this.form.material_spec = row.material_spec
-      this.form.material_code = row.material_code
-      if (this.choose === '工单') {
-        this.form.workorder_code = row.workorder_code
-      }
-    },
-    clearMaterial() {
-      this.form.material_name = null
-      this.form.material_id = null
-      this.form.material_spec = null
-      this.form.material_code = null
-    },
-    setPointName(data) {
-      var point = this.pointList.find(item => item.point_code === data)
-      this.form.point_name = point.point_name
-    },
-    hand(value) {
-      this.crud.toQuery()
-    }, handleButtonClick(row) {
-      this.selectedRow = row
-      this.dialogVisible = true
-      this.fetchPoints()
-    },
-    fetchPoints() {
-      crudSchBasePoint.getCBPointList().then(res => {
-        this.points = res
-        alert(points)
-      })
-    },
-    submitSelectedPoint() {
-      const selectedPoint = this.form.selectedPoint
-      if (!selectedPoint) {
-        this.$message.warning('请选择一个点位')
-        return
-      }
-      // Submit the selected point to the backend
-      this.$axios.post('/api/pda/task', {
-        start_point: this.selectedRow.pointCode,
-        next_point: selectedPoint
-      }).then(response => {
-        this.$message.success('提交成功')
-        this.dialogVisible = false
-      }).catch(error => {
-        this.$message.error('提交失败')
-      })
     }
   }
 }
diff --git a/lms/nladmin-ui/src/views/wms/hw/inpending/inPending.js b/lms/nladmin-ui/src/views/wms/hw/inpending/inPending.js
new file mode 100644
index 0000000..1aae28b
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/hw/inpending/inPending.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/report',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/report/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/report',
+    method: 'put',
+    data
+  })
+}
+
+export function getGroup(data) {
+  return request({
+    url: 'api/report/getGroup',
+    method: 'post',
+    data
+  })
+}
+
+export function getSupplierNameList(data) {
+  return request({
+    url: 'api/report/getSupplierNameList',
+    method: 'get',
+    data
+  })
+}
+
+export function getProductDescriptionList(data) {
+  return request({
+    url: 'api/report/getProductDescriptionList',
+    method: 'get',
+    data
+  })
+}
+
+export function getLotSNList(data) {
+  return request({
+    url: 'api/report/getLotSNList',
+    method: 'get',
+    data
+  })
+}
+export function getIngotBatchList(data) {
+  return request({
+    url: 'api/report/getIngotBatchList',
+    method: 'get',
+    data
+  })
+}
+
+export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList, getIngotBatchList }
+
diff --git a/lms/nladmin-ui/src/views/wms/hw/inpending/index.vue b/lms/nladmin-ui/src/views/wms/hw/inpending/index.vue
new file mode 100644
index 0000000..48962da
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/hw/inpending/index.vue
@@ -0,0 +1,209 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="点位编码">
+            <el-select
+              v-model="query.point_code"
+              clearable
+              size="mini"
+              placeholder="点位编码"
+              class="filter-item"
+              filterable
+              @remote-method="getPointList"
+            >
+              <el-option
+                v-for="item in pointList"
+                :label="item.point_code"
+                :value="item.point_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="晶体编号">
+            <el-input
+              v-model="query.lotSN"
+              clearable
+              size="mini"
+              placeholder="晶体编号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="供应商名称">
+            <el-select
+              v-model="query.supplierName"
+              clearable
+              size="mini"
+              placeholder="供应商名称"
+              class="filter-item"
+              filterable
+              @remote-method="getSupplierNameList"
+            >
+              <el-option
+                v-for="item in supplierNameList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料名称">
+            <el-select
+              v-model="query.productDescription"
+              clearable
+              size="mini"
+              placeholder="物料名称"
+              class="filter-item"
+              filterable
+              @remote-method="getProductDescriptionList"
+            >
+              <el-option
+                v-for="item in productDescriptionList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="批次">
+            <el-select
+              v-model="query.ingotBatch"
+              clearable
+              size="mini"
+              placeholder="批次"
+              class="filter-item"
+              filterable
+              @remote-method="getIngotBatchList"
+            >
+              <el-option
+                v-for="item in ingotBatchList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="每托根数">
+            <el-input-number
+              v-model="query.number"
+              filterable
+              laceholder="每托根数"
+              clearable
+              controls-position="right"
+              :min="0"
+              :max="10000"
+              :step="10"
+              size="mini"
+            >
+            </el-input-number>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="300" @selection-change="crud.selectionChangeHandler">
+        <el-table-column prop="pointCode" label="待入库点位编码" :min-width="flexWidth('pointCode',crud.data,'待入库点位编码')" />
+        <el-table-column prop="regionName" label="待入库区域名称" :min-width="flexWidth('regionName',crud.data,'待入库区域名称')" />
+        <el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
+        <el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
+        <el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
+        <el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
+        <el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
+        <el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
+        <el-table-column prop="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
+        <el-table-column prop="updateTime" label="更新时间" :min-width="150" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
+import inPending from '@/views/wms/hw/inpending/inPending'
+
+export default {
+  name: 'HwInPending',
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(), header(), crud()],
+  cruds() {
+    return CRUD({
+      title: '回温间待入库明细',
+      url: 'api/report/hw/inpending',
+      idField: 'group_id',
+      sort: 'pointCode,desc',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: true,
+        reset: false
+      },
+      query: {
+      }
+    })
+  },
+  data() {
+    return {
+      permission: {
+      },
+      rules: {
+      },
+      pointList: [],
+      supplierNameList: [],
+      ingotBatchList: [],
+      productDescriptionList: [],
+      choose: '物料',
+      dialogVisible: false
+    }
+  },
+  created() {
+    this.getPointList()
+    this.getSupplierNameList()
+    this.getIngotBatchList()
+    this.getProductDescriptionList()
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    getPointList() { // 获取点位列表
+      crudSchBasePoint.getPointsByRegionCodes("YL,YLHC,KJHC").then(res => {
+        this.pointList = res
+      })
+    },
+    getSupplierNameList() {
+      inPending.getSupplierNameList().then(res => {
+        this.supplierNameList = res.content
+      })
+    },
+    getProductDescriptionList() {
+      inPending.getProductDescriptionList().then(res => {
+        this.productDescriptionList = res.content
+      })
+    },
+    getIngotBatchList() {
+      inPending.getIngotBatchList().then(res => {
+        this.ingotBatchList = res.content
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/lms/nladmin-ui/src/views/wms/hw/out/detail.js b/lms/nladmin-ui/src/views/wms/hw/out/detail.js
index 03750fb..1aae28b 100644
--- a/lms/nladmin-ui/src/views/wms/hw/out/detail.js
+++ b/lms/nladmin-ui/src/views/wms/hw/out/detail.js
@@ -63,5 +63,5 @@ export function getIngotBatchList(data) {
   })
 }
 
-export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList }
+export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList, getIngotBatchList }
 
diff --git a/lms/nladmin-ui/src/views/wms/hw/out/index.vue b/lms/nladmin-ui/src/views/wms/hw/out/index.vue
index 688bf98..84ef5bf 100644
--- a/lms/nladmin-ui/src/views/wms/hw/out/index.vue
+++ b/lms/nladmin-ui/src/views/wms/hw/out/index.vue
@@ -87,169 +87,31 @@
               />
             </el-select>
           </el-form-item>
+            <el-form-item label="每托根数">
+              <el-input-number
+                v-model="query.number"
+                filterable
+                laceholder="每托根数"
+                clearable
+                controls-position="right"
+                :min="0"
+                :max="10000"
+                :step="10"
+                size="mini"
+              >
+              </el-input-number>
+            </el-form-item>
           <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
-        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="母托盘编码">
-            <el-input v-model="form.vehicle_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="子托盘编码">
-            <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
-          </el-form-item>-->
-          <!-- <el-form-item v-if="false" label="来源载具">
-            <el-input v-model="form.source_vehicle_code" style="width: 240px;" />
-          </el-form-item> -->
-          <el-form-item label="托盘类型">
-            <el-radio-group v-model="form.vehicle_type" style="width: 240px">
-              <el-radio label="1">子托盘</el-radio>
-              <el-radio label="0">母托盘</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="回温开始时间">
-            <el-date-picker
-              v-model="form.instorage_time"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              style="width: 240px;"
-              placeholder="选择日期时间"
-            />
-          </el-form-item>
-          <el-form-item label="点位编码">
-            <el-select
-              v-model="form.point_code"
-              filterable
-              placeholder="请选择"
-              style="width: 240px;"
-              @change="setPointName"
-            >
-              <el-option
-                v-for="item in pointList"
-                :key="item.point_code"
-                :label="item.point_code"
-                :value="item.point_code"
-              >
-                <span style="float: left">{{ item.point_name }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
-              </el-option>
-            </el-select>
-            <!--            <el-input v-model="form.point_code" style="width: 240px;" />-->
-          </el-form-item>
-          <el-form-item label="点位名称">
-            <el-input v-model="form.point_name" style="width: 240px;" disabled />
-          </el-form-item>
-          <el-form-item label="是否满托">
-            <el-radio-group v-model="form.is_full" style="width: 240px">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="静置时间(分钟)">
-            <el-input-number
-              v-model.number="form.standing_time"
-              :min="1"
-              :max="999"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料数量">
-            <el-input-number
-              v-model.number="form.material_qty"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料重量">
-            <el-input-number
-              v-model.number="form.material_weight"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="工单编码">
-            <el-input v-model="form.workorder_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料来源">
-            <el-radio-group v-model="choose" size="mini" style="width: 240px;">
-              <el-radio-button label="物料" />
-              <el-radio-button label="工单" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料名称">
-            <el-input v-model="form.material_id" suffix-icon="el-icon-date" clearable style="width: 370px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料名称">
-            <el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input v-model="form.material_code" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料规格">
-            <el-input v-model="form.material_spec" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="组盘次数">
-            <el-input v-model="form.group_number" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="任务编码">
-            <el-input v-model="form.task_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="组盘状态">
-            <el-select
-              v-model="form.group_status"
-              size="mini"
-              placeholder="点位状态"
-              class="filter-item"
-              style="width: 240px;"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.group_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!--<el-form-item label="是否首个流程任务">
-            <el-input v-model="form.is_first_flow_task" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="流程编码">
-            <el-input v-model="form.flow_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="流程顺序">
-            <el-input v-model="form.flow_num" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="上一任务">
-            <el-input v-model="form.before_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="下一任务">
-            <el-input v-model="form.next_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-            <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="300" @selection-change="crud.selectionChangeHandler">
         <el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
-        <el-table-column prop="pointName" label="点位名称" :min-width="flexWidth('pointName',crud.data,'点位名称')" />
-        <el-table-column prop="regionCode" label="区域编码" :min-width="flexWidth('regionCode',crud.data,'区域编码')" />
         <el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" />
+        <el-table-column prop="pointCode2" label="目的点位编码" :min-width="flexWidth('pointCode2',crud.data,'目的点位编码')" />
+        <el-table-column prop="regionName2" label="目的区域名称" :min-width="flexWidth('regionName2',crud.data,'目的区域名称')" />
         <el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
         <el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
         <el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
@@ -266,28 +128,6 @@
           </template>
         </el-table-column>
       </el-table>
-
-      <el-dialog
-        :visible.sync="dialogVisible"
-        title="选择点位"
-      >
-        <el-form ref="form" :model="form">
-          <el-form-item label="点位列表">
-            <el-select v-model="form.selectedPoint" placeholder="请选择点位">
-              <el-option
-                v-for="item in points"
-                :key="item.point_code"
-                :label="item.point_code"
-                :value="item.point_code"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="submitSelectedPoint">确认</el-button>
-        </div>
-      </el-dialog>
       <!--分页组件-->
       <pagination />
     </div>
@@ -296,53 +136,18 @@
 
 <script>
 import crudMaterial from './detail'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
-import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 
-const defaultForm = {
-  group_id: null,
-  vehicle_code: null,
-  vehicle_type: null,
-  material_id: null,
-  child_vehicle_code: null,
-  source_vehicle_code: null,
-  point_code: null,
-  point_name: null,
-  is_full: true,
-  pcsn: null,
-  instorage_time: null,
-  standing_time: null,
-  material_qty: null,
-  material_weight: null,
-  workorder_code: null,
-  group_number: null,
-  task_code: null,
-  ext_data: null,
-  workshop_code: null,
-  group_status: null,
-  table_name: null,
-  table_fk: null,
-  table_fk_id: null,
-  buss_move_id: null,
-  is_first_flow_task: true,
-  flow_code: null,
-  flow_num: null,
-  before_task_code: null,
-  next_task_code: null,
-  remark: null,
-  is_delete: false
-}
 export default {
-  name: 'VehicleMaterialGroup',
-  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
+  name: 'HwcOut',
+  dicts: [],
   components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '回温间库存明细',
@@ -357,8 +162,7 @@ export default {
         reset: false
       },
       query: {
-      },
-      crudMethod: { ...crudMaterial }
+      }
     })
   },
   data() {
@@ -367,29 +171,18 @@ export default {
       },
       rules: {
       },
-      workShopList: [],
       pointList: [],
-      regionList: [],
       supplierNameList: [],
-      lotSNList: [],
       ingotBatchList: [],
       productDescriptionList: [],
       choose: '物料',
-      dialogVisible: false,
-      form: {
-        selectedPoint: null
-      },
-      points: []
+      dialogVisible: false
     }
   },
   created() {
-    this.getWorkShopList()
     this.getPointList()
-    this.getRegionList()
     this.getSupplierNameList()
-    // this.getLotSNList()
     this.getIngotBatchList()
-    this.fetchPoints()
     this.getProductDescriptionList()
   },
   methods: {
@@ -397,18 +190,8 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    getWorkShopList() { // 获取车间列表
-      crudMdBaseWorkShop.getWorkShopList().then(res => {
-        this.workShopList = res
-      })
-    },
-    getRegionList() {
-      crudSchBaseRegion.getRegionList().then(res => {
-        this.regionList = res
-      })
-    },
     getPointList() { // 获取点位列表
-      crudSchBasePoint.getPointList().then(res => {
+      crudSchBasePoint.getPointsByRegionCodes("HW").then(res => {
         this.pointList = res
       })
     },
@@ -417,11 +200,6 @@ export default {
         this.supplierNameList = res.content
       })
     },
-    getLotSNList() {
-      crudMaterial.getLotSNList().then(res => {
-        this.lotSNList = res.content
-      })
-    },
     getProductDescriptionList() {
       crudMaterial.getProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
@@ -431,55 +209,6 @@ export default {
       crudMaterial.getIngotBatchList().then(res => {
         this.ingotBatchList = res.content
       })
-    },
-    tableChanged(row) {
-      this.form.material_name = row.material_name
-      this.form.material_id = row.material_id
-      this.form.material_spec = row.material_spec
-      this.form.material_code = row.material_code
-      if (this.choose === '工单') {
-        this.form.workorder_code = row.workorder_code
-      }
-    },
-    clearMaterial() {
-      this.form.material_name = null
-      this.form.material_id = null
-      this.form.material_spec = null
-      this.form.material_code = null
-    },
-    setPointName(data) {
-      var point = this.pointList.find(item => item.point_code === data)
-      this.form.point_name = point.point_name
-    },
-    hand(value) {
-      this.crud.toQuery()
-    }, handleButtonClick(row) {
-      this.selectedRow = row
-      this.dialogVisible = true
-      this.fetchPoints()
-    },
-    fetchPoints() {
-      crudSchBasePoint.getCBPointList().then(res => {
-        this.points = res
-        alert(points)
-      })
-    },
-    submitSelectedPoint() {
-      const selectedPoint = this.form.selectedPoint
-      if (!selectedPoint) {
-        this.$message.warning('请选择一个点位')
-        return
-      }
-      // Submit the selected point to the backend
-      this.$axios.post('/api/pda/task', {
-        start_point: this.selectedRow.pointCode,
-        next_point: selectedPoint
-      }).then(response => {
-        this.$message.success('提交成功')
-        this.dialogVisible = false
-      }).catch(error => {
-        this.$message.error('提交失败')
-      })
     }
   }
 }
diff --git a/lms/nladmin-ui/src/views/wms/hw/outpending/index.vue b/lms/nladmin-ui/src/views/wms/hw/outpending/index.vue
new file mode 100644
index 0000000..ce8b488
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/hw/outpending/index.vue
@@ -0,0 +1,210 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="点位编码">
+            <el-select
+              v-model="query.point_code"
+              clearable
+              size="mini"
+              placeholder="点位编码"
+              class="filter-item"
+              filterable
+              @remote-method="getPointList"
+            >
+              <el-option
+                v-for="item in pointList"
+                :label="item.point_code"
+                :value="item.point_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="晶体编号">
+            <el-input
+              v-model="query.lotSN"
+              clearable
+              size="mini"
+              placeholder="晶体编号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="供应商名称">
+            <el-select
+              v-model="query.supplierName"
+              clearable
+              size="mini"
+              placeholder="供应商名称"
+              class="filter-item"
+              filterable
+              @remote-method="getSupplierNameList"
+            >
+              <el-option
+                v-for="item in supplierNameList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料名称">
+            <el-select
+              v-model="query.productDescription"
+              clearable
+              size="mini"
+              placeholder="物料名称"
+              class="filter-item"
+              filterable
+              @remote-method="getProductDescriptionList"
+            >
+              <el-option
+                v-for="item in productDescriptionList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="批次">
+            <el-select
+              v-model="query.ingotBatch"
+              clearable
+              size="mini"
+              placeholder="批次"
+              class="filter-item"
+              filterable
+              @remote-method="getIngotBatchList"
+            >
+              <el-option
+                v-for="item in ingotBatchList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="每托根数">
+            <el-input-number
+              v-model="query.number"
+              filterable
+              laceholder="每托根数"
+              clearable
+              controls-position="right"
+              :min="0"
+              :max="10000"
+              :step="10"
+              size="mini"
+            >
+            </el-input-number>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="300" @selection-change="crud.selectionChangeHandler">
+        <el-table-column prop="pointCode" label="待出库点位编码" :min-width="flexWidth('pointCode',crud.data,'待出库点位编码')" />
+        <el-table-column prop="regionName" label="待出库区域名称" :min-width="flexWidth('regionName',crud.data,'待出库区域名称')" />
+        <el-table-column prop="pointCode2" label="目的点位编码" :min-width="flexWidth('pointCode2',crud.data,'目的点位编码')" />
+        <el-table-column prop="regionName2" label="目的区域名称" :min-width="flexWidth('regionName2',crud.data,'目的区域名称')" />
+        <el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
+        <el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
+        <el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
+        <el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
+        <el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
+        <el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
+        <el-table-column prop="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
+        <el-table-column prop="updateTime" label="入库时间" :min-width="170" />
+        <el-table-column prop="usedTime" label="已回温时间H" :min-width="70" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
+import inPending from '@/views/wms/hw/inpending/inPending'
+
+export default {
+  name: 'OutPending',
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(), header(), crud()],
+  cruds() {
+    return CRUD({
+      title: '回温间待出库明细',
+      url: 'api/report/hw/outpending',
+      idField: 'group_id',
+      sort: 'pointCode,desc',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: true,
+        reset: false
+      },
+      query: {
+      }
+    })
+  },
+  data() {
+    return {
+      permission: {
+      },
+      rules: {
+      },
+      pointList: [],
+      supplierNameList: [],
+      ingotBatchList: [],
+      productDescriptionList: []
+    }
+  },
+  created() {
+    this.getPointList()
+    this.getSupplierNameList()
+    this.getIngotBatchList()
+    this.getProductDescriptionList()
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    getPointList() { // 获取点位列表
+      crudSchBasePoint.getPointsByRegionCodes("HW").then(res => {
+        this.pointList = res
+      })
+    },
+    getSupplierNameList() {
+      inPending.getSupplierNameList().then(res => {
+        this.supplierNameList = res.content
+      })
+    },
+    getProductDescriptionList() {
+      inPending.getProductDescriptionList().then(res => {
+        this.productDescriptionList = res.content
+      })
+    },
+    getIngotBatchList() {
+      inPending.getIngotBatchList().then(res => {
+        this.ingotBatchList = res.content
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue
index 0ddf71f..15c926c 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue
@@ -21,13 +21,13 @@
             clearable
             size="mini"
             placeholder="物料编码"
-            disabled="false"
+            :disabled="true"
             @keyup.enter.native="crud.toQuery"
           />
         </el-form-item>
         <rrOperation />
       </el-form>
-  
+
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -48,10 +48,6 @@
       </el-table>
       <!--分页组件-->
       <pagination />
-      <!-- <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submit">确 定</el-button>
-      </span> -->
       <el-button
       type="primary"
       @click="submitSelectedRows">
@@ -59,15 +55,14 @@
     </el-button>
     </el-dialog>
   </template>
-  
+
   <script>
-  
+
   import CRUD, { header, presenter } from '@crud/crud'
   import rrOperation from '@crud/RR.operation'
   import pagination from '@crud/Pagination'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { mount } from 'sortablejs'
-  
+
   export default {
     name: 'WorkOrderDetailDialog',
     components: { rrOperation, pagination },
@@ -81,10 +76,6 @@ import { mount } from 'sortablejs'
         type: Boolean,
         default: false
       },
-      isSingle: {
-        type: Boolean,
-        default: false
-      },
       productname: {
       type: String,
       default: ''
@@ -117,56 +108,27 @@ import { mount } from 'sortablejs'
     }
     },
     methods: {
-      clickChange(item) {
-        this.tableRadio = item
-      },
       open() {
-
-      },
-      handleSelectionChange(val, row) {
-        if (val.length > 1) {
-          this.$refs.table.clearSelection()
-          this.$refs.table.toggleRowSelection(val.pop())
-        } else {
-          this.checkrow = row
-        }
-      },
-      onSelectAll() {
-        this.$refs.table.clearSelection()
       },
       close() {
         this.crud.resetQuery(false)
         this.$emit('update:dialogShow', false)
       },
-      submit() {
-        // 处理单选
-        if (this.isSingle && this.tableRadio) {
-          this.$emit('update:dialogShow', false)
-          this.$emit('tableChanged', this.tableRadio)
-          return
-        }
-        this.rows = this.$refs.table.selection
-        if (this.rows.length <= 0) {
-          this.$message('请先勾选物料')
-          return
-        }
-        this.crud.resetQuery(false)
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged', this.rows)
-      },executeQuery() {
+      executeQuery() {
         this.crud.toQuery();
-      },submitSelectedRows() {
+      },
+      submitSelectedRows() {
       const selectedRows = this.$refs.table.selection;
       if (selectedRows.length === 0) {
         this.$message.error('请至少选择一行数据');
         return;
       }
 
-     // 获取选中行的 point_code
-    const pointCodes = selectedRows.map(row => row.point_code);
-    
- // 弹出输入回温时间和回温模式的对话框
- this.$prompt('请输入回温时间', '提示', {
+      // 获取选中行的 point_code
+     const pointCodes = selectedRows.map(row => row.point_code);
+
+     // 弹出输入回温时间和回温模式的对话框
+     this.$prompt('请输入回温时间', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         inputPattern: /\d+/,
@@ -207,7 +169,7 @@ import { mount } from 'sortablejs'
       });
     }
   }
-    
+
   }
   </script>
   <style rel="stylesheet/scss" lang="scss" scoped>
@@ -215,5 +177,4 @@ import { mount } from 'sortablejs'
       padding-top: 0px;
     }
   </style>
-  
-  
\ No newline at end of file
+
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue
index 8c2b17c..4910523 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>    
+  <div>
     <el-dialog
       title="物料选择"
       append-to-body
@@ -22,13 +22,13 @@
             clearable
             size="mini"
             placeholder="工单编号"
-            disabled="false"
+            :disabled="true"
             @keyup.enter.native="crud.toQuery"
           />
         </el-form-item>
         <rrOperation />
       </el-form>
-  
+
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -39,9 +39,7 @@
         border
         :cell-style="{'text-align':'center'}"
         :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
-        @select="handleSelectionChange"
-        @select-all="onSelectAll"
-        @current-change="clickChange"
+        @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column prop="workorder_code" label="工单编号" width="120px" />
         <el-table-column  prop="matnr" label="物料编码" />
@@ -50,7 +48,6 @@
         <el-table-column prop="mtytxt" label="产品类别描述" width="100" show-overflow-tooltip />
         <el-table-column prop="bdmng" label="数量" width="100" show-overflow-tooltip />
         <el-table-column prop="meins" label="计量单位" width="100" show-overflow-tooltip />
-        <!-- <el-table-column prop="real_qty" label="实际数量" width="100" show-overflow-tooltip /> -->
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -63,24 +60,19 @@
       </el-table>
       <!--分页组件-->
       <pagination />
-      <!-- <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submit">确 定</el-button>
-      </span> -->
     </el-dialog>
-    <PointDetailDialog :dialog-show.sync="pointDetailDialog" :workorder_code="workorder_code" :productname="productname" @tableChanged="tableChanged" />
+    <PointDetailDialog :dialog-show.sync="pointDetailDialog" :workorder_code="workorder_code" :productname="productname" />
 </div>
   </template>
-  
+
   <script>
-  
+
   import CRUD, { header, presenter } from '@crud/crud'
   import rrOperation from '@crud/RR.operation'
   import pagination from '@crud/Pagination'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
   import PointDetailDialog from '@/views/wms/pdm/workerorder/PointDetailDialog.vue'
-import { mount } from 'sortablejs'
-  
+
   export default {
     name: 'WorkOrderDetailDialog',
     components: { PointDetailDialog,rrOperation, pagination },
@@ -94,10 +86,6 @@ import { mount } from 'sortablejs'
         type: Boolean,
         default: false
       },
-      isSingle: {
-        type: Boolean,
-        default: true
-      },
       message: {
       type: String,
       default: ''
@@ -106,9 +94,6 @@ import { mount } from 'sortablejs'
     data() {
       return {
         dialogVisible: false,
-        tableRadio: null,
-        tableData: [],
-        workorder_code:null,
         pointDetailDialog:false,
         productname: null,
         workorder_code: null
@@ -127,43 +112,14 @@ import { mount } from 'sortablejs'
     }
     },
     methods: {
-      clickChange(item) {
-        this.tableRadio = item
-      },
       open() {
 
-      },
-      handleSelectionChange(val, row) {
-        if (val.length > 1) {
-          this.$refs.table.clearSelection()
-          this.$refs.table.toggleRowSelection(val.pop())
-        } else {
-          this.checkrow = row
-        }
-      },
-      onSelectAll() {
-        this.$refs.table.clearSelection()
       },
       close() {
         this.crud.resetQuery(false)
         this.$emit('update:dialogShow', false)
       },
-      submit() {
-        // 处理单选
-        if (this.isSingle && this.tableRadio) {
-          this.$emit('update:dialogShow', false)
-          this.$emit('tableChanged', this.tableRadio)
-          return
-        }
-        this.rows = this.$refs.table.selection
-        if (this.rows.length <= 0) {
-          this.$message('请先勾选物料')
-          return
-        }
-        this.crud.resetQuery(false)
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged', this.rows)
-      },executeQuery() {
+      executeQuery() {
         this.crud.toQuery();
       },
     doOperate(row) {
@@ -179,5 +135,4 @@ import { mount } from 'sortablejs'
       padding-top: 0px;
     }
   </style>
-  
-  
\ No newline at end of file
+
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index 40286e2..1a9bb2d 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -417,9 +417,6 @@ export default {
         region_code: [
           { required: true, message: '区域编码不能为空', trigger: 'change' }
         ]
-        /* workorder_type: [
-          { required: true, message: '工单类型不能为空', trigger: 'blur' }
-        ]*/
       },
       queryTypeOptions: [
         { key: 'workorder_code', display_name: '工单编号' },
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/PointDetailDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/PointDetailDialog.vue
index 659348a..d57315a 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/PointDetailDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/PointDetailDialog.vue
@@ -58,10 +58,6 @@
     </el-table>
     <!--分页组件-->
     <pagination />
-    <!-- <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submit">确 定</el-button>
-      </span> -->
     <el-button
       type="primary"
       @click="submitSelectedRows"
@@ -77,12 +73,10 @@ import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { mount } from 'sortablejs'
 
 export default {
   name: 'WorkOrderDetailDialog',
   components: { rrOperation, pagination },
-  dicts: ['is_used', 'vehicle_type'],
   cruds() {
     return CRUD({ title: '点位详情', url: 'api/pointDetail', optShow: {}})
   },
@@ -134,40 +128,15 @@ export default {
     },
     open() {
 
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-      } else {
-        this.checkrow = row
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
     },
     close() {
       this.crud.resetQuery(false)
       this.$emit('update:dialogShow', false)
     },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先勾选物料')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged', this.rows)
-    }, executeQuery() {
+    executeQuery() {
       this.crud.toQuery()
-    }, submitSelectedRows() {
+    },
+    submitSelectedRows() {
       const selectedRows = this.$refs.table.selection
       if (selectedRows.length === 0) {
         this.$message.error('请至少选择一行数据')
@@ -222,9 +191,9 @@ export default {
 
 }
 </script>
-  <style rel="stylesheet/scss" lang="scss" scoped>
-    ::v-deep .el-dialog__body {
-      padding-top: 0px;
-    }
-  </style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
 
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/index.vue
index c658da4..6f534ba 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/index.vue
@@ -51,55 +51,6 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="820px"
-      >
-        <el-form
-          ref="form"
-          style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
-          :inline="true"
-          :model="form"
-          :rules="rules"
-          size="mini"
-          label-width="135px"
-          label-suffix=":"
-        >
-          <el-form-item label="出库单号" >
-            <el-input v-model="form.somtOrderNo" style="width: 240px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="生产工单">
-            <el-input v-model="form.moname" style="width: 240px;"  />
-          </el-form-item>
-          <el-form-item label="托号">
-            <el-input v-model="form.palletSN" style="width: 240px;"  />
-          </el-form-item>
-          <el-form-item label="晶棒号" >
-            <el-input v-model="form.lotSN" style="width: 240px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input v-model="form.productName" style="width: 240px;"  />
-          </el-form-item>
-          <el-form-item label="物料描述">
-            <el-input v-model="form.productDescription" style="width: 240px;"  />
-          </el-form-item>
-          <el-form-item label="客户编码">
-            <el-input v-model="form.supplierCode" style="width: 240px;"  />
-          </el-form-item>
-          <el-form-item label="客户名称">
-            <el-input v-model="form.supplierName" style="width: 240px;"  />
-          </el-form-item>
-
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -117,11 +68,6 @@
         <el-table-column prop="productDescription" label="物料描述" :min-width="flexWidth('productDescription',crud.data,'物料描述')" />
         <el-table-column prop="supplierCode" label="客户编码" :min-width="flexWidth('supplierCode',crud.data,'客户编码')" />
         <el-table-column prop="supplierName" label="客户名称" :min-width="flexWidth('supplierName',crud.data,'客户名称')" />
-        <!-- <el-table-column prop="status" label="入库类型" :min-width="flexWidth('status',crud.data,'入库类型')">
-          <template slot-scope="scope">
-            {{ scope.row.status=="0"?'未出库':'已出库' }}
-          </template>
-        </el-table-column> -->
         <el-table-column prop="createTime" label="创建日期"  width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -141,65 +87,28 @@
       <!--分页组件-->
       <pagination />
     </div>
-    <MaterialDialog :dialog-show.sync="materialDialog" @tableChanged="tableChanged" />
-    <PointDetailDialog :dialog-show.sync="pointDetailDialog" :workorder_code="workorder_code" :productname="productname" @tableChanged="tableChanged" />
+    <PointDetailDialog :dialog-show.sync="pointDetailDialog" :workorder_code="workorder_code" :productname="productname" />
   </div>
 </template>
 
 <script>
-import crudPdmBdWorkorder from './workorder'
-import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
-import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
-import MaterialDialog from '@/views/wms/sch/group/MaterialDialog.vue'
 import PointDetailDialog from '@/views/wms/pdm/workerordertwo/PointDetailDialog.vue'
-import item from '@/layout/components/Sidebar/Item.vue'
 
-const defaultForm = {
-  workorder_id: null,
-  workorder_code: null,
-  plan_qty: null,
-  real_qty: null,
-  material_id: null,
-  vehicle_type: null,
-  planproducestart_date: null,
-  planproduceend_date: null,
-  realproducestart_date: null,
-  realproduceend_date: null,
-  material_spec: null,
-  material_code: null,
-  material_name: null,
-  standing_time: null,
-  point_code: null,
-  point_name: null,
-  region_code: null,
-  region_name: null,
-  workorder_status: null,
-  is_needmove: true,
-  workorder_type: null,
-  passback_status: null,
-  workshop_code: null,
-  ext_id: null,
-  is_delete: false,
-  is_urgent: false
-}
 export default {
   name: 'workorder',
-  dicts: ['vehicle_type', 'pdm_workorder_status'],
-  components: { PointDetailDialog,MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  components: { PointDetailDialog, pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '晶棒工单管理',
       url: 'api/workorder',
       idField: 'workorder_id',
       sort: 'workorder_id,desc',
-      crudMethod: { ...crudPdmBdWorkorder },
       optShow: {
         add: false,
         edit: false,
@@ -213,106 +122,25 @@ export default {
     return {
       permission: {},
       rules: {
-        material_code: [
-          { required: true, message: '物料不能为空', trigger: 'blur' }
-        ],
-        plan_qty: [
-          { required: true, message: '计划数量不能为空', trigger: 'blur' }
-        ],
-        planproducestart_date: [
-          { required: true, message: '计划开始不能为空', trigger: 'change' }
-        ],
-        planproduceend_date: [
-          { required: true, message: '计划结束不能为空', trigger: 'change' }
-        ],
-        point_code: [
-          { required: true, message: '设备编码不能为空', trigger: 'change' }
-        ],
-        region_code: [
-          { required: true, message: '区域编码不能为空', trigger: 'change' }
-        ]
-        /* workorder_type: [
-          { required: true, message: '工单类型不能为空', trigger: 'blur' }
-        ]*/
       },
       queryTypeOptions: [
         { key: 'workorder_code', display_name: '工单编号' },
         { key: 'point_code', display_name: '设备编码' }
       ],
-      workShopList: [],
-      regionList: [],
+      workorder_code: '',
+      productname: '',
       pointList: [],
-      regionCodeParam: null,
-      materialDialog: false,
       pointDetailDialog:false,
       message: null
     }
   },
   created() {
-    this.getWorkShopList()
-    this.getRegionList()
   },
   methods: {
-    item() {
-      return item
-    },
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    getWorkShopList() { // 获取车间列表
-      crudMdBaseWorkShop.getWorkShopList().then(res => {
-        this.workShopList = res
-      })
-    },
-    getRegionList() { // 获取区域列表
-      const param = {
-        is_has_workder: true
-      }
-      crudSchBaseRegion.getRegionList(param).then(res => {
-        this.regionList = res
-      })
-    },
-    getPointList() { // 获取点位列表
-      if (this.regionCodeParam) {
-        const param = {
-          region_code: this.regionCodeParam
-        }
-        crudSchBasePoint.getPointList(param).then(res => {
-          this.pointList = res
-          this.regionCodeParam = null
-        })
-      }
-    },
-    getMaterial() {
-      this.materialDialog = true
-    },
-    tableChanged(row) {
-      this.form.material_name = row.material_name
-      this.form.material_id = row.material_id
-      this.form.material_spec = row.material_spec
-      this.form.material_code = row.material_code
-    },
-    setRegionName(data) {
-      // 清空
-      this.form.point_code = null
-      this.form.point_name = null
-      this.regionCodeParam = data
-      var region = this.regionList.find(item => item.region_code === data)
-      this.form.region_name = region.region_name
-      this.getPointList()
-    },
-    setPointName(data) {
-      var point = this.pointList.find(item => item.point_code === data)
-      this.form.point_name = point.point_name
-    },
-    handOrderStatus(value) {
-      this.crud.query.more_order_status = null
-      if (value) {
-        this.crud.query.more_order_status = value.toString()
-      }
-      this.crud.toQuery()
-    },
     doOperate(row) {
       this.workorder_code=row.moname
       this.productname=row.productName
diff --git a/lms/nladmin-ui/src/views/wms/sch/data/index.vue b/lms/nladmin-ui/src/views/wms/sch/data/index.vue
index adc9696..c83dd5a 100644
--- a/lms/nladmin-ui/src/views/wms/sch/data/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/data/index.vue
@@ -19,15 +19,6 @@
               placeholder="选择日期时间"
             />
           </el-form-item>
-          <!-- <el-form-item label="结束时间">
-            <el-date-picker
-              v-model="form.end_time"
-              value-format="yyyy-MM-dd"
-              type="date"
-              style="width: 240px;"
-              placeholder="选择日期时间"
-            />
-          </el-form-item> -->
           <rrOperation />
         </el-form>
       </div>
@@ -69,53 +60,16 @@
 </template>
 
 <script>
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
-import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
-import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 
-const defaultForm = {
-  group_id: null,
-  vehicle_code: null,
-  vehicle_type: null,
-  material_id: null,
-  child_vehicle_code: null,
-  source_vehicle_code: null,
-  point_code: null,
-  point_name: null,
-  is_full: true,
-  pcsn: null,
-  instorage_time: null,
-  standing_time: null,
-  material_qty: null,
-  material_weight: null,
-  workorder_code: null,
-  group_number: null,
-  task_code: null,
-  ext_data: null,
-  workshop_code: null,
-  group_status: null,
-  table_name: null,
-  table_fk: null,
-  table_fk_id: null,
-  buss_move_id: null,
-  is_first_flow_task: true,
-  flow_code: null,
-  flow_num: null,
-  before_task_code: null,
-  next_task_code: null,
-  remark: null,
-  is_delete: false
-}
 export default {
   name: 'Data',
-  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
   components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '库存统计报表',
@@ -130,8 +84,8 @@ export default {
         reset: false
       },
       query: {
-      },
-      crudMethod: { }
+        //start_time: new Date().format('yyyy-MM-dd')
+      }
     })
   },
   data() {
@@ -140,62 +94,15 @@ export default {
       },
       rules: {
       },
-      workShopList: [],
-      pointList: [],
-      regionList: [],
-      supplierNameList: [],
-      productDescriptionList: [],
       choose: '物料'
     }
   },
   created() {
-    this.getWorkShopList()
-    this.getPointList()
-    this.getRegionList()
-    this.getSupplierNameList()
-    this.getProductDescriptionList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
-    },
-    getWorkShopList() { // 获取车间列表
-      crudMdBaseWorkShop.getWorkShopList().then(res => {
-        this.workShopList = res
-      })
-    },
-    getRegionList() {
-      crudSchBaseRegion.getRegionList().then(res => {
-        this.regionList = res
-      })
-    },
-    getPointList() { // 获取点位列表
-      crudSchBasePoint.getPointList().then(res => {
-        this.pointList = res
-      })
-    },
-    tableChanged(row) {
-      this.form.material_name = row.material_name
-      this.form.material_id = row.material_id
-      this.form.material_spec = row.material_spec
-      this.form.material_code = row.material_code
-      if (this.choose === '工单') {
-        this.form.workorder_code = row.workorder_code
-      }
-    },
-    clearMaterial() {
-      this.form.material_name = null
-      this.form.material_id = null
-      this.form.material_spec = null
-      this.form.material_code = null
-    },
-    setPointName(data) {
-      var point = this.pointList.find(item => item.point_code === data)
-      this.form.point_name = point.point_name
-    },
-    hand(value) {
-      this.crud.toQuery()
     }
   }
 }
diff --git a/lms/nladmin-ui/src/views/wms/sch/material/index.vue b/lms/nladmin-ui/src/views/wms/sch/material/index.vue
index a9226db..8928317 100644
--- a/lms/nladmin-ui/src/views/wms/sch/material/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/material/index.vue
@@ -308,7 +308,7 @@ const defaultForm = {
   is_delete: false
 }
 export default {
-  name: 'VehicleMaterialGroup',
+  name: 'Material',
   dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
   components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index ad2d903..3e7208b 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -621,11 +621,8 @@ export default {
       this.dialogVisible = true;
     },
     confirmMove() {
-      // Here, you can add your logic to call the backend API.
-      // For example, using axios to make a POST request:
       this.$axios.post('/api/schBaseTask/move', {  })
         .then(response => {
-          // Handle success response
           console.log(response.data);
         })
         .catch(error => {
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/schBasePoint.js b/lms/nladmin-ui/src/views/wms/sch/point/schBasePoint.js
index 7cf0215..5d9f0fd 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/schBasePoint.js
+++ b/lms/nladmin-ui/src/views/wms/sch/point/schBasePoint.js
@@ -39,6 +39,13 @@ export function getPointList(data) {
     data
   })
 }
+export function getPointsByRegionCodes(data) {
+  return request({
+    url: 'api/schBasePoint/getPointsByRegionCodes',
+    method: 'post',
+    data
+  })
+}
 export function getCBPointList(data) {
   data ={ region_code: 'CB' }
   return request({
@@ -48,4 +55,4 @@ export function getCBPointList(data) {
   })
 }
 
-export default { add, edit, del, changeUsed, getPointList,getCBPointList }
+export default { add, edit, del, changeUsed, getPointList,getCBPointList,getPointsByRegionCodes }
diff --git a/lms/nladmin-ui/src/views/wms/sch/report/index.vue b/lms/nladmin-ui/src/views/wms/sch/report/index.vue
index 851fec4..e8b188c 100644
--- a/lms/nladmin-ui/src/views/wms/sch/report/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/report/index.vue
@@ -17,7 +17,7 @@
               size="mini"
               placeholder="点位编码"
               class="filter-item"
-              filterable  
+              filterable
               @remote-method="getPointList"
             >
               <el-option
@@ -34,7 +34,7 @@
               size="mini"
               placeholder="区域编码"
               class="filter-item"
-              filterable  
+              filterable
               @remote-method="getRegionList"
             >
               <el-option
@@ -51,7 +51,7 @@
               size="mini"
               placeholder="供应商名称"
               class="filter-item"
-              filterable  
+              filterable
               @remote-method="getSupplierNameList"
             >
               <el-option
@@ -68,7 +68,7 @@
               size="mini"
               placeholder="物料名称"
               class="filter-item"
-              filterable  
+              filterable
               @remote-method="getProductDescriptionList"
             >
               <el-option
@@ -100,158 +100,6 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
-        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="母托盘编码">
-            <el-input v-model="form.vehicle_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="子托盘编码">
-            <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
-          </el-form-item>-->
-          <!-- <el-form-item v-if="false" label="来源载具">
-            <el-input v-model="form.source_vehicle_code" style="width: 240px;" />
-          </el-form-item> -->
-          <el-form-item label="托盘类型">
-            <el-radio-group v-model="form.vehicle_type" style="width: 240px">
-              <el-radio label="1">子托盘</el-radio>
-              <el-radio label="0">母托盘</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="回温开始时间">
-            <el-date-picker
-              v-model="form.instorage_time"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              style="width: 240px;"
-              placeholder="选择日期时间"
-            />
-          </el-form-item>
-          <el-form-item label="点位编码">
-            <el-select
-              v-model="form.point_code"
-              filterable
-              placeholder="请选择"
-              style="width: 240px;"
-              @change="setPointName"
-            >
-              <el-option
-                v-for="item in pointList"
-                :key="item.point_code"
-                :label="item.point_code"
-                :value="item.point_code"
-              >
-                <span style="float: left">{{ item.point_name }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
-              </el-option>
-            </el-select>
-            <!--            <el-input v-model="form.point_code" style="width: 240px;" />-->
-          </el-form-item>
-          <el-form-item label="点位名称">
-            <el-input v-model="form.point_name" style="width: 240px;" disabled />
-          </el-form-item>
-          <el-form-item label="是否满托">
-            <el-radio-group v-model="form.is_full" style="width: 240px">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="静置时间(分钟)">
-            <el-input-number
-              v-model.number="form.standing_time"
-              :min="1"
-              :max="999"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料数量">
-            <el-input-number
-              v-model.number="form.material_qty"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料重量">
-            <el-input-number
-              v-model.number="form.material_weight"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="工单编码">
-            <el-input v-model="form.workorder_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料来源">
-            <el-radio-group v-model="choose" size="mini" style="width: 240px;">
-              <el-radio-button label="物料" />
-              <el-radio-button label="工单" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料名称">
-            <el-input v-model="form.material_id" suffix-icon="el-icon-date" clearable style="width: 370px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料名称">
-            <el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input v-model="form.material_code" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料规格">
-            <el-input v-model="form.material_spec" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="组盘次数">
-            <el-input v-model="form.group_number" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="任务编码">
-            <el-input v-model="form.task_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="组盘状态">
-            <el-select
-              v-model="form.group_status"
-              size="mini"
-              placeholder="点位状态"
-              class="filter-item"
-              style="width: 240px;"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.group_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!--<el-form-item label="是否首个流程任务">
-            <el-input v-model="form.is_first_flow_task" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="流程编码">
-            <el-input v-model="form.flow_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="流程顺序">
-            <el-input v-model="form.flow_num" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="上一任务">
-            <el-input v-model="form.before_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="下一任务">
-            <el-input v-model="form.next_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-            <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
@@ -281,44 +129,10 @@ import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
 import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 
-const defaultForm = {
-  group_id: null,
-  vehicle_code: null,
-  vehicle_type: null,
-  material_id: null,
-  child_vehicle_code: null,
-  source_vehicle_code: null,
-  point_code: null,
-  point_name: null,
-  is_full: true,
-  pcsn: null,
-  instorage_time: null,
-  standing_time: null,
-  material_qty: null,
-  material_weight: null,
-  workorder_code: null,
-  group_number: null,
-  task_code: null,
-  ext_data: null,
-  workshop_code: null,
-  group_status: null,
-  table_name: null,
-  table_fk: null,
-  table_fk_id: null,
-  buss_move_id: null,
-  is_first_flow_task: true,
-  flow_code: null,
-  flow_num: null,
-  before_task_code: null,
-  next_task_code: null,
-  remark: null,
-  is_delete: false
-}
 export default {
-  name: 'VehicleMaterialGroup',
-  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
+  name: 'Report',
   components: {pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '组盘信息管理',
@@ -334,8 +148,7 @@ export default {
       },
       query: {
         group_bind_material_status: '2'
-      },
-      crudMethod: { ...crudMaterial }
+      }
     })
   },
   data() {
@@ -344,7 +157,6 @@ export default {
       },
       rules: {
       },
-      workShopList: [],
       pointList: [],
       regionList: [],
       supplierNameList: [],
@@ -354,7 +166,6 @@ export default {
     }
   },
   created() {
-    this.getWorkShopList()
     this.getPointList()
     this.getRegionList()
     this.getSupplierNameList()
@@ -366,11 +177,6 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    getWorkShopList() { // 获取车间列表
-      crudMdBaseWorkShop.getWorkShopList().then(res => {
-        this.workShopList = res
-      })
-    },
     getRegionList() {
       crudSchBaseRegion.getRegionList().then(res => {
         this.regionList = res
@@ -395,31 +201,6 @@ export default {
       crudMaterial.getIngotBatchList().then(res => {
         this.ingotBatchList = res.content
       })
-    },
-    tableChanged(row) {
-      this.form.material_name = row.material_name
-      this.form.material_id = row.material_id
-      this.form.material_spec = row.material_spec
-      this.form.material_code = row.material_code
-      if (this.choose === '工单') {
-        this.form.workorder_code = row.workorder_code
-      }
-    },
-    clearMaterial() {
-      this.form.material_name = null
-      this.form.material_id = null
-      this.form.material_spec = null
-      this.form.material_code = null
-    },
-    setPointName(data) {
-      var point = this.pointList.find(item => item.point_code === data)
-      this.form.point_name = point.point_name
-    },
-    hand(value) {
-      this.crud.toQuery()
-    },
-    getEffectiveLength(row) {
-      return (row.incomingLength - row.incomingchipping).toFixed(2);
     }
   }
 }
diff --git a/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue b/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue
index b39ac2b..ba3151d 100644
--- a/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue
+++ b/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue
@@ -92,158 +92,6 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
-        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="母托盘编码">
-            <el-input v-model="form.vehicle_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="子托盘编码">
-            <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
-          </el-form-item>-->
-          <!-- <el-form-item v-if="false" label="来源载具">
-            <el-input v-model="form.source_vehicle_code" style="width: 240px;" />
-          </el-form-item> -->
-          <el-form-item label="托盘类型">
-            <el-radio-group v-model="form.vehicle_type" style="width: 240px">
-              <el-radio label="1">子托盘</el-radio>
-              <el-radio label="0">母托盘</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="回温开始时间">
-            <el-date-picker
-              v-model="form.instorage_time"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              style="width: 240px;"
-              placeholder="选择日期时间"
-            />
-          </el-form-item>
-          <el-form-item label="点位编码">
-            <el-select
-              v-model="form.point_code"
-              filterable
-              placeholder="请选择"
-              style="width: 240px;"
-              @change="setPointName"
-            >
-              <el-option
-                v-for="item in pointList"
-                :key="item.point_code"
-                :label="item.point_code"
-                :value="item.point_code"
-              >
-                <span style="float: left">{{ item.point_name }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
-              </el-option>
-            </el-select>
-            <!--            <el-input v-model="form.point_code" style="width: 240px;" />-->
-          </el-form-item>
-          <el-form-item label="点位名称">
-            <el-input v-model="form.point_name" style="width: 240px;" disabled />
-          </el-form-item>
-          <el-form-item label="是否满托">
-            <el-radio-group v-model="form.is_full" style="width: 240px">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="静置时间(分钟)">
-            <el-input-number
-              v-model.number="form.standing_time"
-              :min="1"
-              :max="999"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料数量">
-            <el-input-number
-              v-model.number="form.material_qty"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料重量">
-            <el-input-number
-              v-model.number="form.material_weight"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="工单编码">
-            <el-input v-model="form.workorder_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料来源">
-            <el-radio-group v-model="choose" size="mini" style="width: 240px;">
-              <el-radio-button label="物料" />
-              <el-radio-button label="工单" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料名称">
-            <el-input v-model="form.material_id" suffix-icon="el-icon-date" clearable style="width: 370px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料名称">
-            <el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input v-model="form.material_code" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料规格">
-            <el-input v-model="form.material_spec" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="组盘次数">
-            <el-input v-model="form.group_number" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="任务编码">
-            <el-input v-model="form.task_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="组盘状态">
-            <el-select
-              v-model="form.group_status"
-              size="mini"
-              placeholder="点位状态"
-              class="filter-item"
-              style="width: 240px;"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.group_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!--<el-form-item label="是否首个流程任务">
-            <el-input v-model="form.is_first_flow_task" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="流程编码">
-            <el-input v-model="form.flow_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="流程顺序">
-            <el-input v-model="form.flow_num" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="上一任务">
-            <el-input v-model="form.before_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="下一任务">
-            <el-input v-model="form.next_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-            <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler" height="550">
         <el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
@@ -282,48 +130,12 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
-import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 
-const defaultForm = {
-  group_id: null,
-  vehicle_code: null,
-  vehicle_type: null,
-  material_id: null,
-  child_vehicle_code: null,
-  source_vehicle_code: null,
-  point_code: null,
-  point_name: null,
-  is_full: true,
-  pcsn: null,
-  instorage_time: null,
-  standing_time: null,
-  material_qty: null,
-  material_weight: null,
-  workorder_code: null,
-  group_number: null,
-  task_code: null,
-  ext_data: null,
-  workshop_code: null,
-  group_status: null,
-  table_name: null,
-  table_fk: null,
-  table_fk_id: null,
-  buss_move_id: null,
-  is_first_flow_task: true,
-  flow_code: null,
-  flow_num: null,
-  before_task_code: null,
-  next_task_code: null,
-  remark: null,
-  is_delete: false
-}
 export default {
-  name: 'VehicleMaterialGroup',
-  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
+  name: 'YclDetail',
   components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '晶棒库库存明细',
@@ -340,8 +152,7 @@ export default {
       query: {
         group_bind_material_status: '2',
         region_code: 'YL'
-      },
-      crudMethod: { ...crudMaterial }
+      }
     })
   },
   data() {
@@ -350,22 +161,16 @@ export default {
       },
       rules: {
       },
-      workShopList: [],
       pointList: [],
-      regionList: [],
       supplierNameList: [],
-      lotSNList: [],
       ingotBatchList: [],
       productDescriptionList: [],
       choose: '物料'
     }
   },
   created() {
-    this.getWorkShopList()
     this.getPointList()
-    this.getRegionList()
     this.getSupplierNameList()
-    // this.getLotSNList()
     this.getIngotBatchList()
     this.getProductDescriptionList()
   },
@@ -374,16 +179,6 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    getWorkShopList() { // 获取车间列表
-      crudMdBaseWorkShop.getWorkShopList().then(res => {
-        this.workShopList = res
-      })
-    },
-    getRegionList() {
-      crudSchBaseRegion.getRegionList().then(res => {
-        this.regionList = res
-      })
-    },
     getPointList() { // 获取点位列表
       crudSchBasePoint.getPointList().then(res => {
         this.pointList = res
@@ -394,11 +189,6 @@ export default {
         this.supplierNameList = res.content
       })
     },
-    getLotSNList() {
-      crudMaterial.getLotSNList().then(res => {
-        this.lotSNList = res.content
-      })
-    },
     getProductDescriptionList() {
       crudMaterial.getProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
@@ -409,28 +199,6 @@ export default {
         this.ingotBatchList = res.content
       })
     },
-    tableChanged(row) {
-      this.form.material_name = row.material_name
-      this.form.material_id = row.material_id
-      this.form.material_spec = row.material_spec
-      this.form.material_code = row.material_code
-      if (this.choose === '工单') {
-        this.form.workorder_code = row.workorder_code
-      }
-    },
-    clearMaterial() {
-      this.form.material_name = null
-      this.form.material_id = null
-      this.form.material_spec = null
-      this.form.material_code = null
-    },
-    setPointName(data) {
-      var point = this.pointList.find(item => item.point_code === data)
-      this.form.point_name = point.point_name
-    },
-    hand(value) {
-      this.crud.toQuery()
-    },
     getEffectiveLength(row) {
       return (row.incomingLength - row.incomingchipping).toFixed(2);
     }
diff --git a/lms/nladmin-ui/src/views/wms/ycl/in/index.vue b/lms/nladmin-ui/src/views/wms/ycl/in/index.vue
index f5a4082..01e379e 100644
--- a/lms/nladmin-ui/src/views/wms/ycl/in/index.vue
+++ b/lms/nladmin-ui/src/views/wms/ycl/in/index.vue
@@ -92,158 +92,6 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
-        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="母托盘编码">
-            <el-input v-model="form.vehicle_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="子托盘编码">
-            <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
-          </el-form-item>-->
-          <!-- <el-form-item v-if="false" label="来源载具">
-            <el-input v-model="form.source_vehicle_code" style="width: 240px;" />
-          </el-form-item> -->
-          <el-form-item label="托盘类型">
-            <el-radio-group v-model="form.vehicle_type" style="width: 240px">
-              <el-radio label="1">子托盘</el-radio>
-              <el-radio label="0">母托盘</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="回温开始时间">
-            <el-date-picker
-              v-model="form.instorage_time"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              style="width: 240px;"
-              placeholder="选择日期时间"
-            />
-          </el-form-item>
-          <el-form-item label="点位编码">
-            <el-select
-              v-model="form.point_code"
-              filterable
-              placeholder="请选择"
-              style="width: 240px;"
-              @change="setPointName"
-            >
-              <el-option
-                v-for="item in pointList"
-                :key="item.point_code"
-                :label="item.point_code"
-                :value="item.point_code"
-              >
-                <span style="float: left">{{ item.point_name }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
-              </el-option>
-            </el-select>
-            <!--            <el-input v-model="form.point_code" style="width: 240px;" />-->
-          </el-form-item>
-          <el-form-item label="点位名称">
-            <el-input v-model="form.point_name" style="width: 240px;" disabled />
-          </el-form-item>
-          <el-form-item label="是否满托">
-            <el-radio-group v-model="form.is_full" style="width: 240px">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="静置时间(分钟)">
-            <el-input-number
-              v-model.number="form.standing_time"
-              :min="1"
-              :max="999"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料数量">
-            <el-input-number
-              v-model.number="form.material_qty"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料重量">
-            <el-input-number
-              v-model.number="form.material_weight"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="工单编码">
-            <el-input v-model="form.workorder_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料来源">
-            <el-radio-group v-model="choose" size="mini" style="width: 240px;">
-              <el-radio-button label="物料" />
-              <el-radio-button label="工单" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料名称">
-            <el-input v-model="form.material_id" suffix-icon="el-icon-date" clearable style="width: 370px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料名称">
-            <el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input v-model="form.material_code" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料规格">
-            <el-input v-model="form.material_spec" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="组盘次数">
-            <el-input v-model="form.group_number" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="任务编码">
-            <el-input v-model="form.task_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="组盘状态">
-            <el-select
-              v-model="form.group_status"
-              size="mini"
-              placeholder="点位状态"
-              class="filter-item"
-              style="width: 240px;"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.group_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!--<el-form-item label="是否首个流程任务">
-            <el-input v-model="form.is_first_flow_task" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="流程编码">
-            <el-input v-model="form.flow_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="流程顺序">
-            <el-input v-model="form.flow_num" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="上一任务">
-            <el-input v-model="form.before_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="下一任务">
-            <el-input v-model="form.next_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-            <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="550" @selection-change="crud.selectionChangeHandler">
         <el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
@@ -282,48 +130,12 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
-import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 
-const defaultForm = {
-  group_id: null,
-  vehicle_code: null,
-  vehicle_type: null,
-  material_id: null,
-  child_vehicle_code: null,
-  source_vehicle_code: null,
-  point_code: null,
-  point_name: null,
-  is_full: true,
-  pcsn: null,
-  instorage_time: null,
-  standing_time: null,
-  material_qty: null,
-  material_weight: null,
-  workorder_code: null,
-  group_number: null,
-  task_code: null,
-  ext_data: null,
-  workshop_code: null,
-  group_status: null,
-  table_name: null,
-  table_fk: null,
-  table_fk_id: null,
-  buss_move_id: null,
-  is_first_flow_task: true,
-  flow_code: null,
-  flow_num: null,
-  before_task_code: null,
-  next_task_code: null,
-  remark: null,
-  is_delete: false
-}
 export default {
-  name: 'VehicleMaterialGroup',
-  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
+  name: 'YlrIn',
   components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '晶棒库库存明细',
@@ -338,8 +150,7 @@ export default {
         reset: false
       },
       query: {
-      },
-      crudMethod: { ...crudMaterial }
+      }
     })
   },
   data() {
@@ -348,22 +159,16 @@ export default {
       },
       rules: {
       },
-      workShopList: [],
       pointList: [],
-      regionList: [],
       supplierNameList: [],
-      lotSNList: [],
       ingotBatchList: [],
       productDescriptionList: [],
       choose: '物料'
     }
   },
   created() {
-    this.getWorkShopList()
     this.getPointList()
-    this.getRegionList()
     this.getSupplierNameList()
-    // this.getLotSNList()
     this.getIngotBatchList()
     this.getProductDescriptionList()
   },
@@ -372,16 +177,6 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    getWorkShopList() { // 获取车间列表
-      crudMdBaseWorkShop.getWorkShopList().then(res => {
-        this.workShopList = res
-      })
-    },
-    getRegionList() {
-      crudSchBaseRegion.getRegionList().then(res => {
-        this.regionList = res
-      })
-    },
     getPointList() { // 获取点位列表
       crudSchBasePoint.getPointList().then(res => {
         this.pointList = res
@@ -392,11 +187,6 @@ export default {
         this.supplierNameList = res.content
       })
     },
-    getLotSNList() {
-      crudMaterial.getLotSNList().then(res => {
-        this.lotSNList = res.content
-      })
-    },
     getProductDescriptionList() {
       crudMaterial.getProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
@@ -407,28 +197,6 @@ export default {
         this.ingotBatchList = res.content
       })
     },
-    tableChanged(row) {
-      this.form.material_name = row.material_name
-      this.form.material_id = row.material_id
-      this.form.material_spec = row.material_spec
-      this.form.material_code = row.material_code
-      if (this.choose === '工单') {
-        this.form.workorder_code = row.workorder_code
-      }
-    },
-    clearMaterial() {
-      this.form.material_name = null
-      this.form.material_id = null
-      this.form.material_spec = null
-      this.form.material_code = null
-    },
-    setPointName(data) {
-      var point = this.pointList.find(item => item.point_code === data)
-      this.form.point_name = point.point_name
-    },
-    hand(value) {
-      this.crud.toQuery()
-    },
     getEffectiveLength(row) {
       return (row.incomingLength - row.incomingchipping).toFixed(2)
     }
diff --git a/lms/nladmin-ui/src/views/wms/ycl/out/index.vue b/lms/nladmin-ui/src/views/wms/ycl/out/index.vue
index 0724585..3bc1f47 100644
--- a/lms/nladmin-ui/src/views/wms/ycl/out/index.vue
+++ b/lms/nladmin-ui/src/views/wms/ycl/out/index.vue
@@ -92,158 +92,6 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
-        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="母托盘编码">
-            <el-input v-model="form.vehicle_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="子托盘编码">
-            <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
-          </el-form-item>-->
-          <!-- <el-form-item v-if="false" label="来源载具">
-            <el-input v-model="form.source_vehicle_code" style="width: 240px;" />
-          </el-form-item> -->
-          <el-form-item label="托盘类型">
-            <el-radio-group v-model="form.vehicle_type" style="width: 240px">
-              <el-radio label="1">子托盘</el-radio>
-              <el-radio label="0">母托盘</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="回温开始时间">
-            <el-date-picker
-              v-model="form.instorage_time"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              style="width: 240px;"
-              placeholder="选择日期时间"
-            />
-          </el-form-item>
-          <el-form-item label="点位编码">
-            <el-select
-              v-model="form.point_code"
-              filterable
-              placeholder="请选择"
-              style="width: 240px;"
-              @change="setPointName"
-            >
-              <el-option
-                v-for="item in pointList"
-                :key="item.point_code"
-                :label="item.point_code"
-                :value="item.point_code"
-              >
-                <span style="float: left">{{ item.point_name }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
-              </el-option>
-            </el-select>
-            <!--            <el-input v-model="form.point_code" style="width: 240px;" />-->
-          </el-form-item>
-          <el-form-item label="点位名称">
-            <el-input v-model="form.point_name" style="width: 240px;" disabled />
-          </el-form-item>
-          <el-form-item label="是否满托">
-            <el-radio-group v-model="form.is_full" style="width: 240px">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="静置时间(分钟)">
-            <el-input-number
-              v-model.number="form.standing_time"
-              :min="1"
-              :max="999"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料数量">
-            <el-input-number
-              v-model.number="form.material_qty"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="物料重量">
-            <el-input-number
-              v-model.number="form.material_weight"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="工单编码">
-            <el-input v-model="form.workorder_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料来源">
-            <el-radio-group v-model="choose" size="mini" style="width: 240px;">
-              <el-radio-button label="物料" />
-              <el-radio-button label="工单" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料名称">
-            <el-input v-model="form.material_id" suffix-icon="el-icon-date" clearable style="width: 370px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料名称">
-            <el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input v-model="form.material_code" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="物料规格">
-            <el-input v-model="form.material_spec" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="组盘次数">
-            <el-input v-model="form.group_number" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="任务编码">
-            <el-input v-model="form.task_code" style="width: 240px;" />
-          </el-form-item>
-          <!--<el-form-item label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="组盘状态">
-            <el-select
-              v-model="form.group_status"
-              size="mini"
-              placeholder="点位状态"
-              class="filter-item"
-              style="width: 240px;"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.group_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!--<el-form-item label="是否首个流程任务">
-            <el-input v-model="form.is_first_flow_task" style="width: 240px;" />
-          </el-form-item>-->
-          <el-form-item label="流程编码">
-            <el-input v-model="form.flow_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="流程顺序">
-            <el-input v-model="form.flow_num" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="上一任务">
-            <el-input v-model="form.before_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="下一任务">
-            <el-input v-model="form.next_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-            <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="550" @selection-change="crud.selectionChangeHandler">
         <el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
@@ -282,48 +130,12 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
-import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 
-const defaultForm = {
-  group_id: null,
-  vehicle_code: null,
-  vehicle_type: null,
-  material_id: null,
-  child_vehicle_code: null,
-  source_vehicle_code: null,
-  point_code: null,
-  point_name: null,
-  is_full: true,
-  pcsn: null,
-  instorage_time: null,
-  standing_time: null,
-  material_qty: null,
-  material_weight: null,
-  workorder_code: null,
-  group_number: null,
-  task_code: null,
-  ext_data: null,
-  workshop_code: null,
-  group_status: null,
-  table_name: null,
-  table_fk: null,
-  table_fk_id: null,
-  buss_move_id: null,
-  is_first_flow_task: true,
-  flow_code: null,
-  flow_num: null,
-  before_task_code: null,
-  next_task_code: null,
-  remark: null,
-  is_delete: false
-}
 export default {
-  name: 'VehicleMaterialGroup',
-  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
+  name: 'YlcOut',
   components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
+  mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '晶棒库库存明细',
@@ -338,8 +150,7 @@ export default {
         reset: false
       },
       query: {
-      },
-      crudMethod: { ...crudMaterial }
+      }
     })
   },
   data() {
@@ -348,22 +159,16 @@ export default {
       },
       rules: {
       },
-      workShopList: [],
       pointList: [],
-      regionList: [],
       supplierNameList: [],
-      lotSNList: [],
       ingotBatchList: [],
       productDescriptionList: [],
       choose: '物料'
     }
   },
   created() {
-    this.getWorkShopList()
     this.getPointList()
-    this.getRegionList()
     this.getSupplierNameList()
-    // this.getLotSNList()
     this.getIngotBatchList()
     this.getProductDescriptionList()
   },
@@ -372,16 +177,6 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    getWorkShopList() { // 获取车间列表
-      crudMdBaseWorkShop.getWorkShopList().then(res => {
-        this.workShopList = res
-      })
-    },
-    getRegionList() {
-      crudSchBaseRegion.getRegionList().then(res => {
-        this.regionList = res
-      })
-    },
     getPointList() { // 获取点位列表
       crudSchBasePoint.getPointList().then(res => {
         this.pointList = res
@@ -392,11 +187,6 @@ export default {
         this.supplierNameList = res.content
       })
     },
-    getLotSNList() {
-      crudMaterial.getLotSNList().then(res => {
-        this.lotSNList = res.content
-      })
-    },
     getProductDescriptionList() {
       crudMaterial.getProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
@@ -407,28 +197,6 @@ export default {
         this.ingotBatchList = res.content
       })
     },
-    tableChanged(row) {
-      this.form.material_name = row.material_name
-      this.form.material_id = row.material_id
-      this.form.material_spec = row.material_spec
-      this.form.material_code = row.material_code
-      if (this.choose === '工单') {
-        this.form.workorder_code = row.workorder_code
-      }
-    },
-    clearMaterial() {
-      this.form.material_name = null
-      this.form.material_id = null
-      this.form.material_spec = null
-      this.form.material_code = null
-    },
-    setPointName(data) {
-      var point = this.pointList.find(item => item.point_code === data)
-      this.form.point_name = point.point_name
-    },
-    hand(value) {
-      this.crud.toQuery()
-    },
     getEffectiveLength(row) {
       return (row.incomingLength - row.incomingchipping).toFixed(2)
     }
diff --git a/lms/nladmin-ui/src/views/wms/ycl/outdetail/detail.js b/lms/nladmin-ui/src/views/wms/ycl/outdetail/detail.js
new file mode 100644
index 0000000..4be38c4
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/ycl/outdetail/detail.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/report',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/report/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/report',
+    method: 'put',
+    data
+  })
+}
+
+export function getGroup(data) {
+  return request({
+    url: 'api/report/getGroup',
+    method: 'post',
+    data
+  })
+}
+
+export function getSupplierNameList(data) {
+  return request({
+    url: 'api/report/getSupplierNameList',
+    method: 'get',
+    data
+  })
+}
+
+export function getProductDescriptionList(data) {
+  return request({
+    url: 'api/report/getProductDescriptionList',
+    method: 'get',
+    data
+  })
+}
+
+export function getLotSNList(data) {
+  return request({
+    url: 'api/report/getLotSNList',
+    method: 'get',
+    data
+  })
+}
+
+export function getIngotBatchList(data) {
+  return request({
+    url: 'api/report/getIngotBatchList',
+    method: 'get',
+    data
+  })
+}
+
+export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList,getIngotBatchList }
diff --git a/lms/nladmin-ui/src/views/wms/ycl/outdetail/index.vue b/lms/nladmin-ui/src/views/wms/ycl/outdetail/index.vue
new file mode 100644
index 0000000..65d01e4
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/ycl/outdetail/index.vue
@@ -0,0 +1,342 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="点位编码">
+            <el-select
+              v-model="query.point_code"
+              clearable
+              size="mini"
+              placeholder="点位编码"
+              class="filter-item"
+              filterable
+              @remote-method="getPointList"
+            >
+              <el-option
+                v-for="item in pointList"
+                :label="item.point_code"
+                :value="item.point_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="供应商名称">
+            <el-select
+              v-model="query.supplierName"
+              clearable
+              size="mini"
+              placeholder="供应商名称"
+              class="filter-item"
+              filterable
+              @remote-method="getSupplierNameList"
+            >
+              <el-option
+                v-for="item in supplierNameList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料名称">
+            <el-select
+              v-model="query.productDescription"
+              clearable
+              size="mini"
+              placeholder="物料名称"
+              class="filter-item"
+              filterable
+              @remote-method="getProductDescriptionList"
+            >
+              <el-option
+                v-for="item in productDescriptionList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="批次">
+            <el-select
+              v-model="query.ingotBatch"
+              clearable
+              size="mini"
+              placeholder="批次"
+              class="filter-item"
+              filterable
+              @remote-method="getIngotBatchList"
+            >
+              <el-option
+                v-for="item in ingotBatchList"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工单状态">
+            <el-select
+              v-model="query.status"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.work_order_two_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="每托根数">
+            <el-input-number
+              v-model="query.number"
+              filterable
+              laceholder="每托根数"
+              clearable
+              controls-position="right"
+              :min="0"
+              :max="10000"
+              :step="10"
+              size="mini"
+            >
+            </el-input-number>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          :disabled="confirm_flag"
+          icon="el-icon-check"
+          size="mini"
+          @click="confirm"
+        >
+          提交出库
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          :disabled="cancle_flag"
+          icon="el-icon-close"
+          size="mini"
+          @click="cancle"
+        >
+          取消出库
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table ref="table"
+                v-loading="crud.loading"
+                :data="crud.data"
+                size="mini"
+                :cell-style="cellStyle"
+                style="width: 100%;"
+                @selection-change="handleSelectionChange"
+                height="550">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="pointCode" label="点位名称" :min-width="flexWidth('pointCode',crud.data,'点位名称')" />
+        <el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" />
+        <el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
+        <el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
+<!--        <el-table-column prop="somtOrderNo" label="出库单号" :min-width="flexWidth('somtOrderNo',crud.data,'出库单号')" />-->
+        <el-table-column prop="moname" label="生产工单" :min-width="flexWidth('moname',crud.data,'生产工单')" />
+        <el-table-column prop="status" label="工单状态" :formatter="format_work_order_two_status" :min-width="flexWidth('status',crud.data,'工单状态')" />
+        <el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
+        <el-table-column prop="productDescription" label="物料编码" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
+        <el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
+        <el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
+        <el-table-column prop="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
+        <el-table-column prop="updateTime" label="入库时间" :min-width="flexWidth('updateTime',crud.data,'入库时间')" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudMaterial from './detail'
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
+
+export default {
+  name: 'outdetail',
+  dicts: ['work_order_two_status'],
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), crud()],
+  cruds() {
+    return CRUD({
+      title: '晶棒库出库库存明细',
+      url: 'api/report/yl/outdetail',
+      idField: 'group_id',
+      sort: 'pointCode,desc',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: false
+      },
+      query: {
+        group_bind_material_status: '2'
+      }
+    })
+  },
+  data() {
+    return {
+      permission: {
+      },
+      cancle_flag: false,
+      confirm_flag: false,
+      rows: [],
+      pointList: [],
+      supplierNameList: [],
+      ingotBatchList: [],
+      productDescriptionList: [],
+      choose: '物料'
+    }
+  },
+  created() {
+    this.getPointList()
+    this.getSupplierNameList()
+    this.getIngotBatchList()
+    this.getProductDescriptionList()
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      this.handleCurrentChange(null)
+      return true
+    },
+    confirm() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选托盘!')
+        return
+      }
+
+      // 获取选中行的托盘号 subTray
+      const palletSNs = this.rows.map(row => row.subTray);
+      // 弹出输入回温时间和回温模式的对话框
+        this.$prompt('请输入回温模式（0-普通模式，1-快速模式）', '提示', {
+          inputPattern: /^[0-1]$/,
+          inputErrorMessage: '输入内容必须是 0 或 1',
+          confirmButtonText: '确定',
+          cancelButtonText: '取消'
+        }).then(({ value: mode }) => {
+          // 提交数据给后台接口
+          this.$axios.post('/api/workorder/batchChange', {
+            pointCodes : palletSNs,
+            mode : mode,
+            status : '1'
+          }).then(response => {
+            // 提交成功处理
+            this.$message.success('出库提交成功！');
+            this.crud.toQuery()
+          }).catch(error => {
+            // 提交失败处理
+            this.$message.error('出库提交失败，请重试');
+          });
+        })
+    },
+    cancle() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选托盘!')
+        return
+      }
+      // 获取选中行的托盘号 subTray
+      const palletSNs = this.rows.map(row => row.subTray);
+        // 提交数据给后台接口
+        this.$axios.post('/api/workorder/batchChange', {
+          pointCodes : palletSNs,
+          mode : '0',
+          status : '0'
+        }).then(response => {
+          // 提交成功处理
+          this.$message.success('出库取消成功！');
+          this.crud.toQuery()
+        }).catch(error => {
+          // 提交失败处理
+          this.$message.error('出库取消失败，请重试');
+        });
+    },
+    handleSelectionChange(val, row) {
+      this.rows = this.$refs.table.selection
+      var strs = '';
+      this.handleCurrentChange(null)
+      if (this.rows.length > 0) {
+        this.rows.forEach(now => {
+          strs += now.status
+        })
+        if(strs.indexOf('1') != -1){
+          this.confirm_flag = true
+        }
+        if(strs.indexOf('0') != -1){
+          this.cancle_flag = true
+        }
+      }
+    },
+    handleCurrentChange(current) {
+      if (current === null) {
+        this.cancle_flag = false
+        this.confirm_flag = false
+      }
+    },
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      const status = row.status
+
+        if (column.property === 'status') {
+          if (status == '1') {
+            return 'background: #13ce66'
+          }else {
+            return 'background: #FFBA00'
+          }
+        }
+    },
+    format_work_order_two_status(row, column) {
+      return this.dict.label.work_order_two_status[row.status]
+    },
+    getPointList() { // 获取点位列表
+      crudSchBasePoint.getPointsByRegionCodes("YL,YLHC,KJHC").then(res => {
+        this.pointList = res
+      })
+    },
+    getSupplierNameList() {
+      crudMaterial.getSupplierNameList().then(res => {
+        this.supplierNameList = res.content
+      })
+    },
+    getProductDescriptionList() {
+      crudMaterial.getProductDescriptionList().then(res => {
+        this.productDescriptionList = res.content
+      })
+    },
+    getIngotBatchList() {
+      crudMaterial.getIngotBatchList().then(res => {
+        this.ingotBatchList = res.content
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>