diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue
index 46866d9f..92d4c0e4 100644
--- a/src/views/basic/business/stockOrderPrint.vue
+++ b/src/views/basic/business/stockOrderPrint.vue
@@ -480,6 +480,7 @@ export default {
       let query = {
         enabled: true,
         vueType: "supDelivery",
+        productType:1
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 1fdd7739..b7c2050f 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -820,6 +820,8 @@ export default {
       defaultSys: null,
       levelUnitList: [],
       maxLevel: 1,
+
+      editRowSwitch: false //产品标识编辑开关 没保存前其他编辑不能按
     }
 
   },
@@ -980,6 +982,7 @@ export default {
 
     //层级保存
     levelSave(row) {
+      this.editRowSwitch = false
       if (isBlank(row.nameCode)) {
         this.$message.error('层级标识不能为空')
         return
@@ -1039,9 +1042,14 @@ export default {
     },
 
     rowChange(index, val) {
-      this.selectedIndex = index
 
+      if(this.editRowSwitch == true ){
+        this.$message.error('请先保存当前产品标识编辑')
+        return
+      }
+      this.selectedIndex = index
       this.isSave = false
+      this.editRowSwitch = true
     },
 
     deleteLevel(index, row) {
diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue
index 73985184..eddd8583 100644
--- a/src/views/basic/workplace/cargowWorkplaceManage.vue
+++ b/src/views/basic/workplace/cargowWorkplaceManage.vue
@@ -304,6 +304,8 @@
                 <!--                <el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>-->
                 <el-table-column label="货位名称" prop="name"></el-table-column>
                 <el-table-column label="货位编号 " prop="code"></el-table-column>
+                <el-table-column label="产品名称" prop="productName"></el-table-column>
+                <el-table-column label="产品规格" prop="productSpec"></el-table-column>
                 <el-table-column label="备注" prop="remark"></el-table-column>
                 <el-table-column label="操作" fixed="right" width="120">
                   <template slot-scope="scope">
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 06b06168..d8b3fb23 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -438,7 +438,7 @@ export default {
   },
   data() {
     return {
-      queueStatus: null,
+      queueStatus: null, // 1:货位功能开启 0:货位功能关闭
       busTypeList: [],
       busQuery: {
         busKey: '',
@@ -1768,6 +1768,10 @@ export default {
           if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) {
             this.$message.warning('当前工位无需按货位上架')
             return;
+          }else if (this.queueStatus == "1" && isBlank(this.orderFormData.workPlaceQueueCode)) {
+            this.scanCode = ''
+            this.$message.warning('当前工位需按货位上架')
+            return;
           }
         }else {
           if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) {
@@ -1955,10 +1959,14 @@ export default {
           this.scanCode = ''
           return this.$message.warning("上货未完成")
         }
-        if (!isBlank(this.orderFormData.billNo)){
+        if (this.queueStatus == "0"){
           this.scanCode = ''
-          return this.$message.warning("上货未完成")
+          return this.$message.warning('当前工位无需按货位上架')
         }
+        // if (!isBlank(this.orderFormData.billNo)){
+        //   this.scanCode = ''
+        //   return this.$message.warning("请先扫描货位码")
+        // }
         let query = {
           code: this.scanCode
         }
@@ -2227,7 +2235,6 @@ export default {
       })
     },
     handleScanComplete(fullScanData) {
-      console.log('接收 recCodes event:', fullScanData.join(';'))
       if (this.queueStatus == "1" && !this.orderFormData.workPlaceQueueCode) {
         if (fullScanData != null && fullScanData[0].includes("DMQ")) {
           this.getDMHotskeyValue(fullScanData[0])