diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java
index d15dc26ea..c4c1dc4e6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java
@@ -484,10 +484,12 @@ public class StorPublicServiceImpl implements StorPublicService {
                         }
                 }
             }
+            wo_Struct.update(map,"struct_id = '"+jo.getString("struct_id")+"'");
+            wo_Point.update(map,"point_id = '"+jo.getString("point_id")+"'");
         }else{//锁定
             map.put("lock_type",lock_type);
-            map.put("taskdtl_type",from.getString("taskdtl_type"));
-            map.put("taskdtl_id",from.getString("taskdtl_id"));
+            map.put("taskdtl_type",from.getString("task_type"));
+            map.put("taskdtl_id",from.getString("task_id"));
             map.put("task_code",from.getString("task_code"));
             map.put("inv_type",from.getString("inv_type"));
             map.put("inv_id",from.getString("inv_id"));
@@ -505,6 +507,8 @@ public class StorPublicServiceImpl implements StorPublicService {
                 map.put("point_status","01");
             }
         }
+        wo_Struct.update(map,"struct_id = '"+jo.getString("struct_id")+"'");
+        wo_Point.update(map,"point_id = '"+jo.getString("point_id")+"'");
     }
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 05e1b1fec..3a11739a4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -362,8 +362,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                     .addParam("material_id", dtl.getString("material_id"))
                     .addParam("quality_scode", dtl.getString("quality_scode"))
                     .addParam("pcsn", dtl.getString("pcsn"))
-                    .addParam("ivt_level", dtl.getString("ivt_level"))
-                    .addParam("is_active", dtl.getString("is_active"))
                     .addParam("iostorinv_id", whereJson.getString("iostorinv_id"))
                     .addParam("stor_id", whereJson.getString("stor_id"))
                     .addParam("sect_id", whereJson.getString("sect_id"))
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
index d86d83c24..30d908b92 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -527,8 +527,7 @@
                 dis.*,
                 mater.material_code,
                 mater.material_name,
-                task.point_code1 AS start_point_code,
-                task.point_code2 AS next_point_code,
+                point.point_code AS next_point_code,
                 task.task_id,
                 task.task_code,
                 task.task_type,
@@ -536,6 +535,7 @@
               FROM
                 st_ivt_iostorinvdis dis
                 LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
+                LEFT JOIN sch_base_point point ON dis.point_id = point.point_id
                 LEFT JOIN sch_base_task task ON dis.task_id = task.task_id
                 WHERE
                 1=1
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
index e99779221..0046d7109 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
@@ -138,7 +138,11 @@
         <el-table-column prop="pcsn" label="子卷批次号" align="center" />
         <el-table-column prop="storagevehicle_code" label="箱号" align="center" />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+<<<<<<< HEAD
+        <el-table-column prop="struct_code" label="起始位置" align="center" />
+=======
         <el-table-column prop="start_point_code" label="起始位置" align="center" />
+>>>>>>> 695691a39c6d107f14dda8207696b91d671272a4
         <el-table-column prop="next_point_code" label="目的位置" align="center" />
         <el-table-column prop="task_code" label="任务号" align="center" />
         <el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />