diff --git a/.env.production b/.env.production
index 509a667c..0117a90e 100644
--- a/.env.production
+++ b/.env.production
@@ -16,7 +16,7 @@ ENV = 'production'
 # 诏安总医院
 # VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/'
 
-VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
 
 # 平潭正式
 # VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
@@ -69,6 +69,8 @@ VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
 
 # VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.0.132:9150/UDI_WMS_MC/'
+# 四川平武
+VUE_APP_BASE_API = 'http://192.168.20.3:9150/UDI_WMS_MC/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
diff --git a/src/api/basic/workPlace/SysWorkplaceQueue.js b/src/api/basic/workPlace/SysWorkplaceQueue.js
index a41aa1e5..cca7f1ae 100644
--- a/src/api/basic/workPlace/SysWorkplaceQueue.js
+++ b/src/api/basic/workPlace/SysWorkplaceQueue.js
@@ -2,7 +2,6 @@ import axios from "@/utils/request";
 import request from "@/utils/request";
 
 
-
 export function createQueueCode(query) {
   return axios({
     url: "/udiwms/sysWorkplace/createQueueCode",
@@ -37,7 +36,6 @@ export function getQueueList(query) {
 }
 
 
-
 export function deleteQueue(query) {
   return axios({
     url: "/udiwms/sysWorkplaceQueue/delete",
@@ -47,3 +45,14 @@ export function deleteQueue(query) {
 }
 
 
+export function getByCode(query) {
+  return axios({
+    url: "/udiwms/sysWorkplaceQueue/getByCode",
+    method: "get",
+    params: query
+  });
+}
+
+
+
+
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 96be6ae6..0f42cc4f 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -165,7 +165,7 @@
         <div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">
           <el-row :gutter="0" style="margin-top: 5px">
             <el-col :span="20">
-              <el-form-item prop="code" :label="labels[labelName]" label-width="80px">
+              <el-form-item prop="code" :label="scanTip" label-width="80px">
                 <el-input
                   id="inputer"
                   @focus="getInputFocus($event)"
@@ -408,7 +408,7 @@ import {
   vailOrderFinish
 } from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
-import { getCurOrder, getNextOrder, findByBill, findFromCorp, removeByScanCode } from '@/api/collect/collectOrder'
+import {getCurOrder, getNextOrder, findByBill, findFromCorp, orderDetail} from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -517,7 +517,8 @@ export default {
       errVisible: false,
       workplaceId: null,
       ws: null,
-
+      scanTip: "扫码录入:",
+      scanSplit: false,
       //
       labels: {
         1: '扫码录入:',
@@ -704,7 +705,7 @@ export default {
       _this.$nextTick(() => {
         _this.panelALive = true;
       });
-
+      _this.getBizDetailList();
       _this.vailOrderFinish();
     },
     refreshCodesPanelP() {
@@ -719,8 +720,51 @@ export default {
     getInputFocus(event) {
       event.currentTarget.select();
     },
+    getBizDetailList() {
+      let preQuery = {}
+      if (this.formData == null)
+        return
+      if (this.formData != null) {
+        preQuery = {
+          orderIdFk: this.formData.billNo
+        };
+      }
+      orderDetail(preQuery).then(res => {
+        if (res.code != 20000) {
+          this.$message.error(res.message)
+          return
+        }
+        this.splitBizList = res.data.list
+        let tip = "";
+        this.splitBizList.forEach((item) => {
+          if (item.splitUnCheck) {
+            tip = tip + item.cpmctymc + ","
+          }
+        });
+        if (this.$isNotBlank(tip)) {
+          tip = "请扫码确认以下产品" + tip + "需拆零的追溯码！"
+          this.$alert(tip, "提示", {
+            confirmButtonText: "确定",
+            type: "warning",
+            closeOnClickModal: true,
+            callback: (action) => {
+            },
+          });
+          this.scanTip = "扫码拆零确认:"
+          this.$refs.inputRef.focus();
+          this.$refs.inputRef.select();
+          this.scanSplit = true
+          return;
+        } else {
+          this.overdeleteCode();
+        }
 
 
+      }).catch(() => {
+        this.$message.error("数据加载失败")
+      })
+    },
+
     enterKey() {
       if (this.formData.billNo == null && this.formDataVisible.scanType != 1) {
         this.enterBillNoKey()
@@ -750,15 +794,15 @@ export default {
         busType: this.formData.busType,
         code: this.filterQuery.code.trim(),
       };
-      if (this.scanStatus == 1){
+      if (this.scanStatus == 1) {
         const codeArray = this.filterQuery.code.split(";");
         let query = {
-          orderId :this.formData.billNo,
+          orderId: this.formData.billNo,
           codeList: codeArray
         }
         //剔除码
         this.removeCodesTemp(query)
-      }else {
+      } else {
         enterCodeWeb(tQuery).then((response) => {
           if (response.code === 20000) {
             this.$refs.inputRef.focus();
@@ -957,7 +1001,7 @@ export default {
     },
 
     saveDraftOrder() {
-      if (this.scanStatus == 1){
+      if (this.scanStatus == 1) {
         this.overdeleteCode()
       }
       this.$confirm('此操作将挂起当前正在处理单据，是否继续?', '提示', {
@@ -1330,16 +1374,16 @@ export default {
 
 
     batchVailCode(params) {
-      if (this.scanStatus == 1){
+      if (this.scanStatus == 1) {
         //剔除
         // const codeArray = this.codeFormData.code.split(';')
         let query = {
-          orderId : this.formData.billNo,
+          orderId: this.formData.billNo,
           codeList: params
         }
         //剔除码
         this.removeCodesTemp(query)
-      }else {
+      } else {
         batchVailCode(params).then((res) => {
           if (res.code === 20000) {
             this.valiCodes = [];
@@ -1386,9 +1430,9 @@ export default {
       }
 
     },
-    removeCodesTemp(query){
+    removeCodesTemp(query) {
       removeByScanCode(query).then(res => {
-        if (res.code == 20000){
+        if (res.code == 20000) {
           this.$message.success("剔除成功")
           this.scanCode = ""
           this.panelALive = false
@@ -1396,7 +1440,7 @@ export default {
             this.panelALive = true;
           });
           this.result = ""
-        }else {
+        } else {
           this.result = ""
           this.scanCode = ""
           this.$message.error(res.message)
@@ -1521,7 +1565,8 @@ export default {
     },
 
     //扫码剔除操作
-    deleteCode(){
+    deleteCode() {
+      this.scanTip = "扫码剔除:"
       this.labelName = 2
       this.placeholder = "请点击输入框进行扫码剔除"
       this.scanStatus = 1
@@ -1529,7 +1574,8 @@ export default {
     overdeleteCode() {
       this.labelName = 1
       this.scanStatus = null
-      this.placeholder =  '请点击输入框进行选择单据'
+      this.scanTip = "扫码录入:"
+      this.placeholder = '请点击输入框进行选扫码'
     },
   },
   mounted() {
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index ff096a18..8d27e804 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -8,9 +8,8 @@
       label-width="110px"
     >
       <el-card>
-
-
         <el-row style="margin-bottom: 8px">
+          <span style="font-size: 18px;font-weight: bold">{{ curQueueName }}</span>
           <el-button-group
             style="display: flex; margin-top: 5px; float: right"
           >
@@ -372,6 +371,7 @@ import chooseDraftOrderDialog from './chooseDraftOrderDialog'
 import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
+import {getByCode} from "@/api/basic/workPlace/SysWorkplaceQueue";
 
 export default {
   name: 'ioCreateOrder',
@@ -619,7 +619,9 @@ export default {
         2: '扫码剔除'
       },
       scanStatus: null, // 1:扫码剔除
-      codeArray: []
+      codeArray: [],
+      curQueueName: "当前货位：",
+      curQueue: null,
     }
   },
   components: {
@@ -679,7 +681,6 @@ export default {
         sickerAdNum: null,
         workPlaceCode: null,
         fifoSplit: 1
-
       }
       this.orderFormData.workPlaceCode = tempData.workPlaceCode
       this.orderFormData.mainAction = tempData.mainAction
@@ -692,8 +693,7 @@ export default {
       this.orderFormData.invCode = tempData.invCode
       this.scanCode = ''
       this.corpOrderIdDisabled = false
-      //todo 单据类型
-
+      this.curQueueName = '';
       this.refreshCodesPanel()
     },
     //获取用户仓库列表
@@ -1136,7 +1136,6 @@ export default {
       if (this.$isBlank(this.codeFormData.code) && this.$isBlank(this.scanCode)) {
         return
       }
-
       if (this.$isBlank(this.orderFormData.action)) {
         this.$message.warning('请选择单据类型！')
         return
@@ -1918,13 +1917,27 @@ export default {
               this.scanCode = ''
               this.orderFormData.fifoSplit = dmhotskey.fifoSplit
               return true
-
             }
           }
         } catch (error) {
           console.log('字符串不是有效的 JSON 格式')
         }
+      } else if (str.includes("DMQ")) {
+        let query = {
+          code: this.scanCode
+        }
+        getByCode(query).then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.curQueue = response.data;
+            this.curQueueName = "当前货位:" + this.curQueue.name + "(" + this.curQueue.code + ")"
+            this.scanCode = '';
+          }
+        }).catch(() => {
+        })
+        return true
       }
+
       return false
     },
     printCodeResult(data, isSuccess) {