合并

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" />