From 4d92078988aaae9ca50b029b3d3f00ded39a2bfc Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 17 Apr 2024 17:36:23 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=85=A5=E5=BA=93=E5=8D=95=E4=B8=BB?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=84=E7=90=86=EF=BC=9A=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/common/TableDataInfo.java     |  23 ++
 .../nl/common/domain/entity/BaseQuery.java    |  19 +-
 .../org/nl/common/domain/entity/Query.java    |   8 +
 .../nl/config/satoken/SaTokenConfigure.java   |   2 +
 .../controller/BmFormStrucController.java     |  35 +-
 .../form_struc/service/dao/BmFormStruc.java   |   8 +-
 .../early_msg/AlmEarlyMsgController.java      |   1 -
 .../impl/IostorInActivityBehavior.java        |  16 +-
 .../entity/node/impl/task/impl/FormTask.java  |   3 +-
 .../impl/MappingSourceDataTypeHandler.java    |  32 +-
 .../form_data/service/dao/PmFormData.java     |   6 +-
 .../controller/StIvtIostorinvController.java  |  21 -
 .../in/StIvtIostorinvInController.java        |  44 +++
 .../stor_manage/service/dto/StorInvQuery.java |  21 +
 .../in/iostor/IStIvtIostorinvInService.java   |  16 +
 .../in/iostor/dao/StIvtIostorinvIn.java       |  88 +++++
 .../dao/mapper/StIvtIostorinvMapper.java      |   6 +-
 .../dao/mapper/xml/StIvtIostorinvMapper.xml   |   2 +-
 .../impl/StIvtIostorinvInServiceImpl.java     |  20 +
 .../IStIvtIostorinvdtlInService.java          |  19 +
 .../iostor_dtl/dao/StIvtIostorinvdtlIn.java}  |   6 +-
 .../dao/mapper/StIvtIostorinvdtlInMapper.java |  20 +
 .../mapper/xml/StIvtIostorinvdtlInMapper.xml} |   2 +-
 .../impl/StIvtIostorinvdtlInServiceImpl.java  |  27 ++
 .../iostor/IStIvtIostorinvService.java        |  16 -
 .../impl/StIvtIostorinvServiceImpl.java       |  20 -
 .../iostor_dtl/IStIvtIostorinvdtlService.java |  19 -
 .../dao/mapper/StIvtIostorinvdtlMapper.java   |  20 -
 .../impl/StIvtIostorinvdtlServiceImpl.java    |  27 --
 .../out/iostor/IStIvtIostorinvoutService.java |  16 +
 .../iostor/dao/StIvtIostorinvout.java}        |   6 +-
 .../dao/mapper/StIvtIostorinvOutMapper.java   |  16 +
 .../mapper/xml/StIvtIostorinvOutMapper.xml    |   5 +
 .../impl/StIvtIostorinvOutServiceImpl.java    |  20 +
 .../IStIvtIostorinvdtlOutService.java         |  19 +
 .../iostor_dtl/dao/StIvtIostorinvdtlOut.java  | 110 ++++++
 .../mapper/StIvtIostorinvdtlOutMapper.java    |  20 +
 .../mapper/xml/StIvtIostorinvdtlOutMapper.xml |  10 +
 .../impl/StIvtIostorinvdtlOutServiceImpl.java |  27 ++
 .../SyncFormMappingController.java            |  11 +-
 .../form_mapping/ISyncFormMappingService.java |   1 +
 .../form_mapping/dao/SyncFormMapping.java     |   1 +
 .../impl/SyncFormMappingServiceImpl.java      |  19 +
 .../resources/config/application-dev3.yml     |   2 +-
 wms_pro/qd/.env.development                   |   4 +-
 wms_pro/qd/public/config.js                   |   2 +-
 .../qd/src/views/system/notice/NoticeIcon.vue |   6 +-
 .../views/system/notice/NoticeIconReader.vue  |   4 +-
 .../wms/config_manage/formStruc/formstruc.js  |  10 +-
 .../qd/src/views/wms/stor_manage/in/index.vue | 367 ++++++++++++++++++
 .../src/views/wms/stor_manage/in/storinvin.js | 138 +++++++
 .../sync_manage/form_mapping/AddDialog.vue    |   8 +-
 .../sync_manage/form_mapping/EditDialog.vue   | 131 ++++---
 .../sync_manage/form_mapping/formMapping.js   |   4 +-
 54 files changed, 1262 insertions(+), 242 deletions(-)
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/Query.java
 delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/controller/StIvtIostorinvController.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/controller/in/StIvtIostorinvInController.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/dto/StorInvQuery.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/IStIvtIostorinvInService.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/StIvtIostorinvIn.java
 rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/{ => in}/iostor/dao/mapper/StIvtIostorinvMapper.java (61%)
 rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/{ => in}/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml (62%)
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/impl/StIvtIostorinvInServiceImpl.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/IStIvtIostorinvdtlInService.java
 rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/{iostor_dtl/dao/StIvtIostorinvdtl.java => in/iostor_dtl/dao/StIvtIostorinvdtlIn.java} (91%)
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/mapper/StIvtIostorinvdtlInMapper.java
 rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/{iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml => in/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlInMapper.xml} (75%)
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/impl/StIvtIostorinvdtlInServiceImpl.java
 delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/IStIvtIostorinvService.java
 delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/impl/StIvtIostorinvServiceImpl.java
 delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/IStIvtIostorinvdtlService.java
 delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java
 delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/IStIvtIostorinvoutService.java
 rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/{iostor/dao/StIvtIostorinv.java => out/iostor/dao/StIvtIostorinvout.java} (90%)
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml
 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java
 create mode 100644 wms_pro/qd/src/views/wms/stor_manage/in/index.vue
 create mode 100644 wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/TableDataInfo.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/TableDataInfo.java
index 40b596a8..3b05db1e 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/TableDataInfo.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/TableDataInfo.java
@@ -1,6 +1,7 @@
 package org.nl.common;
 
 import cn.hutool.http.HttpStatus;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.Data;
 import java.util.Date;
@@ -9,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 表格分页数据对象
@@ -61,6 +63,27 @@ public class TableDataInfo<T> implements Serializable {
         return rspData;
     }
 
+    public static TableDataInfo<Map> buildByDivForm(IPage<Map> page,String json_field) {
+        TableDataInfo<Map> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        List<Map> records = page.getRecords();
+        records.forEach(a->{
+            Object o = a.get(json_field);
+            if (o!=null){
+                if (o instanceof String){
+                    a.putAll(JSONObject.parseObject((String) o));
+                }else if (o instanceof Map){
+                    a.putAll((Map)o);
+                }
+            }
+        });
+        rspData.setContent(page.getRecords());
+        rspData.setTotalElements(page.getTotal());
+        return rspData;
+    }
+
+
     public static <T> TableDataInfo<T> build(List<T> list) {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(HttpStatus.HTTP_OK);
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java
index d09e0477..ac63c0ab 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java
@@ -1,6 +1,7 @@
 package org.nl.common.domain.entity;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache;
@@ -8,8 +9,9 @@ import lombok.Data;
 
 import org.nl.common.enums.QueryTEnum;
 import org.nl.common.utils.MapOf;
-import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
+import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
 
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Map;
 
@@ -20,6 +22,8 @@ import java.util.Map;
  */
 @Data
 public class BaseQuery<T> {
+
+    private Type ttype;
     /**
      * 模糊查询
      */
@@ -40,6 +44,13 @@ public class BaseQuery<T> {
     private String plan_start_time;
     private String plan_end_time;
 
+    public BaseQuery() {
+        Type superclass = getClass().getGenericSuperclass();
+        if (superclass instanceof Class) {
+            throw new RuntimeException("Missing type parameter.");
+        }
+        this.ttype = ((ParameterizedType) superclass).getActualTypeArguments()[0];
+    }
 
     /**
      * 字段映射Map:指定字段对应QueryWrapper的查询类型
@@ -55,12 +66,12 @@ public class BaseQuery<T> {
             ,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build()
     );
 
-    public QueryWrapper<T> build(){
+    public Wrapper<T> build(){
         this.paramMapping();
         QueryWrapper<T> wrapper = new QueryWrapper<>();
         JSONObject json = (JSONObject)JSONObject.toJSON(this);
-        Type[] types = ((ParameterizedTypeImpl) this.getClass().getGenericSuperclass()).getActualTypeArguments();
-        Map<String, ColumnCache> columnMap = LambdaUtils.getColumnMap((Class<?>) types[0]);
+        json.remove("ttype");
+        Map<String, ColumnCache> columnMap = LambdaUtils.getColumnMap((Class<?>) ttype);
         json.forEach((key, vel) -> {
             if (vel != null && !key.equals("doP")){
                 QParam qParam = doP.get(key);
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/Query.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/Query.java
new file mode 100644
index 00000000..bae86987
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/Query.java
@@ -0,0 +1,8 @@
+package org.nl.common.domain.entity;
+
+/*
+ * @author ZZQ
+ * @Date 2024/4/17 09:54
+ */
+public interface Query <T>{
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/satoken/SaTokenConfigure.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/satoken/SaTokenConfigure.java
index 2a94b2f1..a2e5d45e 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/satoken/SaTokenConfigure.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/satoken/SaTokenConfigure.java
@@ -7,6 +7,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -25,6 +26,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 public class SaTokenConfigure implements WebMvcConfigurer {
 
     // 白名单
+
     private String[] excludes;
     // Sa-Token 整合 jwt (Simple 简单模式)
     @Bean
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java
index 1f793e04..29f98c54 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java
@@ -1,6 +1,7 @@
 package org.nl.wms.config_manage.form_struc.controller;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,6 +22,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -36,12 +38,13 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api/bmFormStruc")
+@SaIgnore
 public class BmFormStrucController {
 
-    private static Map<String,String> BASE_FORM = MapOf.of("bus_id","业务单据单据id"
-            ,"bus_code","业务单据编号"
-            ,"bus_date","业务单据日期"
-            ,"bus_status","业务单据状态"
+    private static Map<String,String> BASE_FORM = MapOf.of("biz_id","业务单据单据id"
+            ,"biz_code","业务单据编号"
+            ,"biz_date","业务单据日期"
+            ,"biz_status","业务单据状态"
             ,"material_id","物料id"
             ,"qty","数量");
 
@@ -88,9 +91,28 @@ public class BmFormStrucController {
     }
 
     /**
-     * @ONLY:只用于获取表单同步配置接口
+     * @ONLY:动态表单表头信息
      * 数据结构:{"type":xxx,"name":xxx,"desc":xxx,"item":{"desc":"描述"}}
      */
+    @GetMapping("/formColumns/{form_type}")
+    public ResponseEntity<Object> formColumns(@PathVariable String form_type){
+        //参数判读，参数解析，调用参数入库
+        List<Map> items = new ArrayList<>();
+        BmFormStruc form_struc = iBmFormStrucService.getOne(new QueryWrapper<BmFormStruc>().eq("form_type", form_type));
+        if (form_struc!=null){
+            JSONObject form_param = form_struc.getForm_param();
+            for (String key : form_param.keySet()) {
+                items.add(MapOf.of("lable",form_param.get(key),"value",key));
+            }
+        }
+        return new ResponseEntity<>(items,HttpStatus.OK);
+    }
+
+    /**
+     * @ONLY:只用于获取表单同步配置接口
+     * @param form_type
+     * @return
+     */
     @GetMapping("/tableColumns/{form_type}")
     public ResponseEntity<Object> tableColumns(@PathVariable String form_type){
         //参数判读，参数解析，调用参数入库
@@ -104,7 +126,7 @@ public class BmFormStrucController {
         }
         if (form_struc.getHas_child()){
             List<Map> dtl_items = new ArrayList<>();
-            BmFormStruc child_struc = iBmFormStrucService.getOne(new QueryWrapper<BmFormStruc>().eq("form_type", form_struc.getForm_type()));
+            BmFormStruc child_struc = iBmFormStrucService.getOne(new QueryWrapper<BmFormStruc>().eq("parent_id", form_struc.getForm_type()));
             JSONObject child_param = child_struc.getForm_param();
             child_param.putAll(BASE_FORM);
             for (String key : child_param.keySet()) {
@@ -116,5 +138,6 @@ public class BmFormStrucController {
         return new ResponseEntity<>(result,HttpStatus.OK);
     }
 
+
 }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java
index 78678d9c..879b5e27 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java
@@ -63,22 +63,22 @@ public class BmFormStruc implements Serializable {
     /**
      * 业务单据单据id
      */
-    private String bus_id;
+    private String biz_id;
 
     /**
      * 业务单据编号
      */
-    private String bus_code;
+    private String biz_code;
 
     /**
      * 业务单据日期
      */
-    private String bus_date;
+    private String biz_date;
 
     /**
      * 业务单据状态
      */
-    private String bus_status;
+    private String biz_status;
 
     /**
      * 物料id
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_msg/AlmEarlyMsgController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_msg/AlmEarlyMsgController.java
index 2f6e95f4..6bc0a96a 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_msg/AlmEarlyMsgController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_msg/AlmEarlyMsgController.java
@@ -16,6 +16,5 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/almEarlyMsg")
 public class AlmEarlyMsgController {
-
 }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/IostorInActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/IostorInActivityBehavior.java
index 803c50b9..f1ee851b 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/IostorInActivityBehavior.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/IostorInActivityBehavior.java
@@ -12,10 +12,10 @@ import org.nl.wms.flow_manage.flow.framework.entity.node.base.impl.FlowElement;
 import org.nl.wms.flow_manage.flow.framework.entity.node.impl.task.impl.FormTask;
 import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler;
 import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
-import org.nl.wms.stor_manage.service.iostor.IStIvtIostorinvService;
-import org.nl.wms.stor_manage.service.iostor.dao.StIvtIostorinv;
-import org.nl.wms.stor_manage.service.iostor_dtl.IStIvtIostorinvdtlService;
-import org.nl.wms.stor_manage.service.iostor_dtl.dao.StIvtIostorinvdtl;
+import org.nl.wms.stor_manage.service.in.iostor.IStIvtIostorinvInService;
+import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
+import org.nl.wms.stor_manage.service.in.iostor_dtl.IStIvtIostorinvdtlInService;
+import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,9 +35,9 @@ public class IostorInActivityBehavior extends FlowNodeActivityBehavior<PmFormDat
     @Autowired
     IBmFormStrucService iBmFormStrucService;
     @Autowired
-    IStIvtIostorinvdtlService iostorinvdtlService;
+    IStIvtIostorinvdtlInService iostorinvdtlService;
     @Autowired
-    IStIvtIostorinvService iostorinvService;
+    IStIvtIostorinvInService iostorinvService;
 
     @Override
     public void execute(ExecutionEntity<PmFormDataDto> execution) {
@@ -60,11 +60,11 @@ public class IostorInActivityBehavior extends FlowNodeActivityBehavior<PmFormDat
                 JSONObject handler = typeHandler.handler(formTask.getSkipExpression(), sourceData, formStruc);
                 //该参数里包含三部分：主数据基础字段，组数据自定义及明细，
                 //明细：基础字段，组数据自定义及参数
-                StIvtIostorinv mst = handler.toJavaObject(StIvtIostorinv.class);
+                StIvtIostorinvIn mst = handler.toJavaObject(StIvtIostorinvIn.class);
                 Object itemArr = handler.remove("item");
                 if(itemArr !=null && itemArr instanceof JSONArray){
                     JSONArray arr = (JSONArray) itemArr;
-                    List<StIvtIostorinvdtl> iostorinvs = arr.toJavaList(StIvtIostorinvdtl.class);
+                    List<StIvtIostorinvdtlIn> iostorinvs = arr.toJavaList(StIvtIostorinvdtlIn.class);
                     iostorinvdtlService.batchInsert(iostorinvs);
                 }
                 iostorinvService.save(mst);
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/FormTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/FormTask.java
index d3ef1f4d..23264bb3 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/FormTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/FormTask.java
@@ -15,6 +15,7 @@ import java.util.*;
 public class FormTask extends ExecuteTask {
     private String assignee;
     private String task_type;
+    private List<String> skipExpression;
     private String owner;
     private String priority;
     private String form_type;
@@ -30,7 +31,7 @@ public class FormTask extends ExecuteTask {
     /**
      * 规则：支持多级别
      */
-    private List<String> skipExpression;
+
     private String validateFormFields;
     private String taskIdVariableName;
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/impl/MappingSourceDataTypeHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/impl/MappingSourceDataTypeHandler.java
index ad8711a5..5a88ea12 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/impl/MappingSourceDataTypeHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/impl/MappingSourceDataTypeHandler.java
@@ -11,6 +11,9 @@ import org.nl.wms.flow_manage.flow.framework.process.nodeType.source.SourceDataT
 import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
 import org.nl.wms.sync_manage.service.form_mapping.dao.SyncFormMapping;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.expression.Expression;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
@@ -23,10 +26,9 @@ import java.util.List;
 @Service
 public class MappingSourceDataTypeHandler extends SourceDataTypeHandler<PmFormData> {
 
+    private static final SpelExpressionParser SPEL_PARSER = new SpelExpressionParser();
 
 
-    @Value("${server.port}")
-    private String post;
     //material_id,qty,pcsn,code这些属于基础字段
     private List base_parm =  ListOf.of("data","code","material_id","qty","pcsn","code");
     @Override
@@ -38,7 +40,8 @@ public class MappingSourceDataTypeHandler extends SourceDataTypeHandler<PmFormDa
         PmFormData formData = new PmFormData();
         formData.setId(IdUtil.getStringId());
         formData.setForm_type(formMapping.getForm_type());
-        formData.setStatus("1");
+        formData.setBiz_status(
+                "1");
         formData.setCreate_time(DateUtil.now());
         JSONObject form_json = new JSONObject();
         formData.setForm_data(form_json);
@@ -52,7 +55,20 @@ public class MappingSourceDataTypeHandler extends SourceDataTypeHandler<PmFormDa
                 String skipExpression = item_filed.getString("skipExpression");
                 Object value = null;
                 if (StringUtils.isNotEmpty(skipExpression)){
-                    //el表达式
+                    //TODO:el表达式
+                    /*
+                     el表达式{
+                     JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("ddd","kkk");
+                    StandardEvaluationContext context = new StandardEvaluationContext();
+                    context.setVariable("query1",jsonObject);
+                    Expression expression = SPEL_PARSER.parseExpression("#query1['ddd']");
+                    String el_value = expression.getValue(context, String.class);
+                    System.out.println(el_value);
+                     }
+
+                    * */
+
                 }else {
                     value = data.get(mapping_field);
                 }
@@ -68,12 +84,4 @@ public class MappingSourceDataTypeHandler extends SourceDataTypeHandler<PmFormDa
 
         return formData;
     }
-
-    public String getPost() {
-        return post;
-    }
-
-    public void setPost(String post) {
-        this.post = post;
-    }
 }
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 d93bf7a0..16314bb6 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
@@ -35,12 +35,12 @@ public class PmFormData implements Serializable {
     /**
      * 业务单据编号
      */
-    private String code;
+    private String biz_code;
 
     /**
      * 业务单据日期
      */
-    private String date;
+    private String biz_date;
 
     /**
      * 单据类型
@@ -50,7 +50,7 @@ public class PmFormData implements Serializable {
     /**
      * 业务单据状态
      */
-    private String status;
+    private String biz_status;
 
     /**
      * 创建id
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/controller/StIvtIostorinvController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/controller/StIvtIostorinvController.java
deleted file mode 100644
index 77656fdc..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/controller/StIvtIostorinvController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.nl.wms.stor_manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 出入库单主表 前端控制器
- * </p>
- *
- * @author generator
- * @since 2024-03-28
- */
-@RestController
-@RequestMapping("/stIvtIostorinv")
-public class StIvtIostorinvController {
-
-}
-
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/controller/in/StIvtIostorinvInController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/controller/in/StIvtIostorinvInController.java
new file mode 100644
index 00000000..523cb289
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/controller/in/StIvtIostorinvInController.java
@@ -0,0 +1,44 @@
+package org.nl.wms.stor_manage.controller.in;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.entity.PageQuery;
+import org.nl.wms.stor_manage.service.dto.StorInvQuery;
+import org.nl.wms.stor_manage.service.in.iostor.IStIvtIostorinvInService;
+import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.lang.reflect.Type;
+import java.util.Map;
+
+/**
+ * <p>
+ * 出入库单主表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-28
+ */
+@RestController
+@RequestMapping("api/stIvtIostorinvIn")
+public class StIvtIostorinvInController {
+
+    @Autowired
+    IStIvtIostorinvInService iStIvtIostorinvInService;
+
+
+    @GetMapping
+    public ResponseEntity<Object> getAll(StorInvQuery query, PageQuery page) {
+        Page mapPage = iStIvtIostorinvInService.pageMaps(page.build(), query.build());
+        return new ResponseEntity<>(TableDataInfo.buildByDivForm(mapPage,"form_data"), HttpStatus.OK);
+    }
+}
+
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/dto/StorInvQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/dto/StorInvQuery.java
new file mode 100644
index 00000000..03836bd6
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/dto/StorInvQuery.java
@@ -0,0 +1,21 @@
+package org.nl.wms.stor_manage.service.dto;
+
+import lombok.Data;
+import org.nl.common.domain.entity.BaseQuery;
+import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/4 19:49
+ */
+@Data
+public class StorInvQuery extends BaseQuery<StIvtIostorinvIn>{
+    private String form_type;
+    private String code;
+    private String status;
+    private String product_code;
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/IStIvtIostorinvInService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/IStIvtIostorinvInService.java
new file mode 100644
index 00000000..8b44f5a4
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/IStIvtIostorinvInService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.stor_manage.service.in.iostor;
+
+import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 出入库单主表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-28
+ */
+public interface IStIvtIostorinvInService extends IService<StIvtIostorinvIn> {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/StIvtIostorinvIn.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/StIvtIostorinvIn.java
new file mode 100644
index 00000000..6734b575
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/StIvtIostorinvIn.java
@@ -0,0 +1,88 @@
+package org.nl.wms.stor_manage.service.in.iostor.dao;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 出入库单主表
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("st_ivt_iostorinv_in")
+public class StIvtIostorinvIn implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 出入单标识
+     */
+    private String id;
+
+    /**
+     * 单据编号
+     */
+    private String code;
+
+    /**
+     * 生产区域编码
+     */
+    private String product_area;
+
+    /**
+     * 单据状态
+     */
+    private String status;
+    /**
+     * 源单业务日期
+     */
+    private String biz_date;
+    /**
+     * 源单号
+     */
+    private String biz_code;
+
+    /**
+     * 源单单据类型
+     */
+    private String form_type;
+
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 制单人
+     */
+    private String create_id;
+
+    /**
+     * 制单时间
+     */
+    private String create_time;
+
+    /**
+     * 修改人
+     */
+    private String update_id;
+
+    /**
+     * 修改时间
+     */
+    private String update_time;
+
+    /**
+     * 自定义映射数据
+     */
+    private String form_data;
+
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/mapper/StIvtIostorinvMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/mapper/StIvtIostorinvMapper.java
similarity index 61%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/mapper/StIvtIostorinvMapper.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/mapper/StIvtIostorinvMapper.java
index ae64d702..34470ee3 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/mapper/StIvtIostorinvMapper.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/mapper/StIvtIostorinvMapper.java
@@ -1,6 +1,6 @@
-package org.nl.wms.stor_manage.service.iostor.dao.mapper;
+package org.nl.wms.stor_manage.service.in.iostor.dao.mapper;
 
-import org.nl.wms.stor_manage.service.iostor.dao.StIvtIostorinv;
+import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author generator
  * @since 2024-03-28
  */
-public interface StIvtIostorinvMapper extends BaseMapper<StIvtIostorinv> {
+public interface StIvtIostorinvMapper extends BaseMapper<StIvtIostorinvIn> {
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml
similarity index 62%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml
index 16d722a1..d829f332 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.stor_manage.service.iostor.dao.mapper.StIvtIostorinvMapper">
+<mapper namespace="org.nl.wms.stor_manage.service.in.iostor.dao.mapper.StIvtIostorinvMapper">
 
 </mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/impl/StIvtIostorinvInServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/impl/StIvtIostorinvInServiceImpl.java
new file mode 100644
index 00000000..88fea2f9
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/impl/StIvtIostorinvInServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.stor_manage.service.in.iostor.impl;
+
+import org.nl.wms.stor_manage.service.in.iostor.IStIvtIostorinvInService;
+import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
+import org.nl.wms.stor_manage.service.in.iostor.dao.mapper.StIvtIostorinvMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 出入库单主表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-28
+ */
+@Service
+public class StIvtIostorinvInServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinvIn> implements IStIvtIostorinvInService {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/IStIvtIostorinvdtlInService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/IStIvtIostorinvdtlInService.java
new file mode 100644
index 00000000..002291aa
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/IStIvtIostorinvdtlInService.java
@@ -0,0 +1,19 @@
+package org.nl.wms.stor_manage.service.in.iostor_dtl;
+
+import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 出入库单明细表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-29
+ */
+public interface IStIvtIostorinvdtlInService extends IService<StIvtIostorinvdtlIn> {
+
+    void batchInsert(List<StIvtIostorinvdtlIn> dtls);
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/StIvtIostorinvdtl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/StIvtIostorinvdtlIn.java
similarity index 91%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/StIvtIostorinvdtl.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/StIvtIostorinvdtlIn.java
index 80af67da..bc579e24 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/StIvtIostorinvdtl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/StIvtIostorinvdtlIn.java
@@ -1,4 +1,4 @@
-package org.nl.wms.stor_manage.service.iostor_dtl.dao;
+package org.nl.wms.stor_manage.service.in.iostor_dtl.dao;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,8 +16,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("st_ivt_iostorinvdtl")
-public class StIvtIostorinvdtl implements Serializable {
+@TableName("st_ivt_iostorinvdtl_in")
+public class StIvtIostorinvdtlIn implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/mapper/StIvtIostorinvdtlInMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/mapper/StIvtIostorinvdtlInMapper.java
new file mode 100644
index 00000000..fb4214d1
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/mapper/StIvtIostorinvdtlInMapper.java
@@ -0,0 +1,20 @@
+package org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper;
+
+import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 出入库单明细表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-29
+ */
+public interface StIvtIostorinvdtlInMapper extends BaseMapper<StIvtIostorinvdtlIn> {
+
+    Integer batchInsert(List<StIvtIostorinvdtlIn> dtls);
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlInMapper.xml
similarity index 75%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlInMapper.xml
index 74f18899..d6fbe396 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlInMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.stor_manage.service.iostor_dtl.dao.mapper.StIvtIostorinvdtlMapper">
+<mapper namespace="org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlInMapper">
 
     <insert id="batchInsert">
         insert into st_ivt_iostorinvdtl() values <foreach collection="dtls" open="(" close=")" item="item">
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/impl/StIvtIostorinvdtlInServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/impl/StIvtIostorinvdtlInServiceImpl.java
new file mode 100644
index 00000000..30b62f11
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/impl/StIvtIostorinvdtlInServiceImpl.java
@@ -0,0 +1,27 @@
+package org.nl.wms.stor_manage.service.in.iostor_dtl.impl;
+
+import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
+import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlInMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.stor_manage.service.out.iostor_dtl.IStIvtIostorinvdtlOutService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 出入库单明细表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-29
+ */
+@Service
+public class StIvtIostorinvdtlInServiceImpl extends ServiceImpl<StIvtIostorinvdtlInMapper, StIvtIostorinvdtlIn> implements IStIvtIostorinvdtlOutService {
+
+
+    @Override
+    public void batchInsert(List<StIvtIostorinvdtlIn> dtls) {
+        this.baseMapper.batchInsert(dtls);
+    }
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/IStIvtIostorinvService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/IStIvtIostorinvService.java
deleted file mode 100644
index b8df80e2..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/IStIvtIostorinvService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.stor_manage.service.iostor;
-
-import org.nl.wms.stor_manage.service.iostor.dao.StIvtIostorinv;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 出入库单主表 服务类
- * </p>
- *
- * @author generator
- * @since 2024-03-28
- */
-public interface IStIvtIostorinvService extends IService<StIvtIostorinv> {
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/impl/StIvtIostorinvServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/impl/StIvtIostorinvServiceImpl.java
deleted file mode 100644
index 7eb4393c..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/impl/StIvtIostorinvServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.stor_manage.service.iostor.impl;
-
-import org.nl.wms.stor_manage.service.iostor.IStIvtIostorinvService;
-import org.nl.wms.stor_manage.service.iostor.dao.StIvtIostorinv;
-import org.nl.wms.stor_manage.service.iostor.dao.mapper.StIvtIostorinvMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 出入库单主表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2024-03-28
- */
-@Service
-public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinv> implements IStIvtIostorinvService {
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/IStIvtIostorinvdtlService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/IStIvtIostorinvdtlService.java
deleted file mode 100644
index bb58279b..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/IStIvtIostorinvdtlService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.nl.wms.stor_manage.service.iostor_dtl;
-
-import org.nl.wms.stor_manage.service.iostor_dtl.dao.StIvtIostorinvdtl;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 出入库单明细表 服务类
- * </p>
- *
- * @author generator
- * @since 2024-03-29
- */
-public interface IStIvtIostorinvdtlService extends IService<StIvtIostorinvdtl> {
-
-    void batchInsert(List<StIvtIostorinvdtl> dtls);
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java
deleted file mode 100644
index c435f7e5..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.stor_manage.service.iostor_dtl.dao.mapper;
-
-import org.nl.wms.stor_manage.service.iostor_dtl.dao.StIvtIostorinvdtl;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * <p>
- * 出入库单明细表 Mapper 接口
- * </p>
- *
- * @author generator
- * @since 2024-03-29
- */
-public interface StIvtIostorinvdtlMapper extends BaseMapper<StIvtIostorinvdtl> {
-
-    Integer batchInsert(List<StIvtIostorinvdtl> dtls);
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java
deleted file mode 100644
index c530ce82..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.nl.wms.stor_manage.service.iostor_dtl.impl;
-
-import org.nl.wms.stor_manage.service.iostor_dtl.dao.StIvtIostorinvdtl;
-import org.nl.wms.stor_manage.service.iostor_dtl.dao.mapper.StIvtIostorinvdtlMapper;
-import org.nl.wms.stor_manage.service.iostor_dtl.IStIvtIostorinvdtlService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 出入库单明细表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2024-03-29
- */
-@Service
-public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlMapper, StIvtIostorinvdtl> implements IStIvtIostorinvdtlService {
-
-
-    @Override
-    public void batchInsert(List<StIvtIostorinvdtl> dtls) {
-        this.baseMapper.batchInsert(dtls);
-    }
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/IStIvtIostorinvoutService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/IStIvtIostorinvoutService.java
new file mode 100644
index 00000000..6e8d68aa
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/IStIvtIostorinvoutService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.stor_manage.service.out.iostor;
+
+import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 出入库单主表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-28
+ */
+public interface IStIvtIostorinvoutService extends IService<StIvtIostorinvIn> {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/StIvtIostorinv.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/StIvtIostorinvout.java
similarity index 90%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/StIvtIostorinv.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/StIvtIostorinvout.java
index 4d7e9d5c..de3eb53f 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/StIvtIostorinv.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/StIvtIostorinvout.java
@@ -1,4 +1,4 @@
-package org.nl.wms.stor_manage.service.iostor.dao;
+package org.nl.wms.stor_manage.service.out.iostor.dao;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
@@ -15,8 +15,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("st_ivt_iostorinv")
-public class StIvtIostorinv implements Serializable {
+@TableName("st_ivt_iostorinv_in")
+public class StIvtIostorinvout implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java
new file mode 100644
index 00000000..d8c9e548
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.stor_manage.service.out.iostor.dao.mapper;
+
+import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 出入库单主表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-28
+ */
+public interface StIvtIostorinvOutMapper extends BaseMapper<StIvtIostorinvIn> {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
new file mode 100644
index 00000000..d829f332
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.stor_manage.service.in.iostor.dao.mapper.StIvtIostorinvMapper">
+
+</mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java
new file mode 100644
index 00000000..cf1a9b02
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.stor_manage.service.out.iostor.impl;
+
+import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
+import org.nl.wms.stor_manage.service.in.iostor.dao.mapper.StIvtIostorinvMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.stor_manage.service.out.iostor.IStIvtIostorinvoutService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 出入库单主表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-28
+ */
+@Service
+public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinvIn> implements IStIvtIostorinvoutService {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java
new file mode 100644
index 00000000..1924fe64
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java
@@ -0,0 +1,19 @@
+package org.nl.wms.stor_manage.service.out.iostor_dtl;
+
+import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 出入库单明细表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-29
+ */
+public interface IStIvtIostorinvdtlOutService extends IService<StIvtIostorinvdtlIn> {
+
+    void batchInsert(List<StIvtIostorinvdtlIn> dtls);
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java
new file mode 100644
index 00000000..c584ae4d
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java
@@ -0,0 +1,110 @@
+package org.nl.wms.stor_manage.service.out.iostor_dtl.dao;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 出入库单明细表
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("st_ivt_iostorinvdtl_in")
+public class StIvtIostorinvdtlOut implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 出入单明细标识
+     */
+    private Long iostorinvdtl_id;
+
+    /**
+     * 出入单标识
+     */
+    private Long iostorinv_id;
+
+    /**
+     * 明细序号
+     */
+    private BigDecimal seq_no;
+
+    /**
+     * 物料标识
+     */
+    private Long material_id;
+
+    /**
+     * 批次
+     */
+    private String pcsn;
+
+    /**
+     * 品质类型
+     */
+    private String quality_scode;
+
+    /**
+     * 单据明细状态
+     */
+    private String bill_status;
+
+    /**
+     * 数量计量单位标识
+     */
+    private Long qty_unit_id;
+
+    /**
+     * 数量计量单位名称
+     */
+    private String qty_unit_name;
+
+    /**
+     * 数量
+     */
+    private BigDecimal plan_qty;
+
+    /**
+     * 来源单据明细标识
+     */
+    private Long source_billdtl_id;
+
+    /**
+     * 来源单据类型
+     */
+    private String source_bill_type;
+
+    /**
+     * 来源单编号
+     */
+    private String source_bill_code;
+
+    /**
+     * 来源单表名
+     */
+    private String source_bill_table;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 已分配数量
+     */
+    private BigDecimal assign_qty;
+
+    /**
+     * 未分配数量
+     */
+    private BigDecimal unassign_qty;
+
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java
new file mode 100644
index 00000000..248ec7a5
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java
@@ -0,0 +1,20 @@
+package org.nl.wms.stor_manage.service.out.iostor_dtl.dao.mapper;
+
+import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 出入库单明细表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-29
+ */
+public interface StIvtIostorinvdtlOutMapper extends BaseMapper<StIvtIostorinvdtlIn> {
+
+    Integer batchInsert(List<StIvtIostorinvdtlIn> dtls);
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml
new file mode 100644
index 00000000..d6fbe396
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlInMapper">
+
+    <insert id="batchInsert">
+        insert into st_ivt_iostorinvdtl() values <foreach collection="dtls" open="(" close=")" item="item">
+
+    </foreach>
+    </insert>
+</mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java
new file mode 100644
index 00000000..f11add24
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java
@@ -0,0 +1,27 @@
+package org.nl.wms.stor_manage.service.out.iostor_dtl.impl;
+
+import org.nl.wms.stor_manage.service.in.iostor_dtl.IStIvtIostorinvdtlInService;
+import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
+import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlInMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 出入库单明细表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-29
+ */
+@Service
+public class StIvtIostorinvdtlOutServiceImpl extends ServiceImpl<StIvtIostorinvdtlInMapper, StIvtIostorinvdtlIn> implements IStIvtIostorinvdtlInService {
+
+
+    @Override
+    public void batchInsert(List<StIvtIostorinvdtlIn> dtls) {
+        this.baseMapper.batchInsert(dtls);
+    }
+}
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 c48e1687..d1ce9d9a 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
@@ -42,7 +42,6 @@ import java.util.Arrays;
 @RequestMapping("api/syncFormMapping")
 public class SyncFormMappingController {
 
-    private static final SpelExpressionParser SPEL_PARSER = new SpelExpressionParser();
 
     @Autowired
     ISyncFormMappingService iSyncFormMappingService;
@@ -52,15 +51,16 @@ public class SyncFormMappingController {
     public static void main(String[] args) {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("ddd","kkk");
+        SpelExpressionParser SPEL_PARSER = new SpelExpressionParser();
+
         StandardEvaluationContext context = new StandardEvaluationContext();
         context.setVariable("query1",jsonObject);
-        Expression expression = SPEL_PARSER.parseExpression("#query1.ddd");
+        Expression expression = SPEL_PARSER.parseExpression("#query1['ddd']");
         String value = expression.getValue(context, String.class);
         System.out.println(value);
     }
     @GetMapping
     public ResponseEntity<Object> getAll(FormMappingQuery query, PageQuery page) {
-
         return new ResponseEntity<>(TableDataInfo.build(iSyncFormMappingService.page(page.build(), query.build())), HttpStatus.OK);
     }
     @PostMapping("/create")
@@ -68,6 +68,11 @@ public class SyncFormMappingController {
         iSyncFormMappingService.saveSyncMapping(param);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+    @PostMapping("/update")
+    public ResponseEntity<Object> update(@RequestBody JSONObject param) {
+        iSyncFormMappingService.saveSyncMapping(param);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody String[] ids) {
         if (ids.length>0){
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/ISyncFormMappingService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/ISyncFormMappingService.java
index adf2e103..f96ef8cb 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/ISyncFormMappingService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/ISyncFormMappingService.java
@@ -15,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ISyncFormMappingService extends IService<SyncFormMapping> {
 
     void saveSyncMapping(JSONObject param);
+    void updateSyncMapping(JSONObject param);
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/dao/SyncFormMapping.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/dao/SyncFormMapping.java
index e5ce06be..30d8174a 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/dao/SyncFormMapping.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/dao/SyncFormMapping.java
@@ -56,6 +56,7 @@ public class SyncFormMapping implements Serializable {
 
     /**
      * 映射关系
+     * 关系中维护springEL表达式
      */
     @TableField(typeHandler = FastjsonTypeHandler.class)
     private JSONArray mapping_json;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/impl/SyncFormMappingServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/impl/SyncFormMappingServiceImpl.java
index a923cc8d..1fcc712f 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/impl/SyncFormMappingServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/impl/SyncFormMappingServiceImpl.java
@@ -56,4 +56,23 @@ public class SyncFormMappingServiceImpl extends ServiceImpl<SyncFormMappingMappe
         mapping.setMapping_json(param.getJSONArray("item"));
         this.save(mapping);
     }
+
+    @Override
+    public void updateSyncMapping(JSONObject param) {
+        if (param==null){
+            return;
+        }
+        //TODO: 单据校验
+        JSONObject mst = param.getJSONObject("mst");
+        SyncFormMapping mapping = new SyncFormMapping();
+        mapping.setId(mst.getString("id"));
+        mapping.setSync_url(mst.getString("sync_url"));
+        mapping.setSync_type(mst.getString("sync_type"));
+        mapping.setExternal_system(mst.getString("external_system"));
+        mapping.setUpdate_id(SecurityUtils.getCurrentUserId());
+        mapping.setUpdate_name(SecurityUtils.getCurrentNickName());
+        mapping.setUpdate_time(DateUtil.now());
+        mapping.setMapping_json(param.getJSONArray("item"));
+        this.updateById(mapping);
+    }
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
index 4b88e08d..11ee79f3 100644
--- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
+++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8011
+  port: 8012
   max-http-header-size: 65536
 #配置数据源
 spring:
diff --git a/wms_pro/qd/.env.development b/wms_pro/qd/.env.development
index e37a9a4f..412e6523 100644
--- a/wms_pro/qd/.env.development
+++ b/wms_pro/qd/.env.development
@@ -1,8 +1,8 @@
 ENV = 'development'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://localhost:8011'
-VUE_APP_WS_API = 'ws://localhost:8011'
+VUE_APP_BASE_API  = 'http://localhost:8012'
+VUE_APP_WS_API = 'ws://localhost:8012'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/wms_pro/qd/public/config.js b/wms_pro/qd/public/config.js
index 9ada17e0..0be94730 100644
--- a/wms_pro/qd/public/config.js
+++ b/wms_pro/qd/public/config.js
@@ -3,7 +3,7 @@ window.g = {
     VUE_APP_BASE_API: '/'
   },
   prod: {
-    VUE_APP_BASE_API: 'http://192.168.46.5:8011'
+    VUE_APP_BASE_API: 'http://192.168.46.5:8012'
   }
 
 }
diff --git a/wms_pro/qd/src/views/system/notice/NoticeIcon.vue b/wms_pro/qd/src/views/system/notice/NoticeIcon.vue
index 0be2a6eb..24107997 100644
--- a/wms_pro/qd/src/views/system/notice/NoticeIcon.vue
+++ b/wms_pro/qd/src/views/system/notice/NoticeIcon.vue
@@ -106,11 +106,11 @@ export default {
     }
   },
   mounted() {
-    this.receivedCount()
-    this.$bus.on(NOTICE_MESSAGE_UPDATE, this.receivedCount) // 监听事件
+    // this.receivedCount()
+    // this.$bus.on(NOTICE_MESSAGE_UPDATE, this.receivedCount) // 监听事件
   },
   destroyed() {
-    this.$bus.off(NOTICE_MESSAGE_UPDATE)
+    // this.$bus.off(NOTICE_MESSAGE_UPDATE)
   }
 }
 </script>
diff --git a/wms_pro/qd/src/views/system/notice/NoticeIconReader.vue b/wms_pro/qd/src/views/system/notice/NoticeIconReader.vue
index d61d9c6a..c96e9825 100644
--- a/wms_pro/qd/src/views/system/notice/NoticeIconReader.vue
+++ b/wms_pro/qd/src/views/system/notice/NoticeIconReader.vue
@@ -109,10 +109,10 @@ export default {
   },
   mounted() {
     // 绑定查看站内信消息事件
-    this.$bus.on(NOTICE_SHOW_MESSAGE, this.show)
+    // this.$bus.on(NOTICE_SHOW_MESSAGE, this.show)
   },
   destroyed() {
-    this.$bus.off(NOTICE_SHOW_MESSAGE)
+    // this.$bus.off(NOTICE_SHOW_MESSAGE)
   }
 }
 </script>
diff --git a/wms_pro/qd/src/views/wms/config_manage/formStruc/formstruc.js b/wms_pro/qd/src/views/wms/config_manage/formStruc/formstruc.js
index 3f6d1330..e79c9a41 100644
--- a/wms_pro/qd/src/views/wms/config_manage/formStruc/formstruc.js
+++ b/wms_pro/qd/src/views/wms/config_manage/formStruc/formstruc.js
@@ -32,4 +32,12 @@ export function getTypes(params) {
   })
 }
 
-export default { add, edit, del, getTypes}
+
+export function getHeader(params) {
+  return request({
+    url: '/api/bmFormStruc/formColumns/' + params,
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, getTypes, getHeader}
diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/index.vue b/wms_pro/qd/src/views/wms/stor_manage/in/index.vue
new file mode 100644
index 00000000..4eef6aed
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/in/index.vue
@@ -0,0 +1,367 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div >
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="单据类型">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="单据类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_CP_IN_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <!--<el-form-item label="生成方式">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="生成方式"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_CP_IN_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>-->
+
+          <el-form-item label="单据日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IO_BILL_STATUS"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="入库单号">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="生产车间">
+            <el-select
+              v-model="query.product_area"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          :disabled="dis_flag"
+          icon="el-icon-position"
+          size="mini"
+          @click="divOpen"
+        >
+          分配
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="task_flag"
+          @click="taskOpen"
+        >
+          作业任务
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="confirm_flag"
+          @click="confirm"
+        >
+          强制确认
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+        @current-change="handleCurrentChange"
+        @select="handleSelectionChange"
+        @select-all="onSelectAll"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column show-overflow-tooltip prop="code" width="130" label="单据号">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip  prop="status" label="单据状态" />
+        <el-table-column prop="product_area" label="生产车间" width="130" show-overflow-tooltip />
+        <el-table-column show-overflow-tooltip prop="form_type" min-width="120" label="单据类型" />
+        <el-table-column show-overflow-tooltip prop="biz_code" label="仓库" min-width="120" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
+        <template v-for="(col,index) in cols">
+          <el-table-column  :prop="col.value" :label="col.lable" width="120px" show-overflow-tooltip />
+        </template>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="创建人" align="center" prop="create_id" />
+        <el-table-column label="创建时间" align="center" prop="create_time" width="150" />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-edit="canUd(scope.row)"
+              :disabled-dle="canUd(scope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+<!--    <AddDialog @AddChanged="querytable" />-->
+<!--    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />-->
+<!--    <DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" @AddChanged="querytable" />-->
+<!--    <TaskDialog :dialog-show.sync="taskShow" :open-param="taskOpenParam" />-->
+  </div>
+</template>
+
+<script>
+import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
+import crudProductIn from '@/views/wms/stor_manage/in/storinvin'
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+// import AddDialog from '@/views/wms/storage_manage/product/productIn/AddDialog'
+// import DivDialog from '@/views/wms/storage_manage/product/productIn/DivDialog'
+// import ViewDialog from '@/views/wms/storage_manage/product/productIn/ViewDialog'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'ProductIn',
+  components: { formstruc, crudProductIn, crudOperation, rrOperation, udOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '',
+      optShow: { add: true, reset: true },
+      idField: 'iostorinv_id',
+      url: '/api/stIvtIostorinvIn',
+      crudMethod: { ...crudProductIn },
+      props: {
+        size: 10
+      }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['IO_BILL_STATUS', 'ST_INV_CP_IN_TYPE', 'product_area'],
+  data() {
+    return {
+      cols:[],
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      dis_flag: true,
+      task_flag: true,
+      confirm_flag: true,
+      disShow: false,
+      viewShow: false,
+      mstrow: {},
+      divShow: false,
+      openParam: [],
+      taskOpenParam: [],
+      currentRow: null,
+      storlist: [],
+      storId: null,
+      taskShow: false
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    // crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
+    //   this.storlist = res.content
+    // })
+  },
+  methods: {
+    [CRUD.HOOK.beforeRefresh]() {
+      formstruc.getHeader('STOR_IN').then(res => {
+        this.cols = res
+      })
+    },
+    fun(val) {
+      return Number(val).toFixed(3)
+    },
+    canUd(row) {
+      return row.bill_status !== '10'
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.buttonChange(row)
+      } else if (val.length === 1) {
+        this.buttonChange(row)
+      } else {
+        this.handleCurrentChange(null)
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+      this.handleCurrentChange(null)
+    },
+    buttonChange(currentRow) {
+      if (currentRow !== null) {
+        this.currentRow = currentRow
+        if (currentRow.bill_status === '10' || currentRow.bill_status === '20' || currentRow.bill_status === '30') {
+          this.dis_flag = false
+        } else {
+          this.dis_flag = true
+        }
+        if (currentRow.bill_status === '30' || currentRow.bill_status === '20') {
+          this.confirm_flag = false
+        } else {
+          this.confirm_flag = true
+        }
+        if (currentRow.bill_status !== '99') {
+          this.task_flag = false
+        } else {
+          this.task_flag = true
+        }
+      }
+    },
+    handleCurrentChange(currentRow) {
+      if (currentRow === null) {
+        this.dis_flag = true
+        this.confirm_flag = true
+        this.task_flag = true
+        this.currentRow = {}
+      }
+    },
+    bill_typeFormat(row, column) {
+      return this.dict.label.ST_INV_CP_IN_TYPE[row.bill_type]
+    },
+    toView(row) {
+      this.mstrow = row
+      this.viewShow = true
+    },
+    confirm() {
+      if (!this.currentRow) {
+        this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudProductIn.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+        this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
+    stateFormat(row, column) {
+      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+    },
+    divOpen() {
+      crudProductIn.getIosInvDtl({ 'bill_code': this.currentRow.bill_code }).then(res => {
+        this.openParam = res
+        this.storId = this.currentRow.stor_id
+        this.billType = this.currentRow.bill_type
+        this.divShow = true
+      })
+    },
+    taskOpen() {
+      crudProductIn.getIosInvDtl({ 'bill_code': this.currentRow.bill_code }).then(res => {
+        this.taskOpenParam = res
+      })
+      this.taskShow = true
+    },
+    querytable() {
+      this.onSelectAll()
+      this.crud.toQuery()
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js b/wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js
new file mode 100644
index 00000000..72b865e2
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js
@@ -0,0 +1,138 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/productIn',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/productIn/delete',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/productIn/update',
+    method: 'post',
+    data
+  })
+}
+
+export function getIosInvDis(data) {
+  return request({
+    url: '/api/productIn/getIosInvDis',
+    method: 'post',
+    data
+  })
+}
+
+export function vehicleCheck() {
+  return request({
+    url: '/api/productIn/vehicleCheck',
+    method: 'post'
+  })
+}
+
+export function confirmvehicle(data) {
+  return request({
+    url: '/api/productIn/confirmvehicle',
+    method: 'post',
+    data
+  })
+}
+
+export function getSect(data) {
+  return request({
+    url: '/api/stIvtSectattr/getSect',
+    method: 'post',
+    data
+  })
+}
+
+export function divStruct(data) {
+  return request({
+    url: '/api/productIn/divStruct',
+    method: 'post',
+    data
+  })
+}
+
+export function unDivStruct(data) {
+  return request({
+    url: '/api/productIn/unDivStruct',
+    method: 'post',
+    data
+  })
+}
+
+export function setPoint(data) {
+  return request({
+    url: '/api/productIn/setPoint',
+    method: 'post',
+    data
+  })
+}
+
+export function confirm(data) {
+  return request({
+    url: '/api/productIn/confirm',
+    method: 'post',
+    data
+  })
+}
+
+export function cancelConfirmvehicle(data) {
+  return request({
+    url: '/api/productIn/cancelConfirmvehicle',
+    method: 'post',
+    data
+  })
+}
+
+export function delTask(data) {
+  return request({
+    url: '/api/productIn/delTask',
+    method: 'post',
+    data
+  })
+}
+
+export function sendTask(data) {
+  return request({
+    url: '/api/productIn/sendTask',
+    method: 'post',
+    data
+  })
+}
+
+export function confirmTask(data) {
+  return request({
+    url: '/api/productIn/confirmTask',
+    method: 'post',
+    data
+  })
+}
+
+export default {
+  add,
+  edit,
+  del,
+  getIosInvDis,
+  vehicleCheck,
+  confirmvehicle,
+  getSect,
+  divStruct,
+  unDivStruct,
+  setPoint,
+  confirm,
+  cancelConfirmvehicle,
+  delTask,
+  sendTask,
+  confirmTask
+}
diff --git a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/AddDialog.vue b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/AddDialog.vue
index 0078a52b..6f9283b9 100644
--- a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/AddDialog.vue
+++ b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/AddDialog.vue
@@ -20,7 +20,7 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="表单结构表" prop="local_table_name">
+          <el-form-item label="表单结构表" prop="form_type">
             <el-select
               v-model="form.form_type"
               clearable
@@ -37,13 +37,13 @@
                   :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="表单名称" prop="api_address">
+          <el-form-item label="表单名称" prop="form_name">
             <el-input v-model="form.form_name" :disabled=true style="width: 180px;" />
           </el-form-item>
-          <el-form-item label="表单描述" prop="api_address">
+          <el-form-item label="表单描述" prop="form_desc">
             <el-input v-model="form.form_desc" :disabled=true style="width: 180px;" />
           </el-form-item>
-          <el-form-item label="接口地址" prop="api_address">
+          <el-form-item label="接口地址" prop="sync_url">
             <el-input v-model="form.sync_url" :disabled="!form.form_type" style="width: 180px;" />
           </el-form-item>
           <el-form-item label="同步类型" prop="sync_type">
diff --git a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/EditDialog.vue b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/EditDialog.vue
index 88cdfadc..152d89f3 100644
--- a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/EditDialog.vue
+++ b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/EditDialog.vue
@@ -20,31 +20,20 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="映射表名" prop="local_table_name">
-            <el-select
-              v-model="form.local_table_name"
-              clearable
-              filterable
-              size="mini"
-              disabled
-              placeholder="请选择/搜索"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in tableNameList"
-                :value="item"
-              />
-            </el-select>
+          <el-form-item label="映射表类型" prop="form_type">
+             <el-input v-model="form.form_type" :disabled=true style="width: 180px;" />
           </el-form-item>
-          <el-form-item label="接口地址" prop="api_address">
-            <el-input v-model="form.api_address" :disabled="!form.local_table_name" style="width: 180px;" />
+          <el-form-item label="映射表名" prop="form_name">
+             <el-input v-model="form.form_name" :disabled=true style="width: 180px;" />
+          </el-form-item>
+          <el-form-item label="接口地址" prop="sync_url">
+            <el-input v-model="form.sync_url"  style="width: 180px;" />
           </el-form-item>
           <el-form-item label="同步类型" prop="sync_type">
             <el-select
               v-model="form.sync_type"
               class="filter-item"
               clearable
-              :disabled="!form.local_table_name"
               placeholder="请选择"
               style="width: 180px"
             >
@@ -63,7 +52,6 @@
               clearable
               placeholder="请选择"
               style="width: 180px"
-              :disabled="!form.local_table_name"
             >
               <el-option
                 v-for="item in dict.external_system"
@@ -77,9 +65,13 @@
         </el-form>
       </span>
     </div>
+    <el-tabs v-model="currentTab" class="center-tabs">
+      <el-tab-pane label="主表字段映射" name="mst" />
+      <el-tab-pane v-if='this.form.has_child' label="明细字段映射" name="dtl" />
+    </el-tabs>
     <el-table
       ref="table"
-      :data="tableData"
+      :data="currentTab==='mst'?tableData:tableDtlData"
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       border
       highlight-current-row
@@ -93,14 +85,20 @@
             icon="el-icon-delete"
             size="mini"
             type="danger"
-            @click.native.prevent="deleteRow(scope.$index, tableData)"
+            @click.native.prevent="deleteRow(scope.$index, currentTab==='mst'?tableData:tableDtlData)"
           />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="字段名称" prop="local_field_name" />
-      <el-table-column align="center" label="外部系统字段名称" prop="external_field_name">
+      <el-table-column align="center" label="表单字段" prop="value" />
+      <el-table-column align="center" label="表单字段名称" prop="lable" />
+      <el-table-column align="center" label="外部系统映射字段" prop="mapping_field">
         <template scope="scope">
-          <el-input v-model="scope.row.external_field_name" size="mini" />
+          <el-input v-model="scope.row.mapping_field" size="mini" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="映射表达式" prop="skipExpression">
+        <template scope="scope">
+          <el-input v-model="scope.row.skipExpression" size="mini" />
         </template>
       </el-table-column>
     </el-table>
@@ -114,7 +112,7 @@
 <script>
 
 import CRUD, { crud, header, presenter } from '@crud/crud'
-import crudFormMapping from './formMapping'
+import crudFormMapping, {updateRows} from './formMapping'
 
 export default {
   name: 'EditDtl',
@@ -133,9 +131,11 @@ export default {
   },
   data() {
     return {
+      currentTab: 'mst',
       dialogVisible: false,
-      tableNameList: [],
-      tableData: []
+      tableData: [],
+      tableDtlData: [],
+
     }
   },
   watch: {
@@ -150,51 +150,82 @@ export default {
       this.$emit('update:dialogShow', false)
     },
     open() {
-      this.getExistTableName()
-    },
-    getExistTableName() {
-      crudFormMapping.getExistTableName().then(res => {
-        this.tableNameList = res
-      })
     },
     setForm(row) {
-      this.form.id = row.id
-      this.form.local_table_name = row.local_table_name
-      this.form.api_address = row.api_address
-      this.form.sync_type = row.sync_type
-      this.form.external_system = row.external_system
-      this.getColumns(this.form.local_table_name)
+      const mappingJson = row.mapping_json
+      let mst_json = mappingJson[0]
+      const dtl_json = mappingJson[1]
+      crudFormMapping.tableColumns(row.form_type).then(res => {
+        this.form.id = res.id
+        this.form.form_name = res.form_name
+        this.form.form_type = res.form_type
+        this.form.form_desc = res.form_desc
+        this.form.sync_url = row.sync_url
+        this.form.sync_type = row.sync_type
+        this.form.external_system = row.external_system
+        this.form.has_child = res.has_child
+        this.tableData = res.item
+        this.tableDtlData = res.dtl_item
+        for (let i = 0; i < this.tableData.length; i++) {
+          ddd:
+          for (let j = 0; j < mst_json.length; j++) {
+            if (mst_json[j].value == this.tableData[i].value) {
+              this.$set(this.tableData, i,mst_json[j])
+              break ddd
+            }
+          }
+        }
+        for (let i = 0; i < this.tableDtlData.length; i++) {
+          ddd:
+            for (let j = 0; j < dtl_json.length; j++) {
+              if (dtl_json[j].value == this.tableDtlData[i].value) {
+                this.$set(this.tableDtlData, i,dtl_json[j])
+                // this.tableDtlData[i].mapping_field = dtl_json[j].mapping_field
+                // this.tableDtlData[i].skipExpression = dtl_json[j].skipExpression
+                break ddd
+              }
+            }
+        }
+      })
     },
     close() {
       this.$emit('update:dialogShow', false)
       this.$emit('EditChanged')
       this.tableData = []
+      this.tableDtlData = []
+      this.form = {}
+      this.currentTab = 'mst'
+      this.dialogVisible = false
     },
     deleteRow(index, rows) {
       rows.splice(index, 1)
     },
-    getColumns(local_table_name) {
-      crudFormMapping.getTableColumnNamesFromMapping(local_table_name).then(res => {
-        this.tableData = res.dtos
-      })
-    },
     submit() {
-      if (!this.form.local_table_name) {
-        this.crud.notify('映射表名不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+      if (!this.form.sync_url) {
+        this.crud.notify('接口地址不能为空!！', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
-      const isInvalidRow = this.tableData.some(row => !row.external_field_name)
+      if (!this.form.sync_type) {
+        this.crud.notify('同步类型不能为空!！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      const isInvalidRow = this.tableData.some(row => !row.mapping_field)
       if (isInvalidRow) {
         this.crud.notify('外部字段名称不能为空!！', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
+      const isdtlRow = this.tableDtlData.some(row => !row.mapping_field)
+      if (isdtlRow) {
+        this.crud.notify('外部字段名称不能为空!！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
       const requestData = {
-        'bmExternalFieldMapping': this.form,
-        'dtos': this.tableData
+        'mst': this.form,
+        'item': [this.tableData, this.tableDtlData]
       }
       crudFormMapping.updateRows(requestData)
       this.$emit('update:dialogShow', false)
-      this.$emit('EditChanged')
+      this.$emit('AddChanged')
     }
   }
 }
diff --git a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/formMapping.js b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/formMapping.js
index dc332bc2..98c37161 100644
--- a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/formMapping.js
+++ b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/formMapping.js
@@ -48,8 +48,8 @@ export function addRows(data) {
 
 export function updateRows(data) {
   return request({
-    url: 'api/syncFormMapping/updateRows',
-    method: 'put',
+    url: 'api/syncFormMapping/update',
+    method: 'post',
     data
   })
 }