控货调货箱数和调仓状态的操作入口

src/views/ecw/order/components/TransferCargo.vue

@@ -152,15 +152,15 @@ export default {
             if(!valid){
               return false
             }
-            // 放货箱数不能大于总控货箱数
+            // 放货箱数不能大于可放货箱数
             let errNos = []
             this.selectedOrders.forEach(item => {
-              if(item.releaseNum > item.sumNum){
+              if(item.releaseNum > item.sumNum - item.releaseNum){
                 errNos.push(item.orderNo)
               }
             })
             if(errNos.length){
-              return this.$message.error(this.$t("订单{no}的放货箱数不能大于控货箱数", {no: errNos.join(",")}))
+              return this.$message.error(this.$t("订单{no}的放货箱数不能大于可放货箱数", {no: errNos.join(",")}))
             }
             updateApply(Object.assign({
               cargoControlPickId: this.cargoControlPickId,

src/views/ecw/order/index.vue

@@ -311,7 +311,7 @@
                 </template>
 
                 <!-- 合单，拆单 -->
-                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206])">
+                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206,212,213])">
                   <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)"  v-hasPermi="['ecw:order:merge']">{{$t('合单申请')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"   v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item>
                 </template>