推送wcs

src/api/haianWarehouse/palletMergeQuery.js

@@ -15,5 +15,5 @@ export const haiAnGetGuardPalletTypeOptions = data => createAPI('/autoWareHource
 // 海安围托盘手工合托：分页查询候选托盘（仅 calling_flag=N，返回标签数）- rqrq
 export const haiAnSearchGuardPalletManualMergeList = data => createAPI('/autoWareHourceHaian/haiAnPalletMergeQuery/searchGuardPalletManualMergeList', 'post', data)
 
-// 海安围托盘手工合托：批量下达（主流程无事务，逐托盘独立事务）- rqrq
+// 海安围托盘手工合托：批量下达到整托出库口（与 Call料同一出口，逐托盘独立事务）- rqrq
 export const haiAnSubmitGuardPalletManualMerge = data => createAPI('/autoWareHourceHaian/haiAnPalletMergeQuery/submitGuardPalletManualMerge', 'post', data)

src/views/modules/haianWarehouse/automatedWarehouse/guardPalletManualMerge54.vue

@@ -43,7 +43,7 @@
         {{ submitLoading ? '提交中...' : '提交围托盘手工合托' }}
       </el-button>
       <span style="margin-left: 10px; color: #909399; font-size: 12px;">
-        已选择 {{ selectedRows.length }} 条，单次最多 {{ maxSubmitCount }} 条
+        已选择 {{ selectedRows.length }} 条，单次最多 {{ maxSubmitCount }} 条；下达目标固定为整托出库口
       </span>
     </div>
 
@@ -257,7 +257,7 @@ export default {
         return
       }
       const palletIdList = this.selectedRows.map(item => item.palletId).filter(item => !!item)
-      this.$confirm('确定提交围托盘手工合托出库？', '提示', {
+      this.$confirm('确定提交围托盘手工合托出库到整托出库口？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/modules/haianWarehouse/warehouse/wcsCallBackSearch54.vue

@@ -11,12 +11,15 @@
       </el-form-item>
 
       <el-form-item label="事务类型">
-        <el-select v-model="queryData.transTypeDesc" placeholder="请选择" style="width: 120px" clearable>
+        <!-- 海安回调查询仅认新中文：入货架（原入库）/出货架（原出库）/到达出库口（原取货通知）/离开入库口（原取走栈板）/到达异常位（原异常位处理）/到达手工分拣区 - rqrq -->
+        <el-select v-model="queryData.transTypeDesc" placeholder="请选择" style="width: 160px" clearable>
           <el-option label="全部" value=""></el-option>
-          <el-option label="入库" value="入库"></el-option>
-          <el-option label="出库" value="出库"></el-option>
-          <el-option label="取货通知" value="取货通知"></el-option>
-          <el-option label="取走栈板" value="取走栈板"></el-option>
+          <el-option label="入货架" value="入货架"></el-option>
+          <el-option label="出货架" value="出货架"></el-option>
+          <el-option label="到达出库口" value="到达出库口"></el-option>
+          <el-option label="离开入库口" value="离开入库口"></el-option>
+          <el-option label="到达异常位" value="到达异常位"></el-option>
+          <el-option label="到达手工分拣区" value="到达手工分拣区"></el-option>
         </el-select>
       </el-form-item>
 
@@ -98,7 +101,8 @@
             <el-tag :type="getStatusType(scope.row.status)" size="small">{{ scope.row.status }}</el-tag>
           </span>
           <span v-else-if="item.columnProp === 'transTypeDesc'">
-            <el-tag :type="scope.row.transTypeDesc === '入库' ? 'success' : 'warning'" size="small">
+            <!-- 入货架（原入库）用绿色，其余类型用橙色 - rqrq -->
+            <el-tag :type="scope.row.transTypeDesc === '入货架' ? 'success' : 'warning'" size="small">
               {{ scope.row.transTypeDesc }}
             </el-tag>
           </span>
@@ -157,7 +161,7 @@ export default {
         { columnProp: 'palletId', headerAlign: 'center', align: 'center', columnLabel: '栈板ID', columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: '' },
         { columnProp: 'taskNo', headerAlign: 'center', align: 'center', columnLabel: '任务号', columnWidth: 150, columnSortable: false, showOverflowTooltip: true, fixed: '' },
         { columnProp: 'itemNo', headerAlign: 'center', align: 'center', columnLabel: '明细行号', columnWidth: 80, columnSortable: false, showOverflowTooltip: true, fixed: '' },
-        { columnProp: 'transTypeDesc', headerAlign: 'center', align: 'center', columnLabel: '事务类型', columnWidth: 100, columnSortable: false, showOverflowTooltip: true, fixed: '' },
+        { columnProp: 'transTypeDesc', headerAlign: 'center', align: 'center', columnLabel: '事务类型', columnWidth: 140, columnSortable: false, showOverflowTooltip: true, fixed: '' },
         { columnProp: 'toWarehouseId', headerAlign: 'center', align: 'center', columnLabel: '目标仓库', columnWidth: 100, columnSortable: false, showOverflowTooltip: true, fixed: '' },
         { columnProp: 'toLocationId', headerAlign: 'center', align: 'center', columnLabel: '目标库位', columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: '' },
         { columnProp: 'toStation', headerAlign: 'center', align: 'center', columnLabel: '目标站点', columnWidth: 100, columnSortable: false, showOverflowTooltip: true, fixed: '' },