diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
index 860d8465..5ac74b96 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
@@ -1,5 +1,9 @@
 package org.nl.common.domain.constant;
 
+import org.nl.common.utils.MapOf;
+
+import java.util.Map;
+
 /*
  * @author ZZQ
  * @Date 2022/12/26 9:29 上午
@@ -8,4 +12,5 @@ public class DictConstantPool {
 
     public static final String DICT_SYS_CODE = "system_type";
     public static final String DICT_SYS_NAME = "所属系统";
+    public static final Map<String,String> PRODUCT_OUT_POINT = MapOf.of("A1","1101","A2","2114","A3","3204");
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/ApiError.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/ApiError.java
index 1c6eb4b6..52b4c43d 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/ApiError.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/ApiError.java
@@ -15,7 +15,6 @@
  */
 package org.nl.common.domain.exception.handler;
 
-import cn.hutool.http.HttpStatus;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -30,10 +29,10 @@ import java.time.LocalDateTime;
 @Data
 class ApiError {
 
-    private String status = "400";
+    private String code = "400";
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timestamp;
-    private String message;
+    private String msg;
 
     private ApiError() {
         timestamp = LocalDateTime.now();
@@ -41,14 +40,14 @@ class ApiError {
 
     public static ApiError error(String message){
         ApiError apiError = new ApiError();
-        apiError.setMessage(message);
+        apiError.setMsg(message);
         return apiError;
     }
 
     public static ApiError error(Integer status, String message){
         ApiError apiError = new ApiError();
-        apiError.setStatus(String.valueOf(status));
-        apiError.setMessage(message);
+        apiError.setCode(String.valueOf(status));
+        apiError.setMsg(message);
         return apiError;
     }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/GlobalExceptionHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/GlobalExceptionHandler.java
index a42fe876..96e5eb53 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/GlobalExceptionHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/GlobalExceptionHandler.java
@@ -85,6 +85,6 @@ public class GlobalExceptionHandler {
      * 统一返回
      */
     private ResponseEntity<ApiError> buildResponseEntity(ApiError apiError) {
-        return new ResponseEntity<>(apiError, HttpStatus.valueOf(Integer.valueOf(apiError.getStatus())));
+        return new ResponseEntity<>(apiError, HttpStatus.valueOf(Integer.valueOf(apiError.getCode())));
     }
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java
index c27c61bf..acfb7aa5 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java
@@ -31,13 +31,15 @@ public enum StatusEnum {
     /**
      * 出入库单据类型
      */
-    IOBILL_TYPE_IN(ForkMap.of("生产入库", "10","inStorageTask", "调拨入库", "11","inStorageTask", "退货入库", "12","inStorageTask","拣选回库", "13","inStorageTask","托盘入库", "30","inStorageTask")),
-    IOBILL_TYPE_OUT(ForkMap.of("销售出库", "20","outStorageTask","生产出库", "21","outStorageTask", "调拨出库", "22","outStorageTask", "拣选出库", "23","conveyorOutStorageTask","托盘出库", "40","outStorageTask")),
+    IOBILL_TYPE_IN(ForkMap.of("生产入库", "10","inStorageTask", "调拨入库", "11","inStorageTask", "退货入库", "12","inStorageTask","拣选回库", "13","inStorageTask","盘点入库", "14","inStorageTask","托盘入库", "30","inStorageTask")),
+    IOBILL_TYPE_OUT(ForkMap.of("销售出库", "20","outStorageTask","生产出库", "21","outStorageTask", "调拨出库", "22","outStorageTask","拣选出库", "23","conveyorOutStorageTask","盘点出库", "24","outStorageTask", "托盘出库", "40","outStorageTask")),
+    IOBILL_TYPE_MOVE(ForkMap.of("移库", "50","moveStorageTask")),
+    profit_loss(ForkMap.of("盘亏", "0",null,"盘盈", "1",null,"实盘", "2",null)),
 
     /**
      * 任务类型
       */
-    TASK_TYPE(ForkMap.pushAll(IOBILL_TYPE_IN.code,IOBILL_TYPE_OUT.code)),
+    TASK_TYPE(ForkMap.pushAll(IOBILL_TYPE_IN.code,IOBILL_TYPE_OUT.code,IOBILL_TYPE_MOVE.code)),
 
     ACS_TYPE(ForkMap.of("立库", "10",null
             ,"海柔", "20",null
@@ -47,7 +49,7 @@ public enum StatusEnum {
     /**
      * 点位锁类型
      */
-    LOCK(ForkMap.of("无","00",null,"入","10",null,"出","20",null)),
+    LOCK(ForkMap.of("无锁","00",null,"入库锁","10",null,"入库盘点锁","16",null,"出库锁","20",null,"盘点出库锁","26",null,"移库锁","50",null)),
     STRATEGY_TYPE(ForkMap.of("入库", "1",null, "出库", "2", null,"出入库", "3",null)),
     ;
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpelUtil.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpelUtil.java
index 0cff1667..828383a9 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpelUtil.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpelUtil.java
@@ -105,35 +105,10 @@ public class SpelUtil {
     }
 
     public static void main(String[] args) {
-        TypeReference<Class<JSONArray>> typeRef = new TypeReference<Class<JSONArray>>() {};
-        ParameterizedType type = (ParameterizedType) typeRef.getType();
-        Type type1 = type.getActualTypeArguments()[0];
-        Class aClass = (Class) type1;
-        String a="{\n" +
-                "\t\"code\": \"REC10022\",\n" +
-                "\t\"t\": {\n" +
-                "\t\t\"form_data\": {\n" +
-                "\t\t\t\"stor_code\": \"\",\n" +
-                "\t\t\t\"struct_code\": \"\",\n" +
-                "\t\t\t\"order\": \"\"\n" +
-                "\t\t},\n" +
-                "\t\t\"stor_code\": \"FStockId\",\n" +
-                "\t\t\"pcsn\": \"werwe\",\n" +
-                "\t\t\"material_id\": \"FMaterialId\",\n" +
-                "\t\t\"biz_id\": \"1793594766324273152\",\n" +
-                "\t\t\"order\": \"FMoBillNo\"\n" +
-                "\t},\n" +
-                "\t\"create_time\": \"2024-05-23 18:48:31\",\n" +
-                "\t\"form_id\": \"\",\n" +
-                "\t\"id\": \"1793594856053018624\",\n" +
-                "\t\"form_type\": \"PRD_FeedMtrl\",\n" +
-                "\t\"source_form_id\": \"1793594766324273152\",\n" +
-                "\t\"source_form_type\": \"st_ivt_iostorinvdtl_in\",\n" +
-                "\t\"status\": \"10\",\n" +
-                "\t\"create_name\": \"管理员\"\n" +
-                "}";
-        Object o = JSONObject.parseObject(a, aClass);
-        System.out.println(o.toString());
+        String a= "{\"item\":[{\"t\":{\"stor_code\":\"FStockId\",\"create_time\":\"2024-06-19 11:13:06\",\"task_code\":\"28510\",\"material_spec\":\"45CCL1 1/8\",\"form_data\":{},\"group_id\":\"1803264719126138880\",\"qty\":120,\"proc_inst_id\":\"1803320414961799168\",\"is_lock\":false,\"pcsn\":\"11\",\"material_id\":\"FMaterialId\",\"id\":\"1803264718849314816\",\"has_child\":false,\"frozen_qty\":0,\"vehicle_code\":\"D00012\",\"source_form_id\":\"1803264490947612672\",\"unit_id\":\"16\",\"material_name\":\"A345度等径承插口弯头45CCL1 1/8USNA0131010\",\"source_form_type\":\"st_ivt_iostorinvdtl\",\"create_name\":\"管理员\",\"material_code\":\"24001097S\"},\"form_id\":\"1803264718849314816\",\"form_type\":\"md_pb_vehicleMater\",\"source_form_id\":\"1803264490947612672\",\"source_form_type\":\"st_ivt_iostorinvdtl\"}],\"t\":{\"code\":\"ZP20240619023\",\"stor_code\":\"FStockId\",\"create_time\":\"2024-06-19 11:13:06\",\"update_name\":\"管理员\",\"update_time\":\"2024-06-19 11:15:31\",\"form_data\":{},\"id\":\"1803264719126138880\",\"vehicle_code\":\"D00012\",\"source_form_id\":\"1803264490947612672\",\"struct_code\":\"L03-03-01\",\"source_form_type\":\"st_ivt_iostorinvdtl\",\"status\":\"10\",\"create_name\":\"管理员\"},\"form_id\":\"1803264719126138880\",\"form_type\":\"md_group_dick\",\"source_form_id\":\"1803264490947612672\",\"source_form_type\":\"st_ivt_iostorinvdtl\"}";
+        JSONObject jsonObject = JSONObject.parseObject(a);
+        String parse = SpelUtil.parse(jsonObject.getJSONObject("t"),"#M['stor_code'] == 'FStockId'", String.class);
+        System.out.println(parse);
     }
 
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
index 3fc62275..d19fe2c3 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
@@ -1,13 +1,19 @@
 package org.nl.config.mybatis;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.github.pagehelper.PageInterceptor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.SqlCommandType;
 import org.apache.ibatis.plugin.Interceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -16,6 +22,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.Map;
 
 @EnableTransactionManagement
 @Configuration
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java
index ebd62f50..552154f9 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java
@@ -45,7 +45,7 @@ public class BmClassStandardController {
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody JSONObject form) {
         classStandardService.create(form);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java
index b8d9c99b..c1844331 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java
@@ -49,7 +49,7 @@ public class BmCustomerController {
     @Log("新增客户基础表")
     public ResponseEntity<Object> create(@Validated @RequestBody JSONObject dto) {
         customerService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java
index 864a3898..b1a20e08 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java
@@ -41,7 +41,7 @@ public class BmMaterialController {
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody MdMeMaterialbase dto) {
         materialService.save(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/MdMeMaterialbase.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/MdMeMaterialbase.java
index 0483fea4..ed59e8eb 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/MdMeMaterialbase.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/MdMeMaterialbase.java
@@ -109,16 +109,26 @@ public class MdMeMaterialbase implements Serializable {
      */
     private String weight_unit_id;
 
-    /**
-     * 物料毛重
-     */
-    private BigDecimal gross_weight;
 
     /**
      * 物料净重
      */
     private BigDecimal net_weight;
 
+
+    /**
+     * 最近称重重量
+     */
+    private BigDecimal nearby_weight;
+    /**
+     * 单重
+     */
+    private BigDecimal single_weight;
+
+    /**
+     * 物料毛重
+     */
+    private BigDecimal gross_weight;
     /**
      * 体积单位
      */
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java
index 10f39d0a..f1ab452a 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java
@@ -40,7 +40,7 @@ public class BmSupplierController {
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody BmSupplier dto) {
         supplierService.save(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java
index 51b546f8..98282914 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java
@@ -44,7 +44,7 @@ public class BmVehicleInfoController {
     @PostMapping
     @Log("新增载具")
     public ResponseEntity<Object> create(@RequestBody JSONObject map) {
-        return new ResponseEntity<>(vehicleInfoService.create(map), HttpStatus.CREATED);
+        return new ResponseEntity<>(vehicleInfoService.create(map), HttpStatus.OK);
     }
 
     @PutMapping
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/EndDecisionChainer.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/EndDecisionChainer.java
index ac242e6a..503a66dc 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/EndDecisionChainer.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/EndDecisionChainer.java
@@ -53,7 +53,7 @@ public class EndDecisionChainer extends DecisionerChain<List> {
             StIvtStructattr structattr = (StIvtStructattr)transfers.get(0);
             iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
                     .set("vehicle_code", startParam.getString("vehicle_code"))
-                    .set("lock_type", StatusEnum.LOCK.code("入"))
+                    .set("lock_type", StatusEnum.LOCK.code("入库锁"))
                     .eq("struct_code", structattr.getStruct_code()));
             System.out.println("货位绑定成功"+structattr.getStruct_code());
             structs.add(structattr.getStruct_code());
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/StartDecisionChainer.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/StartDecisionChainer.java
index 42f96468..83ccbfb6 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/StartDecisionChainer.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/StartDecisionChainer.java
@@ -51,7 +51,7 @@ public class StartDecisionChainer extends DecisionerChain<List> {
         if (in_storage){
             QueryWrapper<StIvtStructattr> query = new QueryWrapper<StIvtStructattr>()
                     .eq("is_used", true)
-                    .eq("lock_type", StatusEnum.LOCK.code("无"))
+                    .eq("lock_type", StatusEnum.LOCK.code("无锁"))
                     .eq("stor_code", startParam.getString("stor_code"));
             query.isNull("vehicle_code");
             list = iStIvtStructattrService.list(query);
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java
index 5c6e2a75..efd0e2aa 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java
@@ -45,7 +45,7 @@ public class SchBasePointController {
         entity.setCreate_name(SecurityUtils.getCurrentNickName());
         entity.setCreate_time(DateUtil.now());
         pointService.save(entity);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java
index e46bcded..8c3d9e27 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java
@@ -43,7 +43,7 @@ public class SchBaseRegionController {
         entity.setCreate_name(SecurityUtils.getCurrentNickName());
         entity.setCreate_time(DateUtil.now());
         regionService.save(entity);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java
index 0fff2bb3..1a08d232 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java
@@ -52,13 +52,13 @@ public class SchBaseTaskController {
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody SchBaseTask entity){
         schBaseTaskService.create(entity);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
     public ResponseEntity<Object> update(@Validated @RequestBody SchBaseTask entity){
         schBaseTaskService.update(entity);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
 
@@ -71,7 +71,7 @@ public class SchBaseTaskController {
     @PutMapping("/operation")
     public ResponseEntity<Object> update(@RequestBody JSONObject map) {
         schBaseTaskService.operation(map);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/AbstractTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/AbstractTask.java
index ea1eb806..f753825f 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/AbstractTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/AbstractTask.java
@@ -1,9 +1,13 @@
 package org.nl.wms.dispatch_manage.task.handler;
 
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.enums.StatusEnum;
+import org.nl.common.utils.SpringContextHolder;
+import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
 
 
@@ -23,8 +27,18 @@ public abstract class AbstractTask {
     public abstract JSONObject  createTask(JSONObject data);
 
 
+    public void updateTask(JSONObject data){
+        ISchBaseTaskService taskService = SpringContextHolder.getBean(ISchBaseTaskService.class);
+        String status = data.getString("status");
+        SchBaseTask task = taskService.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", data.getString("task_code")));
+        if (!task.getStatus().equals(status) && !task.getStatus().equals(StatusEnum.FORM_STATUS.code("完成"))){
+            taskService.update(new UpdateWrapper<SchBaseTask>().set("status",status).eq("task_code",data.getString("task_code")));
+        }
+    }
+
     public abstract void updateStatus(JSONObject data);
 
+    public abstract void finish(JSONObject data);
 
     public abstract void cancel(JSONObject data);
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/StructEvent.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/StructEvent.java
index 67c796ac..af6810ea 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/StructEvent.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/StructEvent.java
@@ -11,22 +11,17 @@ import org.nl.common.publish.event.PublishEvent;
 @Data
 @Builder
 public class StructEvent extends PublishEvent {
-
     /**
-     * @see org.nl.common.enums.StatusEnum.TASK_TYPE_IN
+     * 任务类型
      */
     private String task_type;
-
+    /**
+     * 载具编码
+     */
     private String vehicle_code;
-
-    private String status;
-
+    //变动起点
     private String point_code1;
+    //变动终点
     private String point_code2;
 
-    private String source_form_id;
-
-    private String source_form_type;
-
-
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ConveyorOutStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ConveyorOutStorageTask.java
index 883e1f0d..d71ff08f 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ConveyorOutStorageTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ConveyorOutStorageTask.java
@@ -6,12 +6,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
+import org.nl.common.domain.constant.DictConstantPool;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.enums.StatusEnum;
+import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.dispatch_manage.task.handler.AbstractTask;
+import org.nl.wms.dispatch_manage.task.handler.StructEvent;
 import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
 import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
@@ -49,9 +52,18 @@ public class ConveyorOutStorageTask extends AbstractTask {
     @Transactional
     public JSONObject createTask(JSONObject from) {
         String vehicle_code = from.getString("vehicle_code");
-        String outbound = from.getJSONObject("form_data").getString("outbound");
+        String outbound = from.getJSONObject("form_data").getString("outbound");//出库口根据单据车间来确认
         String start_point = from.getString("start_point");
         String task_type = from.getString("task_type");
+        String product_area = from.getString("product_area");
+        if (StringUtils.isNotEmpty(product_area)){
+            String configTarget = DictConstantPool.PRODUCT_OUT_POINT.get(product_area);
+            if (StringUtils.isEmpty(configTarget)){
+                throw new BadRequestException("创建任务失败:出库点车间点位对应关系配置异常");
+            }
+            outbound = configTarget;
+        }
+        System.out.println("输送线出库：拣选分配点/车间"+outbound+"_"+product_area);
         if (StringUtils.isEmpty(vehicle_code) ||StringUtils.isEmpty(start_point)||StringUtils.isEmpty(outbound)){
             throw new BadRequestException("创建任务失败:方法请求参数不能为空");
         }
@@ -82,6 +94,20 @@ public class ConveyorOutStorageTask extends AbstractTask {
 
     @Override
     public void updateStatus(JSONObject data) {
+        this.updateTask(data);
+        SchBaseTask schBaseTask = taskService.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", data.getString("task_code")));
+        BussEventMulticaster.Publish(StructEvent.builder()
+                .task_type(schBaseTask.getTask_type())
+                .vehicle_code(schBaseTask.getVehicle_code())
+                .point_code1(schBaseTask.getPoint_code1())
+                .point_code2(schBaseTask.getPoint_code2())
+                .build());
+    }
+
+    @Override
+    public void finish(JSONObject data) {
+        this.updateTask(data);
+        SchBaseTask schBaseTask = taskService.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", data.getString("task_code")));
 
     }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
index a0db4ce7..c43d5556 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
@@ -101,6 +101,11 @@ public  class GroupDickInStorageTask extends AbstractTask {
 
     }
 
+    @Override
+    public void finish(JSONObject data) {
+
+    }
+
     @Override
     public void cancel(JSONObject data) {
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java
index 8d3fa287..820dcf62 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java
@@ -5,13 +5,16 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.enums.StatusEnum;
+import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.dispatch_manage.task.handler.AbstractTask;
+import org.nl.wms.dispatch_manage.task.handler.StructEvent;
 import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
 import org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl.process.classprocess.ClassProcess;
@@ -76,12 +79,26 @@ public class InStorageTask extends AbstractTask {
     }
 
     @Override
-    public void updateStatus(JSONObject data) {
+    @Transactional
+    public void finish(JSONObject data) {
+        this.updateTask(data);
+        SchBaseTask schBaseTask = taskService.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", data.getString("task_code")));
+        //跟新库存
+        BussEventMulticaster.Publish(StructEvent.builder()
+                .task_type(schBaseTask.getTask_type())
+                .vehicle_code(schBaseTask.getVehicle_code())
+                .point_code1(schBaseTask.getPoint_code1())
+                .point_code2(schBaseTask.getPoint_code2())
+                .build());
+    }
 
+    @Override
+    public void updateStatus(JSONObject data) {
+        this.updateTask(data);
     }
 
     @Override
     public void cancel(JSONObject data) {
-
+        this.updateTask(data);
     }
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java
index b10d0b8e..5a1fb29b 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java
@@ -6,12 +6,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
+import org.nl.common.domain.constant.DictConstantPool;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.enums.StatusEnum;
+import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.dispatch_manage.task.handler.AbstractTask;
+import org.nl.wms.dispatch_manage.task.handler.StructEvent;
 import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
 import org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl.process.classprocess.ClassProcess;
@@ -52,7 +55,15 @@ public class OutStorageTask extends AbstractTask {
     public JSONObject createTask(JSONObject from) {
         String vehicle_code = from.getString("vehicle_code");
         String target_point = from.getString("target_point");
-
+        //通过全局变量获取目标位置
+        String product_area = from.getString("product_area");
+        if (StringUtils.isNotEmpty(product_area)){
+            String configTarget = DictConstantPool.PRODUCT_OUT_POINT.get(product_area);
+            if (StringUtils.isEmpty(configTarget)){
+                throw new BadRequestException("创建任务失败:出库点车间点位对应关系配置异常");
+            }
+            target_point = configTarget;
+        }
         if (StringUtils.isEmpty(vehicle_code) ||StringUtils.isEmpty(target_point)){
             throw new BadRequestException("创建任务失败:方法请求参数不能为空");
         }
@@ -88,12 +99,32 @@ public class OutStorageTask extends AbstractTask {
     }
 
     @Override
+    @Transactional
     public void updateStatus(JSONObject data) {
+        this.updateTask(data);
+        SchBaseTask schBaseTask = taskService.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", data.getString("task_code")));
+        BussEventMulticaster.Publish(StructEvent.builder()
+                .task_type(schBaseTask.getTask_type())
+                .vehicle_code(schBaseTask.getVehicle_code())
+                .point_code1(schBaseTask.getPoint_code1())
+                .point_code2(schBaseTask.getPoint_code2())
+                .build());
+    }
 
+    @Override
+    public void finish(JSONObject data) {
+        this.updateTask(data);
+        SchBaseTask schBaseTask = taskService.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", data.getString("task_code")));
+        BussEventMulticaster.Publish(StructEvent.builder()
+                .task_type(schBaseTask.getTask_type())
+                .vehicle_code(schBaseTask.getVehicle_code())
+                .point_code1(schBaseTask.getPoint_code1())
+                .point_code2(schBaseTask.getPoint_code2())
+                .build());
     }
 
     @Override
     public void cancel(JSONObject data) {
-
+        this.updateTask(data);
     }
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java
index 7b8e5b5c..a86ab06f 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java
@@ -11,6 +11,9 @@ import org.nl.common.enums.StatusEnum;
 import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.utils.MapOf;
 import org.nl.wms.dispatch_manage.task.handler.AbstractTask;
+import org.nl.wms.dispatch_manage.task.handler.StructEvent;
+import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
+import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
 import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService;
 import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution;
 import org.nl.wms.flow_manage.monitor.event.FlowContinueEvent;
@@ -44,6 +47,8 @@ public  class PalletInStorageTask extends AbstractTask {
     private IMdPbVehicleMaterService iMdPbVehicleMaterService;
     @Autowired
     private IActRuExecutionService iActRuExecutionService;
+    @Autowired
+    private ISchBaseTaskService iSchBaseTaskService;
 
     @Override
     public JSONObject createTask(JSONObject data) {
@@ -77,6 +82,11 @@ public  class PalletInStorageTask extends AbstractTask {
 
     }
 
+    @Override
+    public void finish(JSONObject data) {
+
+    }
+
     @Override
     public void cancel(JSONObject data) {
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PickStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PickStorageTask.java
index 963c0287..a1d6af03 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PickStorageTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PickStorageTask.java
@@ -86,6 +86,11 @@ public class PickStorageTask extends AbstractTask {
 
     }
 
+    @Override
+    public void finish(JSONObject data) {
+
+    }
+
     @Override
     public void cancel(JSONObject data) {
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/moveStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/moveStorageTask.java
new file mode 100644
index 00000000..f7872007
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/moveStorageTask.java
@@ -0,0 +1,125 @@
+package org.nl.wms.dispatch_manage.task.handler.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.domain.constant.DictConstantPool;
+import org.nl.common.domain.exception.BadRequestException;
+import org.nl.common.enums.StatusEnum;
+import org.nl.common.publish.BussEventMulticaster;
+import org.nl.common.utils.CodeUtil;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.dispatch_manage.task.handler.AbstractTask;
+import org.nl.wms.dispatch_manage.task.handler.StructEvent;
+import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
+import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
+import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
+import org.nl.wms.system_manage.service.param.ISysParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/*
+ * @author ZZQ
+ * @Date 2024/5/6 14:34
+ * 出库任务入库任务
+ */
+@Service
+public class moveStorageTask extends AbstractTask {
+
+    @Autowired
+    private ISchBaseTaskService taskService;
+    @Autowired
+    private ISysParamService iSysParamService;
+
+    @Autowired
+    private IStIvtStructattrService iStIvtStructattrService;
+    @Autowired
+    private IMdPbVehicleMaterService iMdPbVehicleMaterService;
+
+    @Override
+    @Transactional
+    public JSONObject createTask(JSONObject from) {
+        String vehicle_code = from.getString("vehicle_code");
+        JSONObject form_data = from.getJSONObject("form_data");
+        String start_struct_code = form_data.getString("start_struct_code");
+        String end_struct_code = form_data.getString("end_struct_code");
+
+        List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>().eq("vehicle_code", vehicle_code)
+                .ne("status", StatusEnum.FORM_STATUS.code("完成")));
+        if (!CollectionUtils.isEmpty(list)){
+            throw new BadRequestException("当前载具存在任务:"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(",")));
+        }
+        StIvtStructattr source = iStIvtStructattrService.getOne(new QueryWrapper<StIvtStructattr>().eq("vehicle_code", vehicle_code));
+        if (!source.getStruct_code().equals(start_struct_code)){
+            throw new BadRequestException("载具库位变动:当前货位"+source.getStruct_code()+",移库前货位"+start_struct_code);
+        }
+        StIvtStructattr target = iStIvtStructattrService.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_code", end_struct_code));
+        if (StringUtils.isNotEmpty(target.getVehicle_code())){
+            throw new BadRequestException("目标货位存在载具:"+target.getVehicle_code());
+        }
+        SchBaseTask task = new SchBaseTask();
+            task.setId(IdUtil.getStringId());
+            task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
+            task.setStatus(StatusEnum.FORM_STATUS.code("生成"));
+            task.setHandle_class(this.getClass().getName());
+            task.setAcs_type(StatusEnum.ACS_TYPE.code("立库"));
+            task.setCreate_time(DateUtil.now());
+            task.setCreate_name(SecurityUtils.getCurrentNickName());
+            task.setTask_type(from.getString("task_type"));
+            task.setVehicle_code(vehicle_code);
+            task.setPoint_code1(source.getStruct_code());
+            task.setPoint_code2(end_struct_code);
+        taskService.save(task);
+        iMdPbVehicleMaterService.update(new LambdaUpdateWrapper<MdPbVehicleMater>()
+                .set(MdPbVehicleMater::getTask_code,task.getTask_code())
+                .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code()));
+        //TODO:是否下发
+        Boolean isSend = from.getBoolean("is_send");
+        if (isSend){
+            //参数封装，调acs接口
+        }
+        return (JSONObject)JSON.toJSON(task);
+    }
+
+    @Override
+    @Transactional
+    public void updateStatus(JSONObject data) {
+        this.updateTask(data);
+        SchBaseTask schBaseTask = taskService.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", data.getString("task_code")));
+        BussEventMulticaster.Publish(StructEvent.builder()
+                .task_type(schBaseTask.getTask_type())
+                .vehicle_code(schBaseTask.getVehicle_code())
+                .point_code1(schBaseTask.getPoint_code1())
+                .point_code2(schBaseTask.getPoint_code2())
+                .build());
+    }
+
+    @Override
+    public void finish(JSONObject data) {
+        this.updateTask(data);
+        SchBaseTask schBaseTask = taskService.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", data.getString("task_code")));
+        BussEventMulticaster.Publish(StructEvent.builder()
+                .task_type(schBaseTask.getTask_type())
+                .vehicle_code(schBaseTask.getVehicle_code())
+                .point_code1(schBaseTask.getPoint_code1())
+                .point_code2(schBaseTask.getPoint_code2())
+                .build());
+    }
+
+    @Override
+    public void cancel(JSONObject data) {
+        this.updateTask(data);
+    }
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
index 8545b9eb..bbf124cb 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
@@ -13,14 +13,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.nl.common.domain.entity.PageQuery;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.enums.StatusEnum;
+import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.ListOf;
+import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
 import org.nl.wms.dispatch_manage.task.service.dao.mapper.SchBaseTaskMapper;
 import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.wms.dispatch_manage.task.service.dto.SchBaseTaskQuery;
+import org.nl.wms.flow_manage.monitor.event.FlowContinueEvent;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,8 +44,7 @@ import java.util.stream.Collectors;
 public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBaseTask> implements ISchBaseTaskService {
 
     @Autowired
-    private SchBaseTaskMapper schBaseTaskMapper;
-
+    IMdPbVehicleMaterService iMdPbVehicleMaterService;
 
     @Override
     public IPage<SchBaseTask> queryAll(SchBaseTaskQuery whereJson, PageQuery page) {
@@ -53,7 +57,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
             }
         }
         IPage<SchBaseTask> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pages = schBaseTaskMapper.selectPageLeftJoin(pages, whereJson, collect);
+        pages = this.baseMapper.selectPageLeftJoin(pages, whereJson, collect);
         return pages;
     }
 
@@ -70,20 +74,19 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
 
     @Override
     public void update(SchBaseTask entity) {
-        SchBaseTask dto = schBaseTaskMapper.selectById(entity.getTask_code());
+        SchBaseTask dto = this.baseMapper.selectById(entity.getTask_code());
         if (dto == null) throw new BadRequestException("任务信息不存在");
 
         String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         entity.setUpdate_name(nickName);
         entity.setUpdate_time(now);
-        schBaseTaskMapper.updateById(entity);
+        this.baseMapper.updateById(entity);
     }
 
     @Override
     public void deleteAll(Set<String> ids) {
-        // 真删除
-        schBaseTaskMapper.deleteBatchIds(ids);
+        this.removeByIds(ids);
     }
 
     @Override
@@ -98,15 +101,27 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         entity.setCreate_time(now);
         entity.setUpdate_name(nickName);
         entity.setUpdate_time(now);
-        schBaseTaskMapper.insert(entity);
+        this.baseMapper.insert(entity);
 
     }
 
     @Override
     public void operation(JSONObject param) {
-        String taskStatus = param.getString("method_name");
+        String task_code = param.getString("task_code");
+        SchBaseTask task = this.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", task_code));
+        if (task.getStatus().equals(StatusEnum.FORM_STATUS.code("完成"))){
+            throw new BadRequestException("当前任务已完成");
+        }
         this.update(new UpdateWrapper<SchBaseTask>()
-                .set("status",taskStatus)
-                .eq("task_code",param.getString("task_code")));
+                .set("status",param.getString("method_name"))
+                .eq("task_code", task_code));
+        if (param.getString("method_name").equals(StatusEnum.FORM_STATUS.code("完成"))){
+            MdPbVehicleMater vehicleMater = iMdPbVehicleMaterService.getOne(new QueryWrapper<MdPbVehicleMater>()
+                    .eq("vehicle_code", task.getVehicle_code()));
+            if (!StringUtils.isEmpty(vehicleMater.getProc_inst_id())){
+                FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMater.getProc_inst_id(), null, null);
+                BussEventMulticaster.Publish(continueEvent);
+            }
+        }
     }
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java
index 802ab500..1249a23c 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java
@@ -84,7 +84,7 @@ public class AlmEarlyDeferralController {
             almEarlyDeferralDetail.setMaterial_id(material_id);
             almEarlyDeferralDetailService.save(almEarlyDeferralDetail);
         }
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @DeleteMapping("/delete")
@@ -102,7 +102,7 @@ public class AlmEarlyDeferralController {
         almEarlyDeferral.setId(IdUtil.getStringId());
         almEarlyDeferral.setCreate_time(DateUtil.now());
         almEarlyDeferralService.save(almEarlyDeferral);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PostMapping("/update")
@@ -110,7 +110,7 @@ public class AlmEarlyDeferralController {
         AlmEarlyDeferral almEarlyDeferral = dto.toJavaObject(AlmEarlyDeferral.class);
         almEarlyDeferral.setCreate_time(DateUtil.now());
         almEarlyDeferralService.updateById(almEarlyDeferral);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/inv_early/AlmEarlyInvController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/inv_early/AlmEarlyInvController.java
index c1170d57..db0f9940 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/inv_early/AlmEarlyInvController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/inv_early/AlmEarlyInvController.java
@@ -95,7 +95,7 @@ public class AlmEarlyInvController {
         inv.setId(IdUtil.getStringId());
         inv.setCreate_time(DateUtil.now());
         iAlmEarlyInvService.save(inv);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PostMapping("/update")
@@ -103,7 +103,7 @@ public class AlmEarlyInvController {
         AlmEarlyInv inv = dto.toJavaObject(AlmEarlyInv.class);
         inv.setCreate_time(DateUtil.now());
         iAlmEarlyInvService.updateById(inv);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PostMapping("/saveDtl")
@@ -121,7 +121,7 @@ public class AlmEarlyInvController {
             almEarlyDtl.setMaterial_id(material_id);
             iAlmEarlyDtlService.save(almEarlyDtl);
         }
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @DeleteMapping("/delete")
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java
index e52a994f..6949a113 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java
@@ -72,7 +72,6 @@ public class ActDeModelController {
         actDeModel.setCreate_id(SecurityUtils.getCurrentUserId());
         actDeModel.setCreate_time(DateUtil.now());
         actDeModel.setId(IdUtil.getStringId());
-        actDeModel.setModel_key(IdUtil.getStringId());
         if (!StringUtils.isEmpty(actDeModel.getModel_editor_json())){
             try {
                 JSONObject modelJson = JSONObject.parseObject(actDeModel.getModel_editor_json());
@@ -106,10 +105,11 @@ public class ActDeModelController {
 
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody String[] ids) {
-        if (ids.length > 0) {
-            modelService.removeByIds(Arrays.asList(ids));
-        }
-        return new ResponseEntity<>(HttpStatus.OK);
+        throw new BadRequestException("模型配置无法直接删除");
+//        if (ids.length > 0) {
+//            modelService.removeByIds(Arrays.asList(ids));
+//        }
+//        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @GetMapping(value = "/select/{modelId}", produces = "application/json")
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java
index 7f7a7988..27c88e6e 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java
@@ -83,7 +83,7 @@ public abstract class FlowNodeActivityBehavior<T> {
                     .eq("proc_inst_id", proc_inst_id)
                     .set("status", StatusEnum.FLOW_STATUS.code("暂停"))
                     .set("remark","节点:"+entity.getActivityName()+":异常:"+ex.getMessage()));
-            throw new BadRequestException(ex.getMessage());
+//            throw new BadRequestException(ex.getMessage());
         }
     }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ClassHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ClassHandler.java
index adc4e103..6e7d9ca2 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ClassHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ClassHandler.java
@@ -39,8 +39,8 @@ public  class ClassHandler extends TypeHandler<JSONObject,ExecutionEntity<JSONOb
             auxParam.putAll(entity.getAuxParam());
         }
         JSONObject form = process.process(dto.getT(), auxParam);
-        //清空全局配置的数据
-        entity.setAuxParam(new JSONObject());
+        //清空全局配置的数据：暂时不清空只做覆盖
+       // entity.setAuxParam(new JSONObject());
         result.put("t",form);
         //后续：涉及框架的参数提到框架中处理
         String source_form_type = dto.getForm_type();
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StorageChangesProcessHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StorageChangesProcessHandler.java
index 351a8a85..a0c2fe76 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StorageChangesProcessHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StorageChangesProcessHandler.java
@@ -51,7 +51,6 @@ public class StorageChangesProcessHandler implements ClassProcess {
         //TODO:后续在流程节点中配置监听时间触发
         BussEventMulticaster.Publish(StructEvent.builder()
                 .task_type(schBaseTask.getTask_type())
-                .status(schBaseTask.getStatus())
                 .vehicle_code(schBaseTask.getVehicle_code())
                 .point_code1(schBaseTask.getPoint_code1())
                 .point_code2(schBaseTask.getPoint_code2())
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java
index 6565ec2f..47d59bda 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java
@@ -78,7 +78,7 @@ public class FlowOperationServiceImpl implements IFlowOperationService {
             entity.setStartActivityId(entity.getActivityId());
             entity.setDeploymentId(deployment.getDeployment_id());
         commandExecutor.execute(new StartInstanceCmd(),entity);
-        return null;
+        return entity.getProc_inst_id();
     }
 
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/monitor/event/FlowStartEvent.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/monitor/event/FlowStartEvent.java
index 2f0e02dd..4d17aa27 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/monitor/event/FlowStartEvent.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/monitor/event/FlowStartEvent.java
@@ -80,4 +80,8 @@ public class FlowStartEvent extends PublishEvent {
     public ExecutionDto getDto() {
         return dto;
     }
+
+    public void setDto(ExecutionDto dto) {
+        this.dto = dto;
+    }
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java
index 5ff65279..ffc853ac 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java
@@ -3,6 +3,7 @@ package org.nl.wms.pda_manage.palletio.service;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.publish.BussEventMulticaster;
@@ -31,8 +32,11 @@ public class PalletIostorinvService {
        Assert.notNull(form, "参数不能为空");
        String vehicle_code = form.getString("vehicle_code");
        String material_id = form.getString("material_id");
+       int count = iMdPbVehicleMaterService.count(new QueryWrapper<MdPbVehicleMater>().eq("vehicle_code", vehicle_code));
+       if (count>0){
+           throw new BadRequestException("入库失败：当前载具信息已经存在");
+       }
        MdPbVehicleMater vehicleMater = new MdPbVehicleMater();
-       vehicleMater.setGroup_id(IdUtil.getStringId());
        vehicleMater.setId(IdUtil.getStringId());
        vehicleMater.setCreate_time(DateUtil.now());
        vehicleMater.setCreate_name(SecurityUtils.getCurrentNickName());
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
index 8c6e38f5..566b654a 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
@@ -1,23 +1,19 @@
 package org.nl.wms.pm_manage.form_data.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.entity.PageQuery;
-import org.nl.common.domain.exception.BadRequestException;
-import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService;
 import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
 import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
 import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
-import org.nl.wms.sync_manage.service.form_mapping.dao.SyncFormMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * <p>
@@ -32,18 +28,20 @@ import java.util.List;
 public class PmFormDataController {
 
     @Autowired
-    private IPmFormDataService formDataService;
+    private IPmFormDataService iPmFormDataService;
 
 
     @GetMapping()
     public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
-        return new ResponseEntity<>(TableDataInfo.build(formDataService.queryTree(query,page)), HttpStatus.CREATED);
+        return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
     }
 
     @DeleteMapping
+    @Transactional
     public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
         if (ids.length > 0) {
-            formDataService.removeByIds(Arrays.asList(ids));
+            iPmFormDataService.removeByIds(Arrays.asList(ids));
+            iPmFormDataService.remove(new QueryWrapper<PmFormData>().in("parent_id",ids));
         }
         return new ResponseEntity<>(HttpStatus.OK);
     }
@@ -52,15 +50,15 @@ public class PmFormDataController {
     public ResponseEntity<Object> getSonDtlFormData(@PathVariable String id){
         //参数判读，参数解析，调用参数入库
         //Page<BmFormStruc> page = iBmFormStrucService.page(pageQuery.build(), query.build());
-        return new ResponseEntity<>(formDataService.getSonDtlFormData(id),HttpStatus.OK);
+        return new ResponseEntity<>(iPmFormDataService.getSonDtlFormData(id),HttpStatus.OK);
     }
 
 
     @GetMapping("/sync/{type}")
     public ResponseEntity<Object> sync(@RequestParam String type, String formDtl) {
         //参数判读，参数解析，调用参数入库
-        formDataService.syncFormData("type", formDtl);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        iPmFormDataService.syncFormData("type", formDtl);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
index 42ceb3f5..89198757 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
@@ -38,6 +38,6 @@ public interface IPmFormDataService extends IService<PmFormData> {
 
     void dynamicSql(String sql);
 
-    List<PmFormData> getByParentId(String parent_id);
+    List<PmFormData> getByParentId(String...parent_id);
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
index 12a5cc31..8127c86a 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
@@ -67,15 +67,6 @@ public class PmFormData implements Serializable {
      */
     private String status = StatusEnum.FORM_STATUS.code("生成");
 
-    /**
-     * 创建id
-     */
-    private String create_time;
-
-    /**
-     * 创建id
-     */
-    private String create_name;
 
     /**
      * 物料id
@@ -119,4 +110,31 @@ public class PmFormData implements Serializable {
 
 
 
+    /**
+     * 创建id
+     */
+    private String create_time;
+
+    /**
+     * 创建id
+     */
+    private String create_name;
+
+    /**
+     * 创建id
+     */
+    private String update_time;
+
+    /**
+     * 创建id
+     */
+    private String update_name;
+
+    /**
+     * 备注说明
+     */
+    private String remark;
+
+
+
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
index b1f2f012..ffee32ef 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
@@ -31,11 +31,16 @@
         <result  property="source_form_type" column="source_form_type"/>
         <result  property="form_type" column="form_type"/>
         <result  property="status" column="status"/>
+        <result  property="remark" column="remark"/>
         <result  property="create_name" column="create_name"/>
         <result  property="create_time" column="create_time"/>
         <result  property="material_id" column="material_id"/>
         <result  property="qty" column="qty"/>
         <result  property="pcsn" column="pcsn"/>
+        <result  property="material_code" column="material_code"/>
+        <result  property="material_name" column="material_name"/>
+        <result  property="material_spec" column="material_spec"/>
+        <result  property="single_weight" column="single_weight"/>
         <result  property="vehicle_code" column="vehicle_code"/>
         <result  property="parent_id" column="parent_id"/>
         <result  property="form_data" column="form_data" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
@@ -67,7 +72,8 @@
         pm_form_data.*,
         md_me_materialbase.material_code,
         md_me_materialbase.material_name,
-        md_me_materialbase.material_spec
+        md_me_materialbase.material_spec,
+        md_me_materialbase.single_weight
         FROM
         pm_form_data
             left join md_me_materialbase on pm_form_data.material_id = md_me_materialbase.material_id
@@ -92,7 +98,8 @@
            pm_form_data.*,
            md_me_materialbase.material_code,
            md_me_materialbase.material_name,
-           md_me_materialbase.material_spec
+           md_me_materialbase.material_spec,
+           md_me_materialbase.single_weight
         from  pm_form_data left join md_me_materialbase on pm_form_data.material_id = md_me_materialbase.material_id
         where parent_id = #{id}
     </select>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java
index 7bd22842..62448356 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java
@@ -63,6 +63,10 @@ public class PmFormDataDto implements Serializable {
      * 业务单据状态
      */
     private String status;
+    /**
+     * 业务单据状态
+     */
+    private String remark;
 
     /**
      * 创建id
@@ -90,6 +94,10 @@ public class PmFormDataDto implements Serializable {
      * 物料spec
      */
     private String material_spec;
+    /**
+     * 物料单重
+     */
+    private String single_weight;
 
     /**
      * 数量
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
index 664164fb..6d3564ca 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
@@ -224,9 +224,10 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
     }
 
     @Override
-    public List<PmFormData> getByParentId(String parent_id) {
+    public List<PmFormData> getByParentId(String[] parent_id) {
         Assert.notNull(parent_id,"请求参数不能为空");
-        return this.list(new QueryWrapper<PmFormData>().eq("parent_id",parent_id));
+        QueryWrapper<PmFormData> query = new QueryWrapper<PmFormData>().in("parent_id", parent_id);
+        return this.list(query);
     }
 }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/controller/CheckController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/controller/CheckController.java
new file mode 100644
index 00000000..7eb78f3c
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/controller/CheckController.java
@@ -0,0 +1,97 @@
+package org.nl.wms.stor_manage.checkStorage.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.enums.StatusEnum;
+import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
+import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
+import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
+import org.nl.wms.stor_manage.checkStorage.service.CheckStorageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+/**
+ * <p>
+ * 表单信息表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-25
+ */
+@RestController
+@RequestMapping("/api/check")
+public class CheckController {
+
+    @Autowired
+    private IPmFormDataService iPmFormDataService;
+    @Autowired
+    private CheckStorageService checkStorageService;
+
+
+    @GetMapping()
+    public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
+    }
+
+    @GetMapping("/getSonFormData/{id}")
+    public ResponseEntity<Object> getSonDtlFormData(@PathVariable String id){
+        //参数判读，参数解析，调用参数入库
+        //Page<BmFormStruc> page = iBmFormStrucService.page(pageQuery.build(), query.build());
+        return new ResponseEntity<>(iPmFormDataService.getSonDtlFormData(id),HttpStatus.OK);
+    }
+
+    @PostMapping("/save")
+    @Log("新增盘点单")
+    public ResponseEntity<Object> save(@RequestBody JSONObject params) {
+        checkStorageService.save(params);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+    @PostMapping("/updateStatus")
+    @Log("跟新单据状态")
+    public ResponseEntity<Object> updateStatus(@RequestBody JSONObject param) {
+        //TODO:明细校验
+        List<PmFormData> childs = iPmFormDataService.getByParentId(param.getString("id"));
+        long tmpCount = childs.stream().filter(a -> a.getStatus().equals(StatusEnum.FORM_STATUS.code("生成"))).count();
+        if (tmpCount==0){
+            iPmFormDataService.update(new UpdateWrapper<PmFormData>()
+                    .set("status",param.getString("status"))
+                    .eq("id",param.getString("id")));
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+    @PostMapping("/saveCheckTask")
+    @Log("盘点确认")
+    public ResponseEntity<Object> saveCheckTask(@RequestBody JSONObject param) {
+        //TODO:明细校验
+        param.getJSONObject("form_data");
+        iPmFormDataService.update(new UpdateWrapper<PmFormData>()
+                .set("status", StatusEnum.FORM_STATUS.code("已分配"))
+                .set("form_data",param.getJSONObject("form_data").toJSONString())
+                 .eq("id",param.getString("id")));
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+    @PostMapping("/taskOpen")
+    @Log("盘点单下发")
+    public ResponseEntity<Object> taskOpen(@RequestBody JSONObject param) {
+        checkStorageService.taskOpen(param);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @DeleteMapping()
+    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
+        checkStorageService.delete(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+
+}
+
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java
new file mode 100644
index 00000000..c1c13112
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java
@@ -0,0 +1,149 @@
+package org.nl.wms.stor_manage.checkStorage.service;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.domain.exception.BadRequestException;
+import org.nl.common.enums.StatusEnum;
+import org.nl.common.publish.BussEventMulticaster;
+import org.nl.common.utils.CodeUtil;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.flow_manage.flow.framework.entity.ExecutionDto;
+import org.nl.wms.flow_manage.monitor.event.FlowStartEvent;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
+import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
+import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
+import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/*
+ * @author ZZQ
+ * @Date 2024/6/17 21:25
+ */
+@Service
+public class CheckStorageService {
+    @Autowired
+    private IPmFormDataService iFormDataService;
+    @Autowired
+    private IMdPbVehicleMaterService iMdPbVehicleMaterService;
+    @Autowired
+    private IStIvtStructattrService iStIvtStructattrService;
+
+
+    /**
+     * 生成移库单
+     * @param form
+     */
+    @Transactional
+    public void save(JSONObject form){
+        ArrayList<PmFormData> list = new ArrayList<>();
+        Set<String> structs = new HashSet<>();
+
+        String user = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+        List items = (List)form.remove("item");
+        PmFormData mst = form.toJavaObject(PmFormData.class);
+        mst.setCreate_name(user);
+        mst.setCreate_time(now);
+        mst.setId(IdUtil.getStringId());
+        mst.setStatus(StatusEnum.FORM_STATUS.code("生成"));
+        mst.setCode(CodeUtil.getNewCode(mst.getForm_type()));
+        list.add(mst);
+        for (Object itemO : items) {
+            JSONObject itemJ = new JSONObject((Map) itemO);
+            PmFormData dtl = itemJ.toJavaObject(PmFormData.class);
+            dtl.setCreate_name(user);
+            dtl.setCreate_time(now);
+            dtl.setId(IdUtil.getStringId());
+            dtl.setStatus(StatusEnum.FORM_STATUS.code("生成"));
+            dtl.setParent_id(mst.getId());
+            structs.add(dtl.getForm_data().getString("struct_code"));
+            list.add(dtl);
+        }
+        iFormDataService.saveBatch(list);
+        iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
+                .set("lock_type", StatusEnum.LOCK.code("移库锁"))
+                .in("struct_code",structs));
+    }
+
+    /**
+     * 删除移库单
+     * @param ids
+     */
+    @Transactional
+    public void delete(String[] ids){
+        if (ids.length>0){
+            List<PmFormData> dtls = iFormDataService.getByParentId(ids);
+            List<String> removeCollect = dtls.stream().map(PmFormData::getId).collect(Collectors.toList());
+            removeCollect.addAll(Arrays.asList(ids));
+            List<String> structs = new ArrayList<>();
+            for (PmFormData dtl : dtls) {
+                String struct_code = dtl.getForm_data().getString("struct_code");
+                structs.add(struct_code);
+            }
+            iFormDataService.removeByIds(removeCollect);
+            iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
+                    .set("lock_type", StatusEnum.LOCK.code("无锁"))
+                    .in("struct_code",structs));
+        }
+    }
+
+
+    public void taskOpen(JSONObject form){
+        PmFormData mst = form.toJavaObject(PmFormData.class);
+        if (StringUtils.isNotEmpty(mst.getProc_inst_id())){
+            throw new BadRequestException("下发失败:当前单据已存在流程,请勿重新下发");
+        }
+        JSONObject mstJ = (JSONObject) JSON.toJSON(mst);
+        ExecutionDto dto = new ExecutionDto();
+        dto.setForm_id(mst.getId());
+        dto.setForm_type(mst.getForm_type());
+        dto.setSource_form_type(mst.getSource_form_type());
+        dto.setSource_form_id(mst.getSource_form_id());
+        dto.setT(mstJ);
+        dto.setItem(packageT(mstJ,"id"));
+        FlowStartEvent startEvent = new FlowStartEvent("st_ivt_check",
+                (proc_inst_id, empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper<MdPbVehicleMater>().set("proc_inst_id", proc_inst_id).eq("vehicle_code", empPlace))
+                , null);
+        startEvent.setDto(dto);
+        startEvent.setCallback(proc_inst_id->{
+            iFormDataService.update(new UpdateWrapper<PmFormData>()
+                    .set("status",StatusEnum.FORM_STATUS.code("执行中"))
+                    .set("proc_inst_id",proc_inst_id)
+                    .eq("id",mst.getId()));
+        });
+        BussEventMulticaster.Publish(startEvent);
+
+    }
+    private List<ExecutionDto> packageT(JSONObject current,String itemField){
+        String id = current.getString(itemField);
+        List<PmFormData> items = iFormDataService.getByParentId(id);
+        if (!CollectionUtils.isEmpty(items)){
+            List<ExecutionDto> list = new ArrayList<>();
+            for (PmFormData item : items) {
+                JSONObject itemJ = (JSONObject) JSON.toJSON(item);
+                ExecutionDto itemDto = new ExecutionDto();
+                itemDto.setT(itemJ);
+                itemDto.setForm_id(item.getId());
+                itemDto.setForm_type(item.getForm_type());
+                itemDto.setSource_form_type(item.getSource_form_type());
+                itemDto.setSource_form_id(item.getSource_form_id());
+                itemDto.setItem(packageT(itemJ,itemField));
+                list.add(itemDto);
+            }
+            return list;
+        }
+        return null;
+    }
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java
index 17a7aba9..c42ac854 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java
@@ -233,7 +233,8 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvOutMapp
                         , (proc_inst_id,innerVehicle) -> iMdPbVehicleMaterService.update(new UpdateWrapper<MdPbVehicleMater>()
                         .set("proc_inst_id",proc_inst_id)
                         .in("vehicle_code",innerVehicle==null?vechiles: ListOf.of(innerVehicle)))
-                        ,null)
+                //传递全局参数：出库分配出库点用
+                        ,iostorinv.getForm_data())
                         .build("st_ivt_iostorinv",iostorinv.getId(),iostorinv.getSource_form_type(),iostorinv.getSource_form_id(),form)
                         .build("st_ivt_iostorinvdtl",dtlVo)
                 );
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/StructEventListener.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/StructEventListener.java
index fa5930ef..1b43dac9 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/StructEventListener.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/StructEventListener.java
@@ -29,23 +29,18 @@ public class StructEventListener extends AbstraceListener<StructEvent> {
     @Override
     protected String doEvent(StructEvent event) {
         //根据不同的task_type获取对应出入库类型
-        String status = event.getStatus();
         String task_type = event.getTask_type();
-
-        if (status.equals(StatusEnum.FORM_STATUS.code("生成"))){
-
+        if (StatusEnum.IOBILL_TYPE_IN.check(task_type)){
+            structattrService.changeStruct(event.getPoint_code2(),event.getVehicle_code(),task_type,true);
+        }
+        if (StatusEnum.IOBILL_TYPE_OUT.check(task_type)){
+            structattrService.changeStruct(event.getPoint_code1(),null,task_type,false);
+        }
+        if (StatusEnum.IOBILL_TYPE_MOVE.check(task_type)){
+            structattrService.changeStruct(event.getPoint_code1(),null,task_type,false);
+            structattrService.changeStruct(event.getPoint_code2(),event.getVehicle_code(),task_type,true);
         }
-        if (status.equals(StatusEnum.FORM_STATUS.code("执行中"))){
 
-        }
-        if (status.equals(StatusEnum.FORM_STATUS.code("完成"))){
-                //更新出入库单明细状态；如果单据类型是其他的则从from-data表中更新
-            Boolean in = StatusEnum.IOBILL_TYPE_IN.check(task_type);
-            structattrService.changeStruct(in?event.getPoint_code2():event.getPoint_code1(),in?event.getVehicle_code():null,task_type);
-        }
-        if (status.equals(StatusEnum.FORM_STATUS.code("取消"))){
-
-        }
         return null;
     }
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/move/controller/MovingController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/move/controller/MovingController.java
new file mode 100644
index 00000000..1b9d292f
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/move/controller/MovingController.java
@@ -0,0 +1,75 @@
+package org.nl.wms.stor_manage.move.controller;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.entity.PageQuery;
+import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
+import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
+import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
+import org.nl.wms.stor_manage.move.service.MovingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 表单信息表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-25
+ */
+@RestController
+@RequestMapping("/api/move")
+public class MovingController {
+
+    @Autowired
+    private IPmFormDataService iPmFormDataService;
+    @Autowired
+    private MovingService movingService;
+
+
+    @GetMapping()
+    public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
+    }
+
+    @GetMapping("/getSonFormData/{id}")
+    public ResponseEntity<Object> getSonDtlFormData(@PathVariable String id){
+        //参数判读，参数解析，调用参数入库
+        //Page<BmFormStruc> page = iBmFormStrucService.page(pageQuery.build(), query.build());
+        return new ResponseEntity<>(iPmFormDataService.getSonDtlFormData(id),HttpStatus.OK);
+    }
+
+    @PostMapping("/save")
+    public ResponseEntity<Object> save(@RequestBody JSONObject params) {
+        movingService.save(params);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+    @PostMapping("/updateStatus")
+    public ResponseEntity<Object> updateStatus(@RequestBody JSONObject param) {
+        //TODO:明细校验
+        iPmFormDataService.update(new UpdateWrapper<PmFormData>()
+                .set("status",param.getString("status"))
+                        .eq("id",param.getString("id")));
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+    @PostMapping("/taskOpen")
+    public ResponseEntity<Object> taskOpen(@RequestBody JSONObject param) {
+        movingService.taskOpen(param);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @DeleteMapping()
+    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
+        movingService.delete(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+
+}
+
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/move/service/MovingService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/move/service/MovingService.java
new file mode 100644
index 00000000..771d6608
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/move/service/MovingService.java
@@ -0,0 +1,163 @@
+package org.nl.wms.stor_manage.move.service;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.domain.exception.BadRequestException;
+import org.nl.common.enums.StatusEnum;
+import org.nl.common.publish.BussEventMulticaster;
+import org.nl.common.utils.CodeUtil;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.MapOf;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
+import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
+import org.nl.wms.flow_manage.flow.framework.entity.ExecutionDto;
+import org.nl.wms.flow_manage.monitor.event.FlowContinueEvent;
+import org.nl.wms.flow_manage.monitor.event.FlowStartEvent;
+import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
+import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
+import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
+import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
+import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/*
+ * @author ZZQ
+ * @Date 2024/6/17 21:25
+ */
+@Service
+public class MovingService {
+    @Autowired
+    private IPmFormDataService iFormDataService;
+    @Autowired
+    private IMdPbVehicleMaterService iMdPbVehicleMaterService;
+    @Autowired
+    private IStIvtStructattrService iStIvtStructattrService;
+
+
+    /**
+     * 生成移库单
+     * @param form
+     */
+    @Transactional
+    public void save(JSONObject form){
+        ArrayList<PmFormData> list = new ArrayList<>();
+        Set<String> structs = new HashSet<>();
+
+        String user = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+        List items = (List)form.remove("item");
+        PmFormData mst = form.toJavaObject(PmFormData.class);
+        mst.setCreate_name(user);
+        mst.setCreate_time(now);
+        mst.setId(IdUtil.getStringId());
+        mst.setStatus(StatusEnum.FORM_STATUS.code("生成"));
+        mst.setCode(CodeUtil.getNewCode(mst.getForm_type()));
+        list.add(mst);
+        for (Object itemO : items) {
+            JSONObject itemJ = new JSONObject((Map) itemO);
+            PmFormData dtl = itemJ.toJavaObject(PmFormData.class);
+            dtl.setCreate_name(user);
+            dtl.setCreate_time(now);
+            dtl.setId(IdUtil.getStringId());
+            dtl.setStatus(StatusEnum.FORM_STATUS.code("生成"));
+            dtl.setParent_id(mst.getId());
+            structs.add(dtl.getForm_data().getString("start_struct_code"));
+            structs.add(dtl.getForm_data().getString("end_struct_code"));
+            list.add(dtl);
+        }
+        if (structs.size() != items.size()*2){
+            throw new BadRequestException("移库分配异常:库位信息不正确");
+        }
+        iFormDataService.saveBatch(list);
+        iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
+                .set("lock_type", StatusEnum.LOCK.code("移库锁"))
+                .in("struct_code",structs));
+    }
+
+    /**
+     * 删除移库单
+     * @param ids
+     */
+    @Transactional
+    public void delete(String[] ids){
+        if (ids.length>0){
+            List<PmFormData> dtls = iFormDataService.getByParentId(ids);
+            List<String> removeCollect = dtls.stream().map(PmFormData::getId).collect(Collectors.toList());
+            removeCollect.addAll(Arrays.asList(ids));
+
+            List<String> structs = new ArrayList<>();
+            for (PmFormData dtl : dtls) {
+                String start_struct_code = dtl.getForm_data().getString("start_struct_code");
+                String end_struct_code = dtl.getForm_data().getString("end_struct_code");
+                structs.add(start_struct_code);
+                structs.add(end_struct_code);
+            }
+            iFormDataService.removeByIds(removeCollect);
+            iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
+                    .set("lock_type", StatusEnum.LOCK.code("无锁"))
+                    .in("struct_code",structs));
+        }
+    }
+
+
+    public void taskOpen(JSONObject form){
+        PmFormData mst = form.toJavaObject(PmFormData.class);
+        if (StringUtils.isNotEmpty(mst.getProc_inst_id())){
+            throw new BadRequestException("下发失败:当前单据已存在流程,请勿重新下发");
+        }
+        JSONObject mstJ = (JSONObject) JSON.toJSON(mst);
+        ExecutionDto dto = new ExecutionDto();
+        dto.setForm_id(mst.getId());
+        dto.setForm_type(mst.getForm_type());
+        dto.setSource_form_type(mst.getSource_form_type());
+        dto.setSource_form_id(mst.getSource_form_id());
+        dto.setT(mstJ);
+        dto.setItem(packageT(mstJ,"id"));
+        FlowStartEvent startEvent = new FlowStartEvent("st_ivt_move",
+                (proc_inst_id, empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper<MdPbVehicleMater>().set("proc_inst_id", proc_inst_id).eq("vehicle_code", empPlace))
+                , null);
+        startEvent.setDto(dto);
+        startEvent.setCallback(proc_inst_id->{
+            iFormDataService.update(new UpdateWrapper<PmFormData>()
+                    .set("status",StatusEnum.FORM_STATUS.code("执行中"))
+                    .set("proc_inst_id",proc_inst_id)
+                    .eq("id",mst.getId()));
+        });
+        BussEventMulticaster.Publish(startEvent);
+
+    }
+    private List<ExecutionDto> packageT(JSONObject current,String itemField){
+        String id = current.getString(itemField);
+        List<PmFormData> items = iFormDataService.getByParentId(id);
+        if (!CollectionUtils.isEmpty(items)){
+            List<ExecutionDto> list = new ArrayList<>();
+            for (PmFormData item : items) {
+                JSONObject itemJ = (JSONObject) JSON.toJSON(item);
+                ExecutionDto itemDto = new ExecutionDto();
+                itemDto.setT(itemJ);
+                itemDto.setForm_id(item.getId());
+                itemDto.setForm_type(item.getForm_type());
+                itemDto.setSource_form_type(item.getSource_form_type());
+                itemDto.setSource_form_id(item.getSource_form_id());
+                itemDto.setItem(packageT(itemJ,itemField));
+                list.add(itemDto);
+            }
+            return list;
+        }
+        return null;
+    }
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/controller/PickingController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/controller/PickingController.java
index 1528f1c8..8c11e5f5 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/controller/PickingController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/controller/PickingController.java
@@ -35,7 +35,7 @@ public class PickingController {
 
     @GetMapping()
     public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
-        return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.CREATED);
+        return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
     }
 
     @GetMapping("/getSonFormData/{id}")
@@ -50,12 +50,12 @@ public class PickingController {
     public ResponseEntity<Object> sync(@RequestParam String type, String formDtl) {
         //参数判读，参数解析，调用参数入库
         iPmFormDataService.syncFormData("type", formDtl);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
     @PostMapping("/savePickTask")
     public ResponseEntity<Object> savePickTask(@RequestBody JSONArray params) {
         pickingService.savePickTask(params);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
     @PostMapping("/updateStatus")
     public ResponseEntity<Object> updateStatus(@RequestBody JSONObject param) {
@@ -63,12 +63,12 @@ public class PickingController {
         iPmFormDataService.update(new UpdateWrapper<PmFormData>()
                 .set("status",param.getString("status"))
                         .eq("id",param.getString("id")));
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
     @PostMapping("/taskOpen")
     public ResponseEntity<Object> taskOpen(@RequestBody JSONObject param) {
         pickingService.taskOpen(param);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java
index dbd5b800..eca40fd3 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java
@@ -44,7 +44,7 @@ public class StIvtStructattrController {
         dto.setCreate_name(SecurityUtils.getCurrentNickName());
         dto.setCreate_time(DateUtil.now());
         structattrService.save(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java
index d826a9f9..00c1eec0 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java
@@ -27,7 +27,7 @@ public interface IStIvtStructattrService extends IService<StIvtStructattr> {
      */
     List<Map<String, Object>> getByQuery(StructattrQuery query);
 
-    void changeStruct(String struct_code,String vehicle_code,String task_type);
+    void changeStruct(String struct_code,String vehicle_code,String task_type,Boolean in_storage);
     void deleteAll(Long[] ids);
 
     Object pageQuery(StructattrQuery query, PageQuery page);
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml
index dd4b3165..bb130875 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml
@@ -4,22 +4,42 @@
 
     <select id="getPageQuery" resultType="java.util.Map">
         SELECT
+        md_pb_vehicleMater.material_id,
+        md_pb_vehicleMater.qty,
+        md_pb_vehicleMater.frozen_qty,
+        md_pb_vehicleMater.pcsn,
+        md_pb_vehicleMater.unit_id,
+        md_me_materialbase.material_name,
+        md_me_materialbase.material_code,
+        md_me_materialbase.material_spec,
         struct.*,
         sect.sect_name,
         stor.stor_name
         FROM
         st_ivt_structattr struct
         left join st_ivt_sectattr sect on sect.sect_id = struct.sect_code
-        left join st_ivt_bsrealstorattr stor on sect.stor_id = stor.id
+        left join st_ivt_bsrealstorattr stor on struct.stor_code = stor.stor_code
+        left join md_pb_vehicleMater on struct.vehicle_code = md_pb_vehicleMater.vehicle_code
+        left JOIN md_me_materialbase on md_pb_vehicleMater.material_id  = md_me_materialbase.material_id
         <where>
             <if test="query.is_used == true">
                 and struct.is_used = '0'
             </if>
+            <if test="query.material != null and query.material != ''">
+                and (material_spec LIKE '%${query.material}%'
+                or material_name LIKE '%${query.material}%')
+            </if>
             <if test="query.is_used == false">
                 and struct.is_used = '1'
             </if>
-            <if test="query.is_used == null and query.is_used == ''">
-                and struct.is_used = #{query.is_used}
+            <if test="query.has == true">
+                and struct.vehicle_code is not null and struct.lock_type = '00'
+            </if>
+            <if test="query.has == false">
+                and struct.vehicle_code is  null and struct.lock_type = '00'
+            </if>
+            <if test="query.vehicle_code != null and query.vehicle_code != ''">
+                and struct.vehicle_code is not null
             </if>
             <if test="query.stor_code != null and query.stor_code != ''">
                 and struct.stor_code = #{query.stor_code}
@@ -35,6 +55,7 @@
                 or struct.struct_name LIKE '%${query.search}%')
             </if>
         </where>
+        GROUP BY struct.struct_code
     </select>
     <select id="collectVehicle" resultType="org.nl.wms.stor_manage.struct.service.dto.StructattrVechielDto">
         SELECT
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java
index dc16eaf6..bf09298f 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java
@@ -19,6 +19,8 @@ public class StructattrQuery extends BaseQuery<StIvtStructattr> {
     private String lock_type;
     private Boolean is_used;
     private String vehicle_code;
+    private String material;
+    private Boolean has;
     @Override
     public void paramMapping() {
         super.doP.put("search", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build());
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
index db2df26a..e7f43b2d 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
@@ -64,12 +64,12 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
         System.out.println(in);
     }
     @Override
-    public void changeStruct(String struct_code, String vehicle_code, String task_type) {
+    public void changeStruct(String struct_code, String vehicle_code, String task_type,Boolean in_storage) {
         String now = DateUtil.now();
         this.update(new UpdateWrapper<StIvtStructattr>()
                     .set("vehicle_code",vehicle_code)
                     .set("update_time",now)
-                    .set("lock_type", StatusEnum.LOCK.code("无"))
+                    .set("lock_type", StatusEnum.LOCK.code("无锁"))
                     .eq("struct_code",struct_code));
         //变动结存记录"如果没有载具物料信息则不考虑结存：TODO:多级载具处理
         List<MdPbVehicleMater> vehicleMaters = vehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>().eq("vehicle_code", vehicle_code));
@@ -91,7 +91,7 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
             record.setStruct_code(struct_code);
             record.setStor_code(attr.getStor_code());
             record.setVehicle_form_data(vehicleMater.getForm_data());
-            record.setGrowth( StatusEnum.IOBILL_TYPE_IN.check(task_type));
+            record.setGrowth(in_storage);
             records.add(record);
         }
         if (!CollectionUtils.isEmpty(records)){
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java
index 7dfc3940..a7a16f7e 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java
@@ -43,13 +43,13 @@ public class BmExternalFieldMappingController {
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody BmExternalFieldMapping dto) {
         mappingsService.save(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PostMapping("/addRows")
     public ResponseEntity<Object> addRows(@RequestBody RequestMappingParam param) {
         mappingsService.addRows(param);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java
index 4b3e49b9..96bbaa8f 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java
@@ -97,7 +97,7 @@ public class SyncFormMappingController {
         if (needSave!=null && (Boolean)needSave){
             formDataService.saveBatch(pmFormDatas);
         }
-        return new ResponseEntity<>(TableDataInfo.build(pmFormDatas),HttpStatus.CREATED);
+        return new ResponseEntity<>(TableDataInfo.build(pmFormDatas),HttpStatus.OK);
     }
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java
index 3104e51d..00df973a 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java
@@ -47,7 +47,7 @@ public class SysCodeRuleController {
 //    //SaCheckPermission("genCode:add")
     public ResponseEntity<Object> create(@Validated @RequestBody SysCodeRule codeRule) {
         codeRuleService.create(codeRule);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @Log("删除编码")
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java
index 9483d5e1..6e2f33cc 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java
@@ -42,7 +42,7 @@ public class SysCodeRuleDetailController {
 //    //SaCheckPermission("genCode:add")
     public ResponseEntity<Object> create(@RequestBody SysCodeRuleDetail codeRuleDetail){
         codeDetailService.create(codeRuleDetail);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @Log("删除编码明细")
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java
index ae9a5a26..8a4e2faf 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java
@@ -89,7 +89,7 @@ public class DeptController {
 //    //SaCheckPermission("dept:add")
     public ResponseEntity<Object> create(@Validated @RequestBody SysDept resources){
         deptService.createDept(resources);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 //
     @Log("修改部门")
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
index dbb80f34..bfdf7c20 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
@@ -57,7 +57,7 @@ public class SysDictController {
     @PostMapping
     public ResponseEntity<Object> create(@RequestBody Dict dict){
         dictService.create(dict);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
@@ -94,7 +94,7 @@ public class SysDictController {
     @PostMapping("/dictDetail")
     public ResponseEntity<Object> createDetail(@RequestBody Dict resources){
         dictService.createDetail(resources);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @Log("修改字典详情")
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
index 34c96ff9..e49637a7 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
@@ -99,7 +99,7 @@ public class SysMenuController {
     //SaCheckPermission("menu:add")
     public ResponseEntity<Object> create(@RequestBody SysMenu form) {
         iSysMenuService.create(form);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @Log("修改菜单")
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java
index 9544ba1b..ab6f9e4d 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java
@@ -50,7 +50,7 @@ class SysParamController {
     ////SaCheckPermission("param:add")
     public ResponseEntity<Object> create(@Validated @RequestBody Param param) {
         paramService.create(param);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
@@ -77,7 +77,7 @@ class SysParamController {
     //("根据编码获取值")
     @SaIgnore
     public ResponseEntity<Object> getValueByCode(@RequestBody String code) {
-        return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED);
+        return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.OK);
     }
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java
index 6607df26..63fa3ac7 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java
@@ -50,7 +50,7 @@ public class SysDataPermissionController {
     ////SaCheckPermission("@el.check('dataPermission:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SysDataPermission permission) {
         dataPermissionService.create(permission);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
@@ -90,7 +90,7 @@ public class SysDataPermissionController {
     //("保存数据权限")
     public ResponseEntity<Object> saveDataPermission(@RequestBody JSONObject datas){
         dataPermissionService.savePermission(datas);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PostMapping("/dataShow")
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java
index 17d3ae4a..ba00b393 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java
@@ -60,7 +60,7 @@ public class SysQuartzJobController {
             throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID");
         }
         quartzJobService.createJob(resources);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @Log("修改定时任务")
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java
index 11a557c0..2765aac4 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java
@@ -50,7 +50,7 @@ public class SysRoleController {
     //SaCheckPermission("roles:add")
     public ResponseEntity<Object> create(@RequestBody JSONObject param) {
         roleService.create(param);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @Log("修改角色")
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java
index 5f82cfa5..086dbe48 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java
@@ -63,7 +63,7 @@ public class UserController {
     @PostMapping
     public ResponseEntity<Object> create(@RequestBody JSONObject user){
         userService.create(user);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @Log("修改用户")
diff --git a/wms_pro/hd/nladmin-system/src/main/resources/banner.txt b/wms_pro/hd/nladmin-system/src/main/resources/banner.txt
index 8be4ead6..cd9b68c0 100644
--- a/wms_pro/hd/nladmin-system/src/main/resources/banner.txt
+++ b/wms_pro/hd/nladmin-system/src/main/resources/banner.txt
@@ -1,8 +1,5 @@
- _   _ ___________ _      _____ _      ___________ _____
-| \ | |  _  | ___ \ |    |  ___| |    |  ___|  ___|_   _|
-|  \| | | | | |_/ / |    | |__ | |    | |__ | |_    | |
-| . ` | | | | ___ \ |    |  __|| |    |  __||  _|   | |
-| |\  \ \_/ / |_/ / |____| |___| |____| |___| |     | |
-\_| \_/\___/\____/\_____/\____/\_____/\____/\_|     \_/
-
- :: Spring Boot ::       (v2.1.0.RELEASE)
\ No newline at end of file
+------------------------------
+    托盘库编码：FStockPallet
+    料箱库编码: FStockId
+    虚拟库编码: FicStockId
+------------------------------
diff --git a/wms_pro/hd/nladmin-system/src/main/resources/templates/generator/admin/Controller.ftl b/wms_pro/hd/nladmin-system/src/main/resources/templates/generator/admin/Controller.ftl
index db23118c..d7bed0ae 100644
--- a/wms_pro/hd/nladmin-system/src/main/resources/templates/generator/admin/Controller.ftl
+++ b/wms_pro/hd/nladmin-system/src/main/resources/templates/generator/admin/Controller.ftl
@@ -42,7 +42,7 @@ public class ${className}Controller {
     //@PreAuthorize("@el.check('${changeClassName}:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody ${className}Dto dto){
         ${changeClassName}Service.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping
diff --git a/wms_pro/qd/src/utils/request.js b/wms_pro/qd/src/utils/request.js
index 4fc388b2..1855b52d 100644
--- a/wms_pro/qd/src/utils/request.js
+++ b/wms_pro/qd/src/utils/request.js
@@ -39,7 +39,7 @@ service.interceptors.response.use(
       const reader = new FileReader()
       reader.readAsText(error.response.data, 'utf-8')
       reader.onload = function(e) {
-        const errorMsg = JSON.parse(reader.result).message
+        const errorMsg = JSON.parse(reader.result).msg
         Notification.error({
           title: errorMsg,
           duration: 5000
@@ -48,7 +48,7 @@ service.interceptors.response.use(
     } else {
       let code = 0
       try {
-        code = error.response.data.status
+        code = error.response.data.code
       } catch (e) {
         if (error.toString().indexOf('Error: timeout') !== -1) {
           Notification.error({
@@ -69,7 +69,7 @@ service.interceptors.response.use(
         } else if (code === 403) {
           router.push({ path: '/401' })
         } else {
-          const errorMsg = error.response.data.message
+          const errorMsg = error.response.data.msg
           if (errorMsg !== undefined) {
             Notification.error({
               title: errorMsg,
diff --git a/wms_pro/qd/src/views/wms/base_manage/material/MaterDialog.vue b/wms_pro/qd/src/views/wms/base_manage/material/MaterDialog.vue
index b0395b74..0ccf6ac7 100644
--- a/wms_pro/qd/src/views/wms/base_manage/material/MaterDialog.vue
+++ b/wms_pro/qd/src/views/wms/base_manage/material/MaterDialog.vue
@@ -62,6 +62,7 @@
       <el-table-column prop="material_model" label="型号" />
       <el-table-column prop="class_code" label="分类编码" />
       <el-table-column prop="class_name" label="物料分类" />
+      <el-table-column prop="single_weight" label="物料单重" />
       <el-table-column
         show-overflow-tooltip
         min-width="100"
diff --git a/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue b/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue
index 826916e3..a4ca1c74 100644
--- a/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue
+++ b/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue
@@ -300,6 +300,12 @@ export default {
       this.form.form_param = JSON.stringify(this.form.form_param)
       return true
     },
+    [CRUD.HOOK.beforeSubmit]() {
+      if (this.form.form_param){
+        this.form.form_param = JSON.parse(this.form.form_param)
+      }
+      return true
+    },
     getFormSelect() {
       formstruc.getTypes().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
         this.form_types = res
diff --git a/wms_pro/qd/src/views/wms/decision_manage/strategy/index.vue b/wms_pro/qd/src/views/wms/decision_manage/strategy/index.vue
index a5cec544..90d95571 100644
--- a/wms_pro/qd/src/views/wms/decision_manage/strategy/index.vue
+++ b/wms_pro/qd/src/views/wms/decision_manage/strategy/index.vue
@@ -16,7 +16,7 @@
               v-model="query.strategy_name"
               clearable
               size="mini"
-              placeholder="起始载具号"
+              placeholder="策略名称"
               style="width: 200px;"
               class="filter-item"
               @keyup.enter.native="crud.toQuery"
diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue
index 3d46f2e2..ddcb7d28 100644
--- a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue
+++ b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue
@@ -120,7 +120,7 @@
         >
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">删除</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="crud.doDelete(scope.row)">删除</el-button>
             <el-dropdown trigger="click" size="mini">
               <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
               <el-dropdown-menu slot="dropdown">
diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue
index ee39fed2..94208db1 100644
--- a/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue
+++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue
@@ -285,9 +285,14 @@ export default {
           data.material_code = row.material_code
           data.material_id = row.material_id
           data.material_spec = row.material_spec
+          data.single_weight = row.single_weight
           data.form_data = {}
         this.dtlCols.forEach(a=>{
-          this.$set(data.form_data,a.value,null)
+          let item = ''
+          if (a.value in data) {
+            item = data[a.value];
+          }
+          this.$set(data.form_data,a.value,item)
         })
           this.tableData.splice(-1, 0, data)
       })
@@ -322,8 +327,10 @@ export default {
           data.source_form_type = row.form_type
           data.source_form_id = row.id
           data.unit_id = row.unit_id
+          data.single_weight = row.single_weight
           data.form_data = {}
-        let row_form_data = row.form_data;
+        let fowFormData = row.form_data;
+        let row_form_data = {...fowFormData,...data};
         this.dtlCols.forEach(a=>{
           let item = ''
           if (a.value in row_form_data) {
diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue
index da2664d2..9d63d1d2 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue
@@ -316,12 +316,17 @@ export default {
         data.material_code = row.material_code
         data.material_id = row.material_id
         data.material_spec = row.material_spec
+        data.single_weight = row.single_weight
         data.source_form_type = ''
         data.source_form_id = ''
         data.unit_id = row.unit_id
         data.form_data = {}
         this.dtlCols.forEach(a=>{
-          this.$set(data.form_data,a.value,'')
+          let item = ''
+          if (a.value in data) {
+            item = data[a.value];
+          }
+          this.$set(data.form_data,a.value,item)
         })
         this.tableData.splice(-1, 0, data)
       })
@@ -351,10 +356,12 @@ export default {
         data.material_id = row.material_id
         data.material_spec = row.material_spec
         data.source_form_type = row.form_type
+        data.single_weight = row.single_weight
         data.source_form_id = row.id
         data.unit_id = row.unit_id
         data.form_data = {}
-        let row_form_data = row.form_data;
+        let fowFormData = row.form_data;
+        let row_form_data = {...fowFormData,...data};
         this.dtlCols.forEach(a=>{
           let item = ''
           if (a.value in row_form_data) {
diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue
index 746cc8ee..c0671d68 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue
@@ -309,12 +309,17 @@ export default {
         data.material_code = row.material_code
         data.material_id = row.material_id
         data.material_spec = row.material_spec
+        data.single_weight = row.single_weight
         data.source_form_type = ''
         data.source_form_id = ''
         data.unit_id = row.unit_id
         data.form_data = {}
         this.dtlCols.forEach(a=>{
-          this.$set(data.form_data,a.value,'')
+          let item = ''
+          if (a.value in data) {
+            item = data[a.value];
+          }
+          this.$set(data.form_data,a.value,item)
         })
         this.tableData.splice(-1, 0, data)
       })
@@ -343,11 +348,13 @@ export default {
         data.material_code = row.material_code
         data.material_id = row.material_id
         data.material_spec = row.material_spec
+        data.single_weight = row.single_weight
         data.source_form_type = row.form_type
         data.source_form_id = row.id
         data.unit_id = row.unit_id
         data.form_data = {}
-        let row_form_data = row.form_data;
+        let fowFormData = row.form_data;
+        let row_form_data = {...fowFormData,...data};
         this.dtlCols.forEach(a=>{
           let item = ''
           if (a.value in row_form_data) {
diff --git a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/StructAttrDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/StructAttrDialog.vue
new file mode 100644
index 00000000..63f8c188
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/StructAttrDialog.vue
@@ -0,0 +1,227 @@
+<template>
+  <el-dialog
+    title="库存选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="仓库选择">
+        <el-input
+          v-model="this.storCode"
+          clearable
+          disabled
+          size="mini"
+          placeholder="仓位编码"
+        />
+      </el-form-item>
+      <el-form-item label="仓位搜索">
+        <el-input
+          v-model="query.search"
+          clearable
+          size="mini"
+          placeholder="仓位编码"
+        />
+      </el-form-item>
+      <el-form-item label="物料编码">
+        <el-input
+          v-model="query.material"
+          clearable
+          size="mini"
+          placeholder="物料编码模糊查询"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sect_name" label="库区"  show-overflow-tooltip />
+      <el-table-column prop="stor_name" label="仓库"  show-overflow-tooltip />
+      <el-table-column prop="struct_code" label="仓位编码"  show-overflow-tooltip />
+      <el-table-column prop="struct_name" label="仓位名称" show-overflow-tooltip />
+      <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <el-link type="warning"  @click="toView(scope.row)">{{ scope.row.vehicle_code }}</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column prop="material_name" label="物料规格"  show-overflow-tooltip />
+      <el-table-column prop="material_spec" label="物料规格"  show-overflow-tooltip />
+      <el-table-column prop="pcsn" label="批次"  show-overflow-tooltip />
+      <el-table-column prop="qty" label="数量"  show-overflow-tooltip />
+      <el-table-column prop="frozen_qty" label="冻结数量" show-overflow-tooltip />
+      <el-table-column prop="unit_id" label="单位"  show-overflow-tooltip >
+        <template slot-scope="scope">
+          {{ tableEnum.label.bm_measure_unit[scope.row.unit_id] }}
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="is_used" label="是否启用" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.is_used"
+            active-color="#409EFF"
+            inactive-color="#F56C6C"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="lock_type" label="锁定类型" >
+        <template slot-scope="scope">
+          {{ statusEnum.label.LOCK[scope.row.lock_type] }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="h" label="高度" />
+      <el-table-column prop="l" label="长度" />
+      <el-table-column prop="w" label="宽度" />
+    </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>
+</template>
+
+<script>
+import crudStructAttr from './structattr'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: 'StructDtl',
+  components: { rrOperation, pagination, Treeselect },
+  cruds() {
+    return CRUD({ title: '仓库信息', url: 'api/structattr', crudMethod: { ...crudStructAttr }, optShow:
+        {
+      }})
+  },
+  mixins: [presenter(), header()],
+  tableEnums: [ 'bm_measure_unit#unit_name#unit_id' ],
+  statusEnums: [ 'LOCK' ],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    },
+    storCode: {
+      type: String,
+      default: ''
+    },
+    has: {
+      type: Boolean,
+      default: null
+    }
+
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      class_idStr: null,
+      checkrow: null,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.query.stor_code = this.storCode
+      this.query.has = this.has
+      this.crud.toQuery()
+    },
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.storCode){
+        return true
+      }
+      return  false
+    },
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    toView(vehicle_code){
+
+    },
+    handleSelectionChange(val, row) {
+      if (this.isSingle) {
+        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.dialogVisible = false
+        this.$emit('update:dialogShow', false)
+        this.$emit('setMaterValue', 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('setMaterValue', this.rows)
+    },
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+
diff --git a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/structattr.js b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/structattr.js
new file mode 100644
index 00000000..3dcb14c8
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/structattr.js
@@ -0,0 +1,115 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/stIvtIostorinv',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/stIvtIostorinv/delete',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/stIvtIostorinv/update',
+    method: 'post',
+    data
+  })
+}
+
+export function getIosInvDtl(data) {
+  return request({
+    url: '/api/stIvtIostorinv/getIosInvDtl',
+    method: 'post',
+    data
+  })
+}
+export function getVehicleTask(data) {
+  return request({
+    url: '/api/schBaseTask/getVehicleTask',
+    method: 'post',
+    data
+  })
+}
+
+export function vehicleCheck() {
+  return request({
+    url: '/api/stIvtIostorinv/vehicleCheck',
+    method: 'post'
+  })
+}
+
+export function inDecision(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inDecision',
+    method: 'post',
+    data
+  })
+}
+
+export function confirm(data) {
+  return request({
+    url: '/api/stIvtIostorinv/confirm',
+    method: 'post',
+    data
+  })
+}
+
+export function cancelDecision(data) {
+  return request({
+    url: '/api/stIvtIostorinv/cancelDecision',
+    method: 'post',
+    data
+  })
+}
+export function taskOpen(data) {
+  return request({
+    url: '/api/stIvtIostorinv/taskOpen',
+    method: 'post',
+    data
+  })
+}
+
+export function delTask(data) {
+  return request({
+    url: '/api/stIvtIostorinv/delTask',
+    method: 'post',
+    data
+  })
+}
+
+export function sendTask(data) {
+  return request({
+    url: '/api/stIvtIostorinv/sendTask',
+    method: 'post',
+    data
+  })
+}
+
+export function confirmTask(data) {
+  return request({
+    url: '/api/stIvtIostorinv/confirmTask',
+    method: 'post',
+    data
+  })
+}
+
+export default {
+  add,
+  edit,
+  del,
+  getVehicleTask,
+  getIosInvDtl,
+  vehicleCheck,
+  inDecision,
+  cancelDecision,
+  taskOpen,
+  confirm
+}
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/AddDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/AddDialog.vue
new file mode 100644
index 00000000..b9dfb2ec
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/AddDialog.vue
@@ -0,0 +1,312 @@
+<template>
+  <el-dialog
+    :title="crud.status.title"
+    append-to-body
+    fullscreen
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    width="1600px"
+    @open="open"
+    @close="close"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="submitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <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="85px" label-suffix=":">
+      <el-form-item label="单据号" prop="code">
+        <el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 150px" />
+      </el-form-item>
+      <template v-for="(col,index) in cols">
+        <el-form-item :label="col.lable">
+          <el-select v-if="col.value == 'stor_code'"
+            v-model="form.form_data[col.value]"
+            clearable
+            class="filter-item"
+            placeholder="所属仓库"
+            @change="changeStor"
+          >
+            <el-option
+              v-for="item in tableEnum.st_ivt_bsrealstorattr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-input  v-if="col.value != 'stor_code'" :label="col.lable" v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 150px" />
+        </el-form-item>
+      </template>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea"  />
+      </el-form-item>
+    </el-form>
+
+    <div class="crud-opts2" style="margin-bottom: 5px;">
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+         <el-button
+           slot="left"
+           class="filter-item"
+           type="primary"
+           icon="el-icon-plus"
+           size="mini"
+           @click="insertEvent()"
+         >
+          选择库存
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="tableData"
+      style="width: 100%;"
+      border
+      highlight-current-row
+      :row-class-name="tableRowClassName"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @row-click="handleDtlCurrentChange"
+    >
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" />
+      <el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" />
+      <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
+      <el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
+      <el-table-column show-overflow-tooltip prop="qty" label="物料数量" />
+      <el-table-column show-overflow-tooltip prop="unit_id" label="单位" >
+        <template slot-scope="scope">
+        {{ tableEnum.label.bm_measure_unit[scope.row.unit_id] }}
+        </template>
+      </el-table-column>
+      <el-table-column  v-for="(item, index) in dtlCols" :key="item.value"  :label="item.lable" width="160">
+        <template scope="scope">
+          <el-input v-model="tableData[scope.$index].form_data[item.value]" disabled class="input-with-select" />
+        </template>
+      </el-table-column>
+      <el-table-column  label="备注" width="160">
+        <template scope="scope">
+          <el-input v-model="tableData[scope.$index].remark"  class="input-with-select" />
+        </template>
+      </el-table-column>
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
+        <template scope="scope">
+          <el-button
+            type="danger"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-delete"
+            @click.native.prevent="deleteRow(scope.$index, tableData)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <StructAttrDialog
+      :dialog-show.sync="structShow"
+      :is-single="false"
+      :storCode="stor_code"
+      :has=true
+      @setMaterValue="tableDtlMaterial"
+    />
+  </el-dialog>
+
+</template>
+
+<script>
+import CRUD, { crud, form } from '@crud/crud'
+import StructAttrDialog from '@/views/wms/stor_manage/storIvtInfo/StructAttrDialog'
+import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
+import crudCheck from '@/views/wms/stor_manage/warehouse/checkStorage/check'
+
+const defaultForm = {
+  id: '',
+  code: '',
+  form_type: '',
+  status: '',
+  product_area: '',
+  source_form_type: '',
+  source_form_id: '',
+  source_form_date: '',
+  create_name: '',
+  create_time: '',
+  update_name: '',
+  update_time: '',
+  remark: '',
+  form_data: {},
+  proc_inst_id:''
+}
+
+export default {
+  name: 'AddDialog',
+  components: { formstruc, StructAttrDialog },
+  mixins: [crud(), form(defaultForm)],
+  statusEnums: [ 'FORM_STATUS', 'IOBILL_TYPE_IN' ],
+  tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code','bm_measure_unit#unit_name#unit_id' ],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      cols:[],
+      dtlCols:[],
+      tableData:[],
+      structs:[],
+      endStructs:[],
+      currentIndex:null,
+      dialogVisible: false,
+      structShow: false,
+      structShow2: false,
+      dis_flag: true,
+      stor_code: '',
+      has: 'has',
+      rules: {
+        bill_type: [
+          { required: true, message: '单据类型不能为空', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.tableData = [],
+      this.structs = [],
+      this.endStructs = [],
+      formstruc.getHeader('st_ivt_check').then(res => {
+        this.cols = res
+        this.form.form_type = 'st_ivt_check'
+        res.forEach(a => {
+          this.form.form_data[a.value,'']
+        })
+      })
+      formstruc.getHeader('st_ivt_checkdtl').then(res => {
+        this.dtlCols = res
+      })
+    },
+    close() {
+        this.tableData = [],
+        this.structs = [],
+        this.endStructs = [],
+          this.crud.cancelCU()
+      this.$emit('AddChanged')
+    },
+    changeStor(stor){
+      this.stor_code = stor
+    },
+
+    insertEvent(row) {
+      this.structShow = true
+    },
+    endStruct(row) {
+      this.structShow2 = true
+    },
+    tableRowClassName({ row, rowIndex }) {
+      row.index = rowIndex
+    },
+    handleDtlCurrentChange(current) {
+      if (current !== null) {
+        this.currentIndex = current.index
+        this.dis_flag = false
+      } else {
+        this.currentIndex = null
+        this.dis_flag = true
+      }
+    },
+    submitCU() {
+      // 提交前校验
+      this.$refs['form'].validate((valid) => {
+          if (valid) {
+            return true
+          }else {
+            return false
+          }
+      })
+      if (this.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      this.form.item = this.tableData
+      crudCheck.add(this.form).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.close()
+        this.dialogVisible
+        this.crud.toQuery()
+      })
+    },
+
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+    },
+
+    tableDtlMaterial(rows) {
+      rows.forEach((row) => {
+        if (this.structs.includes(row.struct_code)){
+          return
+        }
+         const data = {}
+        this.structs.push(row.struct_code)
+        data.sect_name = row.sect_name
+        data.sect_code = row.sect_code
+        data.stor_code = row.stor_code
+        data.stor_name = row.stor_name
+        data.struct_code = row.struct_code
+        data.vehicle_code = row.vehicle_code
+        data.material_spec = row.material_spec
+        data.material_name = row.material_name
+        data.material_id = row.material_id
+        data.pcsn = row.pcsn
+        data.qty = row.qty
+        data.unit_id = row.unit_id
+        data.form_type = 'st_ivt_checkdtl'
+        data.form_data = {}
+        this.dtlCols.forEach(a=>{
+          let item = ''
+          if (a.value in data) {
+            item = data[a.value];
+          }
+          this.$set(data.form_data,a.value,item)
+        })
+        this.tableData.splice(-1, 0, data)
+
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 4px 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+}
+</style>
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/TaskDialog.vue
new file mode 100644
index 00000000..9b433a67
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/TaskDialog.vue
@@ -0,0 +1,352 @@
+<template>
+  <el-dialog
+    append-to-body
+    title="盘点作业"
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    fullscreen
+    @close="close"
+  >
+
+    <el-row  :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini"  type="primary" @click="savePickMst">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="closeDialog">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
+             :model="form" size="mini" label-width="100px" label-suffix=":">
+      <el-form-item label="单据编号" prop="code">
+        <el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="单据类型" prop="form_type">
+        <el-input v-model="form.form_type" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select
+          v-model="form.status"
+          clearable
+          size="mini"
+          placeholder="请选择"
+          class="filter-item"
+          style="width: 180px;"
+          disabled
+        >
+          <el-option
+            v-for="item in statusEnum.FORM_STATUS"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <!--        <el-input v-model="form.status" disabled clearable style="width: 210px"/>-->
+      </el-form-item>
+      <el-form-item label="创建时间" prop="create_time">
+        <!--        <el-date-picker v-model="form.create_time" type="date" placeholder="选择日期" style="width: 210px"-->
+        <!--                        value-format="yyyy-MM-dd" :disabled="true"/>-->
+        <el-input v-model="form.create_time" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <template v-for="(col,index) in cols">
+        <el-form-item label="col.lable" prop="bill_code">
+          <label slot="label">{{ col.lable }}:</label>
+          <el-input disabled v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 210px"/>
+        </el-form-item>
+      </template>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" disabled clearable style="width: 210px"/>
+      </el-form-item>
+    </el-form>
+    <div class="crud-opts2">
+      <span class="role-span">盘点明细</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="right"/>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          :disabled="dis_flag"
+          icon="el-icon-plus"
+          size="mini"
+          @click="saveCheck()"
+        >
+          盘点确认
+        </el-button>
+      </span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="tableDtl"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDtlCurrentChange"
+      >
+        <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
+        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip width="120"/>
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="批次" align="center" width="150" />
+        <el-table-column prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column prop="unit_id"  label="数量" align="center" >
+          <template slot-scope="scope">
+            {{ tableEnum.label.bm_measure_unit[scope.row.unit_id] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <template v-for="item in statusEnum.FORM_STATUS">
+              <span v-if="item.value === scope.row.status">{{ item.label }}</span>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column width="160" show-overflow-tooltip v-for="(item, index) in dtlCols" :key="item.value"
+                         :label="item.lable">
+          <template slot-scope="scope">
+            <el-input-number v-if="item.value == 'check_qty'" v-model="scope.row.form_data[item.value]" @input="qtyClick(scope.row)" class="input-with-select" />
+            <el-select disabled v-if="item.value == 'profit_loss'"
+                       v-model="scope.row.form_data[item.value]"
+                       clearable
+                       size="mini"
+                       placeholder="盘点结果"
+                       class="filter-item"
+                       style="width: 120px"
+            >
+              <el-option
+                v-for="item in outboundList"
+                :key="item.key"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+            <el-input v-if="item.value != 'check_qty' && item.value != 'profit_loss'" v-model="scope.row.form_data[item.value]" disabled class="input-with-select" />
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="create_time" label="创建时间"/>
+        <el-table-column prop="proc_inst_id" label="流程编码" show-overflow-tooltip width="120"/>
+      </el-table>
+    </el-card>
+
+  </el-dialog>
+
+</template>
+
+<script>
+import CRUD, { crud } from '@crud/crud'
+import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
+import crudFormData from "./formData";
+import crudChek from "./check";
+
+
+export default {
+  name: 'TaskDialog',
+  components: { },
+  mixins: [crud()],
+  statusEnums: [ 'IOBILL_TYPE_OUT','FORM_STATUS' ],
+  tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code','bm_measure_unit#unit_name#unit_id' ],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    storId: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      dis_flag: true,
+      cols: [],
+      dtlCols: [],
+      unitDict: [],
+      disCols: [],
+      disFormData: [],
+      tableDtl: [],
+      tabledis: [],
+      vehicledis: [],
+      vehicleform:{},
+      un_assign_qty:0,
+      currentDtl: null,
+
+      outboundList:[
+        {"label":"盘盈","value":"1"},{"label":"盘亏","value":"0"},{"label":"实盘","value":"2"}
+      ],
+      form: {},
+      rules: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    setForm(row) {
+      this.dialogVisible = true
+      this.form = row
+      let dtl_form_type = this.form.children[0].form_type;
+      formstruc.getHeader(this.form.form_type).then(res => {
+        this.cols = res
+      })
+      formstruc.getHeader(dtl_form_type).then(res => {
+        this.dtlCols = res
+      })
+      this.queryTableDtl(row.id)
+    },
+    addPickTask(){
+      let dis_assign_qty = 0;
+      this.tabledis.forEach(a=>{
+        dis_assign_qty = dis_assign_qty+a.qty
+      })
+      if (!this.currentDtl) {
+        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      let dtl = {};
+      dtl.material_id = this.currentDtl.material_id
+      dtl.material_name = this.currentDtl.material_name
+      dtl.material_spec = this.currentDtl.material_spec
+      dtl.material_pcsn = this.currentDtl.material_pcsn
+      dtl.qty = this.currentDtl.assign_qty-dis_assign_qty
+      dtl.pcsn = this.currentDtl.pcsn
+      dtl.unit_id = this.currentDtl.unit_id
+      dtl.form_type = 'Picking_Task'
+      dtl.source_form_type = this.currentDtl.source_form_type
+      dtl.source_form_id = this.currentDtl.id
+      dtl.source_form_date = this.currentDtl.create_time
+      dtl.parent_id = this.currentDtl.id
+      dtl.form_data = {}
+      this.disFormData.forEach(a => {
+          dtl.form_data[a.value,'']
+      })
+      this.tabledis.push(dtl)
+    },
+    subRow(index){
+      this.tabledis.splice(this.tabledis.indexOf(index),1)
+    },
+    handleDtlCurrentChange(current) {
+      if (current !== null) {
+        this.tabledis = []
+        this.currentDtl = current
+        this.dis_flag = false
+        // this.queryTableDis()
+      } else {
+        this.dis_flag = true
+        this.tabledis = []
+        this.currentDtl = {}
+      }
+    },
+    changeTaskType(index,taskType) {
+      if (taskType == "13"){
+        let dis_assign_qty = 0;
+        this.tabledis.forEach(a=>{
+          dis_assign_qty = dis_assign_qty+a.qty
+        })
+        this.tabledis[index].qty = this.currentDtl.qty-dis_assign_qty
+      }
+    },
+    saveCheck() {
+      crudChek.saveCheckTask(this.currentDtl).then(res => {
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.queryTableDtl(this.currentDtl.parent_id)
+      })
+    },
+
+    queryTableDtl(id) {
+      crudFormData.getSonFormData(id).then(res => {
+        this.tableDtl = res
+      })
+    },
+    queryTableDis() {
+      if (this.currentDtl !== null) {
+        crudFormData.getSonFormData(this.currentDtl.id).then(res => {
+          this.tabledis = res
+        })
+      }
+    },
+    closeDialog(){
+      this.dialogVisible = false
+      this.tabledis = []
+      this.tableDtl = []
+    },
+    savePickMst(){
+      crudChek.updateStatus({"status":"13","id":this.form.id})
+      this.closeDialog()
+    },
+    close() {
+      this.form.tableMater = []
+      this.form.dtl_row = null
+      this.form.bucketunique = null
+      this.sectProp = null
+      this.$emit('update:dialogShow', false)
+      this.$emit('AddChanged')
+      this.crud.refresh()
+      this.$refs['form2'].resetFields()
+    },
+    qtyClick(row){
+      if (row.form_data.check_qty > row.qty){
+        this.$set(row.form_data, 'profit_loss', '1')
+      }
+      if (row.form_data.check_qty < row.qty){
+        this.$set(row.form_data, 'profit_loss', '0')
+      }
+      if (row.form_data.check_qty == row.qty){
+        this.$set(row.form_data, 'profit_loss', '2')
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size: 20px;
+  color: #303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+.crud-opts-right2  {
+  padding-left: 77%;
+}
+
+.input-with-select {
+  background-color: #fff;
+}
+</style>
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/ViewDialog.vue
new file mode 100644
index 00000000..71313a91
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/ViewDialog.vue
@@ -0,0 +1,300 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    append-to-body
+    title="盘点单详情"
+    :visible.sync="dialogVisible"
+    fullscreen
+    @close="close"
+    @open="open"
+  >
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
+             :model="form" size="mini" label-width="100px" label-suffix=":">
+      <el-form-item label="单据编号" prop="code">
+        <el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="单据类型" prop="form_type">
+        <el-input v-model="form.form_type" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select
+          v-model="form.status"
+          clearable
+          size="mini"
+          placeholder="请选择"
+          class="filter-item"
+          style="width: 180px;"
+          disabled
+        >
+          <el-option
+            v-for="item in statusEnum.FORM_STATUS"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <template v-for="(col,index) in cols">
+        <el-form-item :label="col.lable">
+          <el-select v-if="col.value == 'stor_code'"
+                     v-model="form.form_data[col.value]"
+                     disabled
+                     class="filter-item"
+                     placeholder="所属仓库"
+          >
+            <el-option
+              v-for="item in tableEnum.st_ivt_bsrealstorattr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-input disabled v-if="col.value != 'stor_code'" :label="col.lable" v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 150px" />
+        </el-form-item>
+      </template>
+      <el-form-item label="备注" prop="create_time">
+        <el-input v-model="form.remark" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="create_time">
+        <el-input v-model="form.create_time" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="创建人" prop="create_time">
+        <el-input v-model="form.create_name" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="修改时间" prop="create_time">
+        <el-input v-model="form.create_time" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="修改人" prop="create_time">
+        <el-input v-model="form.create_name" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="流程编码" prop="create_time">
+        <el-input v-model="form.proc_inst_id" disabled clearable style="width: 210px"/>
+      </el-form-item>
+    </el-form>
+    <div class="crud-opts2">
+      <span class="role-span2">单据明细</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="tableDtl"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDtlCurrentChange"
+      >
+        <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
+        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip width="120"/>
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="批次" align="center" width="150" />
+        <el-table-column prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column prop="unit_id"  label="数量" align="center" >
+          <template slot-scope="scope">
+            {{ tableEnum.label.bm_measure_unit[scope.row.unit_id] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <template v-for="item in statusEnum.FORM_STATUS">
+              <span v-if="item.value === scope.row.status">{{ item.label }}</span>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column width="130" show-overflow-tooltip v-for="(item, index) in dtlCols" :key="item.value"
+                         :label="item.lable">
+          <template slot-scope="scope">
+            <spen v-if="item.value =='stor_code'">{{ tableEnum.label.st_ivt_bsrealstorattr[scope.row.form_data[item.value]]}}</spen>
+            <spen v-if="item.value =='profit_loss'">{{ statusEnum.label.profit_loss[scope.row.form_data[item.value]]}}</spen>
+            <spen v-if="item.value !='stor_code' && item.value !='profit_loss'">{{ scope.row.form_data[item.value] }}</spen>
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="创建时间"/>
+        <el-table-column prop="proc_inst_id" label="流程编码" show-overflow-tooltip width="120"/>
+      </el-table>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">作业明细</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="tabledis"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDisCurrentChange"
+      >
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="批次" align="center" width="150" />
+        <el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" align="center" />
+        <el-table-column prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column prop="frozen_qty" :formatter="crud.formatNum3" label="分配数量" align="center" />
+        <el-table-column prop="point_code1" label="起始位置" align="center" width="120"/>
+        <el-table-column prop="point_code2" label="目的位置" align="center" width="120"/>
+        <el-table-column prop="task_code" label="任务号" align="center" />
+        <el-table-column prop="status" label="任务状态" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <template v-for="item in statusEnum.FORM_STATUS">
+              <span v-if="item.value === scope.row.status">{{ item.label }}</span>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column prop="source_form_type" label="源单类型" align="center" width="150"/>
+        <el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150"/>
+      </el-table>
+    </el-card>
+
+
+  </el-dialog>
+  </template>
+
+<script>
+
+import {crud} from '@crud/crud'
+import crudFormData, {getSonFormData} from './formData'
+import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
+import crudStructattr from '@/views/wms/stor_manage/storIvtInfo/structattr'
+
+export default {
+  name: 'ViewDialog',
+  components: {formstruc, crudStructattr},
+  mixins: [crud()],
+  statusEnums: ['FORM_STATUS','profit_loss'],
+  tableEnums: [ 'bm_measure_unit#unit_name#unit_id','st_ivt_bsrealstorattr#stor_name#stor_code' ],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    rowmst: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      cols: [],
+      dtlCols: [],
+      disCols: [],
+      dialogVisible: false,
+      tableDtl: [],
+      tabledis: [],
+      disFormData: {},
+      billtypelist: [],
+      storlist: [],
+      currentdtl: null,
+      currentDis: {},
+      form: {},
+      PickTaskType:[
+        {"label":"拣选回库","value":"13"},{"label":"拣选出库","value":"23"}
+      ],
+      outboundList:[
+        {"label":"一楼出库口","value":"1101"},{"label":"二楼出库口","value":"2114"}
+      ],
+
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    rowmst: {
+      handler(newValue) {
+        this.form = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+
+    },
+    setForm(row) {
+      this.dialogVisible = true
+      this.form = row
+      let dtl_form_type = this.form.children[0].form_type;
+      formstruc.getHeader(this.form.form_type).then(res => {
+        this.cols = res
+      })
+      formstruc.getHeader(dtl_form_type).then(res => {
+        this.dtlCols = res
+      })
+      // formstruc.getHeader("Picking_Task").then(res => {
+      //   this.disCols = res
+      //   res.forEach(a => {
+      //     this.disFormData[a.value,'']
+      //   })
+      // }),
+      this.queryTableDtl(row.id)
+    },
+    close() {
+      this.dialogVisible = false
+    },
+    handleDtlCurrentChange(current) {
+      debugger
+      if (current !== null) {
+        this.currentdtl = current
+        this.queryTableDis(this.currentdtl)
+      } else {
+        this.tabledis = []
+        this.currentdtl = {}
+      }
+    },
+    invtypeFormat(row, column) {
+      for (const item of this.billtypelist) {
+        if (item.code === row.source_bill_type) {
+          return item.name
+        }
+      }
+    },
+    handleDisCurrentChange(current) {
+      this.currentDis = current
+    },
+    queryTableDtl(id) {
+      crudFormData.getSonFormData(id).then(res => {
+        this.tableDtl = res
+      })
+    },
+    queryTableDis(currentDtl) {
+      crudStructattr.getVehicleTask({ 'vehicle_code': currentDtl.vehicle_code }).then(res => {
+          this.tabledis = res
+        })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size: 20px;
+  color: #303133;
+}
+
+.crud-opts2 .role-span2 {
+  padding: 0px 0px 20px 0px;
+}
+
+.crud-opts2 {
+  padding: 10px 0px 0px 50px;
+}
+
+</style>
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/check.js b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/check.js
new file mode 100644
index 00000000..221809dc
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/check.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/check/save',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/check',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/check',
+    method: 'post',
+    data
+  })
+}
+export function updateStatus(data) {
+  return request({
+    url: '/api/check/updateStatus',
+    method: 'post',
+    data
+  })
+}
+export function saveCheckTask(data) {
+  return request({
+    url: '/api/check/saveCheckTask',
+    method: 'post',
+    data
+  })
+}
+
+
+
+export function taskopen(data) {
+  return request({
+    url: '/api/check/taskOpen',
+    method: 'post',
+    data
+  })
+}
+
+export default {add, edit, del, updateStatus, taskopen, saveCheckTask}
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/formData.js b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/formData.js
new file mode 100644
index 00000000..dc84c7ca
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/formData.js
@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/pmFormData',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/pmFormData',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/pmFormData',
+    method: 'put',
+    data
+  })
+}
+
+export function getFormType() {
+  return request({
+    url: 'api/bmFormStruc/getTypes',
+    method: 'get',
+  })
+}
+
+export function getParentFormTypes() {
+  return request({
+    url: 'api/bmFormStruc/getParentFormTypes',
+    method: 'get',
+  })
+}
+
+export function getSonFormData(id) {
+  return request({
+    url: 'api/pmFormData/getSonFormData/' + id,
+    method: 'get',
+  })
+}
+
+
+export default {add, edit, del, getFormType, getParentFormTypes, getSonFormData}
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/index.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/index.vue
new file mode 100644
index 00000000..737dd272
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/index.vue
@@ -0,0 +1,292 @@
+<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.form_type"
+              filterable
+              size="mini"
+              placeholder="请选择/搜索"
+              class="filter-item"
+              @change="crud.toQuery()"
+            >
+              <el-option
+                v-for="item in fromTypes"
+                :key="item.value"
+                :value="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <template v-for="(col,index) in cols" v-if="hideShowDialog">
+            <el-form-item label="col.lable">
+              <label slot="label">{{ col.lable }}:</label>
+              <el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px" />
+            </el-form-item>
+          </template>
+          <rrOperation :crud="crud" />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="dis_flag"
+          @click="disOpen"
+        >
+          盘点
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="task_flag"
+          @click="taskOpen"
+        >
+          作业下发
+        </el-button>
+      </crudOperation>
+
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        @select="handleSelectionChange"
+        :data="crud.data"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="code" label="单据编码" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <el-link v-if="scope.row.hasChildren" type="warning" @click="toView(scope.row)">{{
+              scope.row.code
+            }}
+            </el-link>
+            <span v-else>{{ scope.row.code }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120" />
+        <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <template v-for="item in statusEnum.FORM_STATUS">
+              <span v-if="item.value === scope.row.status">{{ item.label }}</span>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column  v-for="(item, index) in cols" :key="item.value"  :label="item.lable" >
+          <template slot-scope="scope">
+            <spen v-if="item.value =='stor_code'">{{ tableEnum.label.st_ivt_bsrealstorattr[scope.row.form_data[item.value]]}}</spen>
+            <spen v-if="item.value !='stor_code'">{{scope.row.form_data[item.value]}}</spen>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in cols"
+          :key="item.value"
+          width="130"
+          show-overflow-tooltip
+          :label="item.lable"
+        >
+          <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="create_time" label="创建时间" />
+        <el-table-column prop="create_name" label="创建人" />
+        <el-table-column prop="update_time" label="修改时间" />
+        <el-table-column prop="create_name" label="修改人" />
+        <el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
+        <el-table-column
+          label="操作"
+          fixed="right"
+          align="center"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="toDelete(scope.row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog ref="viewDialog" />
+    <ViewDialog ref="viewDialog" />
+    <TaskDialog ref="taskDis"/>
+
+  </div>
+</template>
+
+<script>
+import crudFormData from './formData'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
+import AddDialog from './AddDialog'
+import crudCheck from './check'
+import ViewDialog from './ViewDialog'
+import TaskDialog from './TaskDialog'
+
+
+// import UploadDialog from './UploadDialog'
+
+const defaultForm = {
+  id: null,
+  code: null,
+  proc_inst_id: null,
+  biz_id: null,
+  boz_code: null,
+  biz_date: null,
+  form_type: null,
+  status: null,
+  create_time: null,
+  create_name: null,
+  material_id: null,
+  qty: null,
+  pcsn: null,
+  vehicle_code: null,
+  from_data: null,
+  parent_id: null
+}
+export default {
+  name: 'FormData',
+  statusEnums: ['FORM_STATUS'],
+  components: { pagination, crudOperation, rrOperation, udOperation, AddDialog ,ViewDialog, TaskDialog },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
+
+  cruds() {
+    return CRUD({
+      title: '盘点单',
+      url: 'api/pmFormData',
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: { ...crudFormData },
+      optShow: {
+        add: true,
+        reset: true
+      },
+      query: {
+        form_type:'st_ivt_check',
+        form_data: {}
+      }
+    })
+  },
+  data() {
+    return {
+      cols: [],
+      classes: [],
+      task_flag: true,
+      currentRow: null,
+      uploadShow: false,
+      dis_flag: true,
+      fromTypes: [],
+      permission: {},
+      rules: {},
+      hideShowDialog: false
+    }
+  },
+  mounted() {
+  },
+  created() {
+    // 获取分类
+    formstruc.getHeader('st_ivt_check').then(res => {
+      this.cols = res
+      res.forEach(a => {
+        this.form.form_data[a.value, '']
+      })
+    })
+  },
+  methods: {
+    ToExpandall() {
+      const els = document.getElementsByClassName('el-table__expand-icon')
+      if (this.crud.data.length !== 0 && els.length !== 0) {
+        for (let j1 = 0; j1 < els.length; j1++) {
+          els[j1].classList.add('dafult')
+        }
+        if (this.$el.getElementsByClassName('el-table__expand-icon--expanded')) {
+          const open = this.$el.getElementsByClassName('el-table__expand-icon--expanded')
+          for (let j = 0; j < open.length; j++) {
+            open[j].classList.remove('dafult')
+          }
+          const dafult = this.$el.getElementsByClassName('dafult')
+          for (let a = 0; a < dafult.length; a++) {
+
+            dafult[a].click()
+          }
+        }
+      }
+    },
+    hideShow() {
+      if (this.hideShowDialog) {
+        // this.$set(this.query, 'form_query', {})
+      }
+      this.hideShowDialog = !this.hideShowDialog
+    },
+    toView(row) {
+      if (row !== null) {
+        this.$refs.viewDialog.setForm(row)
+      }
+    },
+
+    handleSelectionChange(val, row) {
+      if (val.length === 1) {
+        if (row.status == '10'){
+          this.task_flag = false
+        }else {
+          this.task_flag = true
+        }
+        this.dis_flag = false
+        this.currentRow = row
+      } else {
+        this.task_flag = true
+        this.dis_flag = true
+        this.currentRow = null
+      }
+    },
+
+    disOpen(row) {
+      if (this.currentRow !== null) {
+        this.$refs.taskDis.setForm(this.currentRow)
+      }
+    },
+    taskOpen(row) {
+      if (this.currentRow !== null) {
+        crudCheck.taskopen(this.currentRow).then(res => {
+          this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        })
+      }
+    },
+    toDelete(id) {
+      if (id !== null) {
+        crudCheck.del([id]).then(res => {
+          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        })
+      }
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/AddDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/AddDialog.vue
new file mode 100644
index 00000000..f22d0741
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/AddDialog.vue
@@ -0,0 +1,349 @@
+<template>
+  <el-dialog
+    :title="crud.status.title"
+    append-to-body
+    fullscreen
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    width="1600px"
+    @open="open"
+    @close="close"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="submitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <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="85px" label-suffix=":">
+      <el-form-item label="单据号" prop="code">
+        <el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 150px" />
+      </el-form-item>
+      <template v-for="(col,index) in cols">
+        <el-form-item :label="col.lable">
+          <el-select v-if="col.value == 'stor_code'"
+            v-model="form.form_data[col.value]"
+            clearable
+            class="filter-item"
+            placeholder="所属仓库"
+            @change="changeStor"
+          >
+            <el-option
+              v-for="item in tableEnum.st_ivt_bsrealstorattr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-input  v-if="col.value != 'stor_code'" :label="col.lable" v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 150px" />
+        </el-form-item>
+      </template>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea"  />
+      </el-form-item>
+    </el-form>
+
+    <div class="crud-opts2" style="margin-bottom: 5px;">
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+         <el-button
+           slot="left"
+           class="filter-item"
+           type="primary"
+           icon="el-icon-plus"
+           size="mini"
+           @click="insertEvent()"
+         >
+          选择库存
+        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="dis_flag"
+          @click="endStruct()"
+        >
+          分配终点
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="tableData"
+      style="width: 100%;"
+      border
+      highlight-current-row
+      :row-class-name="tableRowClassName"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @row-click="handleDtlCurrentChange"
+    >
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" />
+      <el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" />
+      <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
+      <el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
+      <el-table-column show-overflow-tooltip prop="qty" label="物料数量" />
+      <el-table-column show-overflow-tooltip prop="unit_id" label="单位" >
+        <template slot-scope="scope">
+        {{ tableEnum.label.bm_measure_unit[scope.row.unit_id] }}
+        </template>
+      </el-table-column>
+      <el-table-column  v-for="(item, index) in dtlCols" :key="item.value"  :label="item.lable" width="160">
+<!--        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip>-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-link type="warning"  @click="toView(scope.row)">{{ scope.row.vehicle_code }}</el-link>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <template scope="scope">
+          <el-input v-model="tableData[scope.$index].form_data[item.value]"  class="input-with-select" />
+        </template>
+      </el-table-column>
+
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <template scope="scope">
+          <el-input v-model="tableData[scope.$index].remark"  rows="2" type="textarea"/>
+        </template>
+      </el-form-item>
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
+        <template scope="scope">
+          <el-button
+            type="danger"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-delete"
+            @click.native.prevent="deleteRow(scope.$index, tableData)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <StructAttrDialog
+      :dialog-show.sync="structShow"
+      :is-single="false"
+      :storCode="stor_code"
+      :has=true
+      @setMaterValue="tableDtlMaterial"
+    />
+    <StructAttrDialog2
+      :dialog-show.sync="structShow2"
+      :is-single="true"
+      :storCode="stor_code"
+      :has=false
+      @setMaterValue="tableDtlMaterial2"
+    />
+  </el-dialog>
+
+</template>
+
+<script>
+import CRUD, { crud, form } from '@crud/crud'
+import StructAttrDialog from '@/views/wms/stor_manage/storIvtInfo/StructAttrDialog'
+import StructAttrDialog2 from '@/views/wms/stor_manage/storIvtInfo/StructAttrDialog'
+import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
+import crudMove from '@/views/wms/stor_manage/warehouse/move/move'
+
+const defaultForm = {
+  id: '',
+  code: '',
+  form_type: '',
+  status: '',
+  product_area: '',
+  source_form_type: '',
+  source_form_id: '',
+  source_form_date: '',
+  create_name: '',
+  create_time: '',
+  update_name: '',
+  update_time: '',
+  remark: '',
+  form_data: {},
+  proc_inst_id:''
+}
+
+export default {
+  name: 'AddDialog',
+  components: { formstruc, StructAttrDialog, StructAttrDialog2 },
+  mixins: [crud(), form(defaultForm)],
+  statusEnums: [ 'FORM_STATUS', 'IOBILL_TYPE_IN' ],
+  tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code','bm_measure_unit#unit_name#unit_id' ],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      cols:[],
+      dtlCols:[],
+      tableData:[],
+      structs:[],
+      endStructs:[],
+      currentIndex:null,
+      dialogVisible: false,
+      structShow: false,
+      structShow2: false,
+      dis_flag: true,
+      stor_code: '',
+      has: 'has',
+      rules: {
+        bill_type: [
+          { required: true, message: '单据类型不能为空', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.tableData = [],
+      this.structs = [],
+      this.endStructs = [],
+      formstruc.getHeader('st_ivt_move').then(res => {
+        this.cols = res
+        this.form.form_type = 'st_ivt_move'
+        res.forEach(a => {
+          this.form.form_data[a.value,'']
+        })
+      })
+      formstruc.getHeader('st_ivt_movedtl').then(res => {
+        this.dtlCols = res
+      })
+    },
+    close() {
+        this.tableData = [],
+        this.structs = [],
+        this.endStructs = [],
+          this.crud.cancelCU()
+      this.$emit('AddChanged')
+    },
+    changeStor(stor){
+      this.stor_code = stor
+    },
+
+    insertEvent(row) {
+      this.structShow = true
+    },
+    endStruct(row) {
+      this.structShow2 = true
+    },
+    tableRowClassName({ row, rowIndex }) {
+      row.index = rowIndex
+    },
+    handleDtlCurrentChange(current) {
+      if (current !== null) {
+        this.currentIndex = current.index
+        this.dis_flag = false
+      } else {
+        this.currentIndex = null
+        this.dis_flag = true
+      }
+    },
+    submitCU() {
+      // 提交前校验
+      this.$refs['form'].validate((valid) => {
+          if (valid) {
+            return true
+          }else {
+            return false
+          }
+      })
+      if (this.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      this.form.item = this.tableData
+      crudMove.add(this.form).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.close()
+        this.dialogVisible
+        this.crud.toQuery()
+      })
+    },
+
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+    },
+
+    tableDtlMaterial(rows) {
+      rows.forEach((row) => {
+        if (this.structs.includes(row.struct_code)){
+          return
+        }
+         const data = {}
+        this.structs.push(row.struct_code)
+        data.sect_name = row.sect_name
+        data.sect_code = row.sect_code
+        data.stor_code = row.stor_code
+        data.stor_name = row.stor_name
+        data.start_struct_code = row.struct_code
+        data.vehicle_code = row.vehicle_code
+        data.material_spec = row.material_spec
+        data.material_name = row.material_name
+        data.material_id = row.material_id
+        data.pcsn = row.pcsn
+        data.qty = row.qty
+        data.unit_id = row.unit_id
+        data.form_type = 'st_ivt_movedtl'
+        data.form_data = {}
+        this.dtlCols.forEach(a=>{
+          let item = ''
+          if (a.value in data) {
+            item = data[a.value];
+          }
+          this.$set(data.form_data,a.value,item)
+        })
+        this.tableData.splice(-1, 0, data)
+
+      })
+    },
+    tableDtlMaterial2(row) {
+      if (this.endStructs.includes(row.struct_code)){
+        this.crud.notify('当前目标货位已经分配,不允许选择相同货位', CRUD.NOTIFICATION_TYPE.WARNING)
+        return
+      }
+      if (this.currentIndex!=null){
+        let end_struct_code =row.struct_code
+        this.endStructs.push(end_struct_code)
+        this.$set(this.tableData[this.currentIndex].form_data,"end_struct_code",end_struct_code)
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 4px 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+}
+</style>
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/ViewDialog.vue
new file mode 100644
index 00000000..370cc69c
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/ViewDialog.vue
@@ -0,0 +1,284 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    append-to-body
+    title="移库单详情"
+    :visible.sync="dialogVisible"
+    fullscreen
+    @close="close"
+    @open="open"
+  >
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
+             :model="form" size="mini" label-width="100px" label-suffix=":">
+      <el-form-item label="单据编号" prop="code">
+        <el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="单据类型" prop="form_type">
+        <el-input v-model="form.form_type" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select
+          v-model="form.status"
+          clearable
+          size="mini"
+          placeholder="请选择"
+          class="filter-item"
+          style="width: 180px;"
+          disabled
+        >
+          <el-option
+            v-for="item in statusEnum.FORM_STATUS"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <template v-for="(col,index) in cols">
+        <el-form-item label="col.lable" prop="bill_code">
+          <label slot="label">{{ col.lable }}:</label>
+          <el-input disabled v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 210px"/>
+        </el-form-item>
+      </template>
+      <el-form-item label="备注" prop="create_time">
+        <el-input v-model="form.remark" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="create_time">
+        <el-input v-model="form.create_time" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="创建人" prop="create_time">
+        <el-input v-model="form.create_name" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="修改时间" prop="create_time">
+        <el-input v-model="form.create_time" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="修改人" prop="create_time">
+        <el-input v-model="form.create_name" disabled clearable style="width: 210px"/>
+      </el-form-item>
+      <el-form-item label="流程编码" prop="create_time">
+        <el-input v-model="form.proc_inst_id" disabled clearable style="width: 210px"/>
+      </el-form-item>
+    </el-form>
+    <div class="crud-opts2">
+      <span class="role-span2">单据明细</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="tableDtl"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDtlCurrentChange"
+      >
+        <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
+        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip width="120"/>
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="批次" align="center" width="150" />
+        <el-table-column prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column prop="unit_id"  label="数量" align="center" >
+          <template slot-scope="scope">
+            {{ tableEnum.label.bm_measure_unit[scope.row.unit_id] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <template v-for="item in statusEnum.FORM_STATUS">
+              <span v-if="item.value === scope.row.status">{{ item.label }}</span>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column width="130" show-overflow-tooltip v-for="(item, index) in dtlCols" :key="item.value"
+                         :label="item.lable">
+          <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="创建时间"/>
+        <el-table-column prop="proc_inst_id" label="流程编码" show-overflow-tooltip width="120"/>
+      </el-table>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">作业明细</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="tabledis"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDisCurrentChange"
+      >
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="批次" align="center" width="150" />
+        <el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" align="center" />
+        <el-table-column prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column prop="frozen_qty" :formatter="crud.formatNum3" label="分配数量" align="center" />
+        <el-table-column prop="point_code1" label="起始位置" align="center" width="120"/>
+        <el-table-column prop="point_code2" label="目的位置" align="center" width="120"/>
+        <el-table-column prop="task_code" label="任务号" align="center" />
+        <el-table-column prop="status" label="任务状态" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <template v-for="item in statusEnum.FORM_STATUS">
+              <span v-if="item.value === scope.row.status">{{ item.label }}</span>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column prop="source_form_type" label="源单类型" align="center" width="150"/>
+        <el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150"/>
+      </el-table>
+    </el-card>
+
+
+  </el-dialog>
+  </template>
+
+<script>
+
+import {crud} from '@crud/crud'
+import crudFormData, {getSonFormData} from './formData'
+import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
+import crudStructattr from '@/views/wms/stor_manage/storIvtInfo/structattr'
+
+export default {
+  name: 'ViewDialog',
+  components: {formstruc, crudStructattr},
+  mixins: [crud()],
+  statusEnums: ['FORM_STATUS'],
+  tableEnums: [ 'bm_measure_unit#unit_name#unit_id' ],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    rowmst: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      cols: [],
+      dtlCols: [],
+      disCols: [],
+      dialogVisible: false,
+      tableDtl: [],
+      tabledis: [],
+      disFormData: {},
+      billtypelist: [],
+      storlist: [],
+      currentdtl: null,
+      currentDis: {},
+      form: {},
+      PickTaskType:[
+        {"label":"拣选回库","value":"13"},{"label":"拣选出库","value":"23"}
+      ],
+      outboundList:[
+        {"label":"一楼出库口","value":"1101"},{"label":"二楼出库口","value":"2114"}
+      ],
+
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    rowmst: {
+      handler(newValue) {
+        this.form = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+
+    },
+    setForm(row) {
+      this.dialogVisible = true
+      this.form = row
+      let dtl_form_type = this.form.children[0].form_type;
+      formstruc.getHeader(this.form.form_type).then(res => {
+        this.cols = res
+      })
+      formstruc.getHeader(dtl_form_type).then(res => {
+        this.dtlCols = res
+      })
+      // formstruc.getHeader("Picking_Task").then(res => {
+      //   this.disCols = res
+      //   res.forEach(a => {
+      //     this.disFormData[a.value,'']
+      //   })
+      // }),
+      this.queryTableDtl(row.id)
+    },
+    close() {
+      this.dialogVisible = false
+    },
+    handleDtlCurrentChange(current) {
+      debugger
+      if (current !== null) {
+        this.currentdtl = current
+        this.queryTableDis(this.currentdtl)
+      } else {
+        this.tabledis = []
+        this.currentdtl = {}
+      }
+    },
+    invtypeFormat(row, column) {
+      for (const item of this.billtypelist) {
+        if (item.code === row.source_bill_type) {
+          return item.name
+        }
+      }
+    },
+    handleDisCurrentChange(current) {
+      this.currentDis = current
+    },
+    queryTableDtl(id) {
+      crudFormData.getSonFormData(id).then(res => {
+        this.tableDtl = res
+      })
+    },
+    queryTableDis(currentDtl) {
+      crudStructattr.getVehicleTask({ 'vehicle_code': currentDtl.vehicle_code }).then(res => {
+          this.tabledis = res
+        })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size: 20px;
+  color: #303133;
+}
+
+.crud-opts2 .role-span2 {
+  padding: 0px 0px 20px 0px;
+}
+
+.crud-opts2 {
+  padding: 10px 0px 0px 50px;
+}
+
+</style>
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/formData.js b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/formData.js
new file mode 100644
index 00000000..dc84c7ca
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/formData.js
@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/pmFormData',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/pmFormData',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/pmFormData',
+    method: 'put',
+    data
+  })
+}
+
+export function getFormType() {
+  return request({
+    url: 'api/bmFormStruc/getTypes',
+    method: 'get',
+  })
+}
+
+export function getParentFormTypes() {
+  return request({
+    url: 'api/bmFormStruc/getParentFormTypes',
+    method: 'get',
+  })
+}
+
+export function getSonFormData(id) {
+  return request({
+    url: 'api/pmFormData/getSonFormData/' + id,
+    method: 'get',
+  })
+}
+
+
+export default {add, edit, del, getFormType, getParentFormTypes, getSonFormData}
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/index.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/index.vue
new file mode 100644
index 00000000..b3c78eb1
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/index.vue
@@ -0,0 +1,271 @@
+<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.form_type"
+              filterable
+              size="mini"
+              placeholder="请选择/搜索"
+              class="filter-item"
+              @change="crud.toQuery()"
+            >
+              <el-option
+                v-for="item in fromTypes"
+                :key="item.value"
+                :value="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <template v-for="(col,index) in cols" v-if="hideShowDialog">
+            <el-form-item label="col.lable">
+              <label slot="label">{{ col.lable }}:</label>
+              <el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px" />
+            </el-form-item>
+          </template>
+          <rrOperation :crud="crud" />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="task_flag"
+          @click="taskOpen"
+        >
+          作业下发
+        </el-button>
+      </crudOperation>
+
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        @select="handleSelectionChange"
+        :data="crud.data"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="code" label="单据编码" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <el-link v-if="scope.row.hasChildren" type="warning" @click="toView(scope.row)">{{
+              scope.row.code
+            }}
+            </el-link>
+            <span v-else>{{ scope.row.code }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120" />
+        <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <template v-for="item in statusEnum.FORM_STATUS">
+              <span v-if="item.value === scope.row.status">{{ item.label }}</span>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in cols"
+          :key="item.value"
+          width="130"
+          show-overflow-tooltip
+          :label="item.lable"
+        >
+          <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="create_time" label="创建时间" />
+        <el-table-column prop="create_name" label="创建人" />
+        <el-table-column prop="update_time" label="修改时间" />
+        <el-table-column prop="create_name" label="修改人" />
+        <el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
+        <el-table-column
+          label="操作"
+          fixed="right"
+          align="center"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="toDelete(scope.row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog ref="viewDialog" />
+    <ViewDialog ref="viewDialog" />
+
+  </div>
+</template>
+
+<script>
+import crudFormData from './formData'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
+import AddDialog from './AddDialog'
+import crudmove from './move'
+import ViewDialog from './ViewDialog'
+
+
+// import UploadDialog from './UploadDialog'
+
+const defaultForm = {
+  id: null,
+  code: null,
+  proc_inst_id: null,
+  biz_id: null,
+  boz_code: null,
+  biz_date: null,
+  form_type: null,
+  status: null,
+  create_time: null,
+  create_name: null,
+  material_id: null,
+  qty: null,
+  pcsn: null,
+  vehicle_code: null,
+  from_data: null,
+  parent_id: null
+}
+export default {
+  name: 'FormData',
+  statusEnums: ['FORM_STATUS'],
+  components: { pagination, crudOperation, rrOperation, udOperation, AddDialog ,ViewDialog },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '移库单',
+      url: 'api/pmFormData',
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: { ...crudFormData },
+      optShow: {
+        add: true,
+        reset: true
+      },
+      query: {
+        form_type:'st_ivt_move',
+        form_data: {}
+      }
+    })
+  },
+  data() {
+    return {
+      cols: [],
+      classes: [],
+      task_flag: true,
+      currentRow: null,
+      uploadShow: false,
+      dis_flag: true,
+      fromTypes: [],
+      permission: {},
+      rules: {},
+      hideShowDialog: false
+    }
+  },
+  mounted() {
+  },
+  created() {
+    // 获取分类
+    formstruc.getHeader('st_ivt_move').then(res => {
+      this.cols = res
+      res.forEach(a => {
+        this.form.form_data[a.value, '']
+      })
+    })
+  },
+  methods: {
+    ToExpandall() {
+      const els = document.getElementsByClassName('el-table__expand-icon')
+      if (this.crud.data.length !== 0 && els.length !== 0) {
+        for (let j1 = 0; j1 < els.length; j1++) {
+          els[j1].classList.add('dafult')
+        }
+        if (this.$el.getElementsByClassName('el-table__expand-icon--expanded')) {
+          const open = this.$el.getElementsByClassName('el-table__expand-icon--expanded')
+          for (let j = 0; j < open.length; j++) {
+            open[j].classList.remove('dafult')
+          }
+          const dafult = this.$el.getElementsByClassName('dafult')
+          for (let a = 0; a < dafult.length; a++) {
+
+            dafult[a].click()
+          }
+        }
+      }
+    },
+    hideShow() {
+      if (this.hideShowDialog) {
+        // this.$set(this.query, 'form_query', {})
+      }
+      this.hideShowDialog = !this.hideShowDialog
+    },
+    toView(row) {
+      if (row !== null) {
+        this.$refs.viewDialog.setForm(row)
+      }
+    },
+
+    handleSelectionChange(val, row) {
+      if (val.length === 1) {
+        if (row.status == '10'){
+          this.task_flag = false
+        }else {
+          this.task_flag = true
+        }
+        this.dis_flag = false
+        this.currentRow = row
+      } else {
+        this.task_flag = true
+        this.dis_flag = true
+        this.currentRow = null
+      }
+    },
+
+    disOpen(row) {
+      if (this.currentRow !== null) {
+        this.$refs.taskDis.setForm(this.currentRow)
+      }
+    },
+    taskOpen(row) {
+      if (this.currentRow !== null) {
+        crudmove.taskopen(this.currentRow).then(res => {
+          this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        })
+      }
+    },
+    toDelete(id) {
+      if (id !== null) {
+        crudmove.del([id]).then(res => {
+          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        })
+      }
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/move.js b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/move.js
new file mode 100644
index 00000000..c904b31a
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/move.js
@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/move/save',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/move',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/move',
+    method: 'post',
+    data
+  })
+}
+export function updateStatus(data) {
+  return request({
+    url: '/api/move/updateStatus',
+    method: 'post',
+    data
+  })
+}
+
+export function taskopen(data) {
+  return request({
+    url: '/api/move/taskOpen',
+    method: 'post',
+    data
+  })
+}
+
+export default {add, edit, del, updateStatus, taskopen}
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue
index c5933709..6ad4b84f 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue
@@ -92,8 +92,8 @@
         size="mini"
         border
         :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         @current-change="handleDtlCurrentChange"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       >
         <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
         <el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120"/>