Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

# Conflicts: # lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
2022-11-01 17:13:40 +08:00
parent 53e0732d73 e4df9e20af
commit d1cbe510f6
35 changed files with 1068 additions and 458 deletions
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
@@ -151,6 +151,7 @@
        </template>
      </el-table-column>
      <el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
+      <el-table-column prop="box_no" label="箱号" align="center" min-width="150px" show-overflow-tooltip />
      <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center">
        <template scope="scope">
          <el-input v-show="!scope.row.edit" v-model="scope.row.pcsn" size="mini" />