Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

pan

2025-11-30 5c640ca754afda2ea725e9fed2ff7bac0c62fa23

Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/config/buttons.js

@@ -180,6 +180,16 @@
    onClick: function () {
    }
},

{
    name: "虚拟出入库",
    icon: 'el-icon-setting',
    class: '',
    value: 'NoStockOut',
    type: 'success',
    onClick: function () {
    }
},
]

export default buttons

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/package.json

@@ -16,6 +16,7 @@
    "core-js": "^3.6.5",
    "echarts": "^5.0.2",
    "element-plus": "^2.2.14",
    "element-ui": "^2.15.14",
    "jsbarcode": "^3.11.6",
    "less": "^4.1.1",
    "qrcode": "^1.5.4",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/NoStockOut.vue

@@ -5,29 +5,85 @@
      :lazy="true"
      width="65%"
      :padding="20"
      title="无库存出库"
      title="虚拟出入库"
      class="custom-vol-box"
    >
      <div>
        <!-- å•æ®é€‰æ‹©åŒºåŸŸï¼ˆå¯è¾“入搜索） -->
        <el-form :inline="true" :model="orderForm" style="margin-bottom: 20px; align-items: flex-end;">
          <el-form-item label="出库单据:" name="outboundOrderId">
            <el-select
              v-model="orderForm.outboundOrderId"
              placeholder="请选择或扫描出库单据号"
              clearable
              style="width: 220px; margin-right: 10px;"
              @change="handleOrderChange"
              @visible-change="handleOutboundVisibleChange"
              :loading="loading"
              filterable
              :filter-method="filterOutboundOrders"
              @input="handleOutboundScanInput"  
              ref="outboundSelectRef"        
            >
              <el-option
                v-for="order in filteredOutboundOrders"
                :key="order.id"
                :label="order.orderNo"
                :value="order.id"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="采购单据:" name="purchaseOrderId">
            <el-select
              v-model="orderForm.purchaseOrderId"
              placeholder="请选择或扫描采购单据号"
              clearable
              style="width: 220px; margin-right: 10px;"
              @change="handleOrderChange"
              @visible-change="handlePurchaseVisibleChange"
              :loading="loading"
              filterable
              :filter-method="filterPurchaseOrders"
              @input="handlePurchaseScanInput" 
              ref="purchaseSelectRef"
            >
              <el-option
                v-for="order in filteredPurchaseOrders"
                :key="order.id"
                :label="order.orderNo"
                :value="order.id"
              ></el-option>
            </el-select>
          </el-form-item>
        </el-form>

        <!-- ä¸Šæ–¹è¾“入框 -->
        <el-form :inline="true" :model="formData" ref="formData" style="margin-bottom: 20px; align-items: flex-end;">
        <el-form :inline="true" :model="formData" ref="formRef" style="margin-bottom: 20px; align-items: flex-end;">
          <el-form-item
            label="扫描条码:"
            style="width: 80%"
            prop="barcode"
            name="barcode"
            :rules="[{ required: true, message: '请扫描或输入条码', trigger: 'blur' }]"
          >
            <el-input
              ref="barcodeInput"
              ref="barcodeInputRef"
              v-model="formData.barcode"
              placeholder="请使用扫码枪扫描条码，或手动输入"
              @keyup.enter="handleScan"
              autofocus
              class="custom-input"
              :disabled="!orderForm.outboundOrderId || !orderForm.purchaseOrderId"
            ></el-input>
          </el-form-item>
          <el-form-item>
            <el-button type="primary" size="small" @click="handleScan" class="custom-button">
              <i class="el-icon-search"></i> ç¡®è®¤æ‰«æ
            <el-button 
              type="primary" 
              size="small" 
              @click="handleScan" 
              class="custom-button"
              :disabled="!orderForm.outboundOrderId || !orderForm.purchaseOrderId || loading"
            >
              <Search /> ç¡®è®¤æ‰«æ
            </el-button>
          </el-form-item>
        </el-form>
@@ -37,27 +93,23 @@
          <el-card shadow="hover" style="margin-bottom: 10px; border: none;" class="custom-card">
            <div class="card-header">
              <span class="header-title">已扫描条码列表（共{{ scannedBarcodes.length }}条）</span>
              <el-button
                class="clear-all-btn"
                @click="clearAll"
                :disabled="scannedBarcodes.length === 0"
              >清空所有</el-button>
            </div>
            <div class="card-body">
              <el-scrollbar height="400px" class="custom-scrollbar">
                <!-- ä½¿ç”¨ transition-group åŒ…裹以实现动画 -->
                <transition-group name="barcode-item-transition">
                  <div class="barcode-item" v-for="(barcode, index) in scannedBarcodes" :key="barcode" :data-index="index">
                    <span class="barcode-text">{{ index + 1 }}. {{ barcode }}</span>
                  <div class="barcode-item" v-for="(item, index) in scannedBarcodes" :key="item.barcode" :data-index="index">
                    <span class="barcode-text">{{ index + 1 }}. {{ item.barcode }}</span>
                    <el-button
                      class="delete-btn"
                      @click="removeItem(index)"
                    >删除</el-button>
                      @click="removeItem(index, item.barcode)"
                      icon="Delete"
                      circle
                      :disabled="loading"
                    ></el-button>
                  </div>
                </transition-group>
                <div class="empty-tip" v-if="scannedBarcodes.length === 0">
                  <i class="el-icon-information"></i>
                  <span>暂无扫描记录，请扫描条码</span>
                  <span>暂无扫描记录，请先选择单据后扫描条码</span>
                </div>
              </el-scrollbar>
            </div>
@@ -67,10 +119,16 @@

      <template #footer>
        <div class="footer-actions">
          <el-button type="primary" size="small" @click="submit" :disabled="scannedBarcodes.length === 0" class="submit-btn">
            <i class="el-icon-check"></i> æäº¤å‡ºåº“
          <el-button 
            type="primary" 
            size="small" 
            @click="submit" 
            :disabled="scannedBarcodes.length === 0 || !orderForm.outboundOrderId || !orderForm.purchaseOrderId || loading" 
            class="submit-btn"
          >
            <Check /> æäº¤å‡ºåº“
          </el-button>
          <el-button type="text" size="small" @click="showDetailBox = false" class="cancel-btn">
          <el-button type="text" size="small" @click="showDetailBox = false" class="cancel-btn" :disabled="loading">
            å–消
          </el-button>
        </div>
@@ -79,99 +137,307 @@
  </div>
</template>

<script>
<script setup>
import { ref, reactive, onMounted, nextTick } from 'vue';
import { ElMessage } from 'element-plus';

import VolBox from "@/components/basic/VolBox.vue";
import http from '@/api/http';

export default {
  components: { VolBox },
  data() {
    return {
      showDetailBox: false,
      formData: {
        barcode: "",
      },
      scannedBarcodes: [],
    };
  },
  methods: {
    open() {
      this.showDetailBox = true;
      this.scannedBarcodes = [];
      this.formData.barcode = "";
      this.$nextTick(() => {
        this.$refs.barcodeInput.focus();
      });
    },
// å“åº”式数据
const showDetailBox = ref(false);
const orderForm = reactive({
  outboundOrderId: "",
  purchaseOrderId: ""
});
const formData = reactive({
  barcode: "",
});
const scannedBarcodes = ref([]);
const outboundOrders = ref([]);
const purchaseOrders = ref([]);
const filteredOutboundOrders = ref([]);
const filteredPurchaseOrders = ref([]);
const loading = ref(false);

    handleScan() {
      const barcode = this.formData.barcode.trim();
      if (!barcode) {
        this.$refs.barcodeInput.focus();
        return;
      }
      if (this.scannedBarcodes.includes(barcode)) {
        this.$message.warning(`条码 ${barcode} å·²æ‰«æè¿‡ï¼Œè¯·å‹¿é‡å¤æ‰«æ`);
        this.formData.barcode = "";
        this.$refs.barcodeInput.focus();
        return;
      }
// æ¨¡æ¿å¼•ç”¨
const formRef = ref(null);
const barcodeInputRef = ref(null);
const outboundSelectRef = ref(null); // æ–°å¢žï¼šå‡ºåº“单select的ref
const purchaseSelectRef = ref(null); // æ–°å¢žï¼šé‡‡è´­å•select的ref

      this.scannedBarcodes.push(barcode);
      this.formData.barcode = "";
// ç”¨äºŽé˜²æ­¢è¾“入事件和change事件冲突的锁
const isProcessingScan = ref(false);

      this.$nextTick(() => {
        this.$refs.barcodeInput.focus();
      });
    },
// ç»„件挂载时初始化过滤后的列表
onMounted(() => {
  filteredOutboundOrders.value = [...outboundOrders.value];
  filteredPurchaseOrders.value = [...purchaseOrders.value];
});

    removeItem(index) {
      this.scannedBarcodes.splice(index, 1);
    },

    clearAll() {
      this.$confirm("确定要清空所有扫描记录吗？", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      }).then(() => {
        this.scannedBarcodes = [];
      }).catch(() => {
        this.$refs.barcodeInput.focus();
      });
    },

    submit() {
      if (this.scannedBarcodes.length === 0) {
        this.$message.warning("请先扫描至少一条条码");
        this.$refs.barcodeInput.focus();
        return;
      }

      const params = {
        barcodes: this.scannedBarcodes,
      };

      this.http
        .post("/api/OutboundOrder/NoStockOut", params, "数据处理中...")
        .then((res) => {
          if (!res.status) {
            this.$message.error(res.message);
            this.$refs.barcodeInput.focus();
            return;
          }
          this.$message.success("出库成功");
          this.showDetailBox = false;
          this.$emit("parentCall", ($vue) => {
            $vue.refresh();
          });
        })
        .catch((err) => {
          this.$message.error(`请求失败：${err.message || "未知错误"}`);
          this.$refs.barcodeInput.focus();
        });
    },
  },
// æ‰“开弹窗
const open = () => {
  showDetailBox.value = true;
  scannedBarcodes.value = [];
  formData.barcode = "";
  orderForm.outboundOrderId = "";
  orderForm.purchaseOrderId = "";
  nextTick(() => {
    barcodeInputRef.value?.focus();
  });
};

// åŠ è½½å‡ºåº“单据列表
const loadOutboundOrders = async () => {
  if (outboundOrders.value.length > 0) return;
  try {
    loading.value = true;
    const res = await http.get("/api/OutboundPicking/GetAvailablePickingOrders");
    
    if (res.code === 0) {
      outboundOrders.value = res.data.map(orderNo => ({
        id: orderNo,
        orderNo: orderNo
      }));
      filteredOutboundOrders.value = [...outboundOrders.value];
    } else {
      ElMessage.error("加载出库单据失败：" + (res.message || '未知错误'));
    }
  } catch (error) {
    ElMessage.error("加载出库单据异常：" + error.message);
  } finally {
    loading.value = false;
  }
};

// åŠ è½½é‡‡è´­å•æ®åˆ—表
const loadPurchaseOrders = async () => {
  if (purchaseOrders.value.length > 0) return;
  try {
    loading.value = true;
    const res = await http.get("/api/OutboundPicking/GetAvailablePurchaseOrders");
    
    if (res.status === true) {
      purchaseOrders.value = res.data.map(orderNo => ({
        id: orderNo,
        orderNo: orderNo
      }));
      filteredPurchaseOrders.value = [...purchaseOrders.value];
    } else {
      ElMessage.error("加载采购单据失败：" + (res.message || '未知错误'));
    }
  } catch (error) {
    ElMessage.error("加载采购单据异常：" + error.message);
  } finally {
    loading.value = false;
  }
};

// å‡ºåº“单据过滤方法
const filterOutboundOrders = (value) => {
  if (!value) {
    filteredOutboundOrders.value = [...outboundOrders.value];
  } else {
    const lowerValue = value.toLowerCase();
    filteredOutboundOrders.value = outboundOrders.value.filter(order => 
      order.orderNo.toLowerCase().includes(lowerValue)
    );
  }
};

// é‡‡è´­å•æ®è¿‡æ»¤æ–¹æ³•
const filterPurchaseOrders = (value) => {
  if (!value) {
    filteredPurchaseOrders.value = [...purchaseOrders.value];
  } else {
    const lowerValue = value.toLowerCase();
    filteredPurchaseOrders.value = purchaseOrders.value.filter(order => 
      order.orderNo.toLowerCase().includes(lowerValue)
    );
  }
};

// å‡ºåº“单据下拉框显示/隐藏时触发
const handleOutboundVisibleChange = (visible) => {
  if (visible) {
    loadOutboundOrders();
  } else {
    // å½“下拉框关闭时，如果是扫描操作导致的，清空输入框
    if (isProcessingScan.value) {
        nextTick(() => {
            outboundSelectRef.value?.clearInput();
            isProcessingScan.value = false;
        });
    }
  }
};

// é‡‡è´­å•æ®ä¸‹æ‹‰æ¡†æ˜¾ç¤º/隐藏时触发
const handlePurchaseVisibleChange = (visible) => {
  if (visible) {
    loadPurchaseOrders();
  } else {
    // å½“下拉框关闭时，如果是扫描操作导致的，清空输入框
    if (isProcessingScan.value) {
        nextTick(() => {
            purchaseSelectRef.value?.clearInput();
            isProcessingScan.value = false;
        });
    }
  }
};

// å•æ®é€‰æ‹©å˜åŒ–时触发
const handleOrderChange = () => {
  // å¦‚果是手动选择，则不清空输入框
  isProcessingScan.value = false;
  
  scannedBarcodes.value = [];
  nextTick(() => {
    barcodeInputRef.value?.focus();
  });
};

/**
 * å¤„理出库单扫描输入
 * @param {string} scanText - æ‰«ææžªè¾“入的文本
 */
const handleOutboundScanInput = async (scanText) => {
  // é¿å…å¤„理空字符串或由change事件触发的内部操作
  if (!scanText || isProcessingScan.value) return;

  // æŸ¥æ‰¾å®Œå…¨åŒ¹é…çš„订单
  const matchedOrder = outboundOrders.value.find(order => order.orderNo === scanText);

  if (matchedOrder) {
    isProcessingScan.value = true; // æ ‡è®°ä¸ºæ­£åœ¨å¤„理扫描
    // æ‰‹åŠ¨èµ‹å€¼
    orderForm.outboundOrderId = matchedOrder.id;
    ElMessage.success(`成功选择出库单：${matchedOrder.orderNo}`);
    
    // å»¶è¿Ÿèšç„¦åˆ°ä¸‹ä¸€ä¸ªè¾“入框，确保赋值完成
    setTimeout(() => {
        purchaseSelectRef.value?.focus();
    }, 100);
  }
  // å¦‚果没有匹配项，不做任何事，让el-select保持过滤状态，用户可以手动选择
};

/**
 * å¤„理采购单扫描输入
 * @param {string} scanText - æ‰«ææžªè¾“入的文本
 */
const handlePurchaseScanInput = async (scanText) => {
  if (!scanText || isProcessingScan.value) return;

  const matchedOrder = purchaseOrders.value.find(order => order.orderNo === scanText);

  if (matchedOrder) {
    isProcessingScan.value = true; // æ ‡è®°ä¸ºæ­£åœ¨å¤„理扫描
    orderForm.purchaseOrderId = matchedOrder.id;
    ElMessage.success(`成功选择采购单：${matchedOrder.orderNo}`);
    
    setTimeout(() => {
        barcodeInputRef.value?.focus();
    }, 100);
  }
};


// æ‰«ææ¡ç å¤„理
const handleScan = async () => {
  if (!formRef.value) return;
  await formRef.value.validateField('barcode');

  const barcode = formData.barcode.trim();
  
  if (scannedBarcodes.value.some(item => item.barcode === barcode)) {
    ElMessage.warning(`条码 ${barcode} å·²æ‰«æè¿‡ï¼Œè¯·å‹¿é‡å¤æ‰«æ`);
    formData.barcode = "";
    nextTick(() => barcodeInputRef.value?.focus());
    return;
  }

  try {
    loading.value = true;
    const res = await http.post("/api/OutboundPicking/BarcodeValidate", {
      outOder: orderForm.outboundOrderId,
      inOder: orderForm.purchaseOrderId,
      barCode: barcode
    });

    if (res.status === true) {
      scannedBarcodes.value.push({ barcode });
      ElMessage.success("扫描成功");
      formData.barcode = "";
    } else {
      ElMessage.error("扫描失败：" + (res.message || '验证失败'));
    }
  } catch (error) {
    ElMessage.error("扫描验证异常：" + error.message);
  } finally {
    loading.value = false;
    nextTick(() => barcodeInputRef.value?.focus());
  }
};

// ç§»é™¤å•æ¡æ‰«æè®°å½•
const removeItem = async (index, barcode) => {
  try {
    loading.value = true;
    const res = await http.post("/api/OutboundPicking/DeleteBarcode", {
      outOder: orderForm.outboundOrderId,
      inOder: orderForm.purchaseOrderId,
      barCode: barcode
    });

    if (res.status === true) {
      scannedBarcodes.value.splice(index, 1);
      ElMessage.success("删除成功");
    } else {
      ElMessage.error("删除失败：" + (res.message || '删除失败'));
    }
  } catch (error) {
    ElMessage.error("删除条码异常：" + error.message);
  } finally {
    loading.value = false;
  }
};

// æäº¤å‡ºåº“
const submit = async () => {
  if (scannedBarcodes.value.length === 0) {
    ElMessage.warning("请先扫描至少一条条码");
    return;
  }

  const barcodes = scannedBarcodes.value.map(item => item.barcode);

  try {
    loading.value = true;
    const res = await http.post("/api/OutboundPicking/NoStockOutSubmit", {
      OutOderSubmit: orderForm.outboundOrderId,
      InOderSubmit: orderForm.purchaseOrderId,
      BarCodeSubmit: barcodes
    });

    if (res.status === true) {
      ElMessage.success("出库提交成功");
      showDetailBox.value = false;
    } else {
      ElMessage.error("出库提交失败：" + (res.message || '提交失败'));
    }
  } catch (error) {
    ElMessage.error("出库提交异常：" + error.message);
  } finally {
    loading.value = false;
  }
};

// æš´éœ²ç»™çˆ¶ç»„件的方法
defineExpose({
  open
});
</script>

<style scoped>
@@ -219,31 +485,22 @@
  font-size: 15px;
  color: #333;
}
.clear-all-btn {
  color: #f56c6c;
  font-size: 13px;
  transition: color 0.2s;
}
.clear-all-btn:hover {
  color: #e53e3e;
  background: rgba(245, 108, 108, 0.1);
}

.card-body {
  padding: 0;
}

/* è‡ªå®šä¹‰æ»šåŠ¨æ¡ */
.custom-scrollbar ::v-deep .el-scrollbar__thumb {
.custom-scrollbar :deep(.el-scrollbar__thumb) {
  background: rgba(0, 0, 0, 0.2);
  border-radius: 4px;
  width: 4px;
}
.custom-scrollbar ::v-deep .el-scrollbar__bar:hover .el-scrollbar__thumb {
.custom-scrollbar :deep(.el-scrollbar__bar:hover .el-scrollbar__thumb) {
  background: rgba(0, 0, 0, 0.3);
  width: 6px;
}
.custom-scrollbar ::v-deep .el-scrollbar__wrap {
.custom-scrollbar :deep(.el-scrollbar__wrap) {
  overflow-x: hidden;
}

@@ -260,7 +517,7 @@
}
/* ä¸ºå¥‡æ•°è¡Œæ·»åŠ è½»å¾®çš„背景色，增强可读性 */
.barcode-item:nth-child(odd) {
  background-color: #e1e1e1;
  background-color: #f9f9f9;
}
.barcode-text {
  flex: 1;
@@ -274,16 +531,15 @@

.delete-btn {
  color: #ea1919;
  font-size: 20px;
  font-size: 16px;
  transition: all 0.2s;
  transform: scale(0.8);
  opacity: 0.7;
}
.barcode-item:hover .delete-btn {
  opacity: 1;
  transform: scale(1);
}
.delete-btn:hover {
  color: #f56c6c !important; /* ä½¿ç”¨ !important è¦†ç›– Element UI é»˜è®¤æ ·å¼ */
  color: #f56c6c !important;
  background: rgba(245, 108, 108, 0.1);
}

@@ -296,22 +552,22 @@
  flex-direction: column;
  align-items: center;
  justify-content: center;
  gap: 15px;
}
.empty-tip i {
  font-size: 40px;
  margin-bottom: 15px;
  color: #dcdfe6;
}

/* è‡ªå®šä¹‰è¾“入框 */
.custom-input ::v-deep .el-input__inner {
.custom-input :deep(.el-input__inner) {
  border-radius: 6px;
  border-color: #e4e7ed;
  transition: all 0.3s;
  height: 36px;
  line-height: 36px;
}
.custom-input ::v-deep .el-input__inner:focus {
.custom-input :deep(.el-input__inner:focus) {
  border-color: #409eff;
  box-shadow: 0 0 0 3px rgba(64, 158, 255, 0.1);
}
@@ -355,7 +611,7 @@
</style>

<style>
/* ... (全局样式部分保持不变) ... */
/* å…¨å±€æ ·å¼éƒ¨åˆ†ä¿æŒä¸å˜ */
.text-button:hover {
  background-color: #f0f9eb !important;
}

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue

@@ -217,13 +217,6 @@
          icon: "el-icon-s-grid",
        },
        {
          prop: "NoStockOut",
          title: "无库存出库",
          type: "icon",
          width: 100,
          icon: "el-icon-setting",
        },
        {
          prop: "viewDetail",
          title: "出库详细",
          type: "icon",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js

@@ -5,10 +5,11 @@
import { ElDialog, ElForm, ElFormItem, ElInput, ElButton, ElMessage, ElSelect, ElOption } from 'element-plus';

import gridBody from './extend/outOrderDetail.vue'
import gridHeader from './extend/NoStockOut.vue'
let extension = {
  components: {
    //查询界面扩展组件
    gridHeader: '',
    gridHeader: gridHeader,
    gridBody: gridBody,
    gridFooter: '',
    //新建、编辑弹出框扩展组件
@@ -326,6 +327,13 @@
          this.$refs.gridBody.open(row);
        }
      });
      let TaskHandCompletedBtn = this.buttons.find(x => x.value == 'NoStockOut');
      if (TaskHandCompletedBtn) {
        TaskHandCompletedBtn.onClick = function () {
          this.$refs.gridHeader.open();
        }
      }

    },
    onInited() {
      //框架初始化配置后
@@ -335,15 +343,16 @@
    searchBefore(param) {
      //界面查询前,可以给param.wheres添加查询参数
      //返回false，则不会执行查询
      
           let wheres = [{
            'name': 'orderType',
            'value': '0',
            'displayType': 'text'}];
   

          param.wheres.push(...wheres);
        return true;
      let wheres = [{
        'name': 'orderType',
        'value': '0',
        'displayType': 'text'
      }];


      param.wheres.push(...wheres);
      return true;

      return true;
    },

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutboundPickingService.cs

@@ -25,6 +25,27 @@
        Task<WebResponseContent> ConfirmPicking(string orderNo, string palletCode, string barcode);
        Task<WebResponseContent> ReturnRemaining(string orderNo, string palletCode, string reason);

        /// <summary>
        /// å•æ®æŸ¥æ‰¾
        /// </summary>
        /// <returns></returns>
        WebResponseContent GetAvailablePurchaseOrders();
        WebResponseContent GetAvailablePickingOrders();

        /// <summary>
        /// æ‰«ç éªŒè¯
        /// </summary>
        WebResponseContent BarcodeValidate(NoStockOutModel noStockOut);
        /// <summary>
        /// æ¡ç åˆ é™¤
        /// </summary>
        /// <param name="noStockOut"></param>
        /// <returns></returns>
        WebResponseContent DeleteBarcode(NoStockOutModel noStockOut);

        WebResponseContent NoStockOutSubmit(NoStockOutSubmit noStockOutSubmit);

        Task<WebResponseContent> RemoveEmptyPallet(string orderNo, string palletCode);

    }
}

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs

@@ -140,5 +140,10 @@
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "备注")]
        public string Remark { get; set; }

        /// <summary>
        /// è™šæ‹Ÿå‡ºå…¥åº“数量
        /// </summary>
        public decimal NoStockOutQty { get; set; }
    }
}

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs

@@ -149,5 +149,11 @@
        public decimal AllocatedQuantity { get; set; }

        public string BatchAllocateStatus { get; set; }

        /// <summary>
        /// è™šæ‹Ÿå‡ºå…¥åº“数量
        /// </summary>
        public decimal NoStockOutQty { get; set; }

    }
}

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/NoStockOutModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace WIDESEA_Model.Models
{
    /// <summary>
    /// è™šæ‹Ÿå‡ºå…¥åº“实体类
    /// </summary>
    public class NoStockOutModel
    {
        /// <summary>
        /// å…¥åº“单
        /// </summary>
        public string inOder { get; set; }
        /// <summary>
        /// å‡ºåº“单
        /// </summary>
        public string outOder { get; set; }
        /// <summary>
        /// æ¡ç 
        /// </summary>
        public string barCode { get; set; }
    }
    /// <summary>
    /// æäº¤å‡ºåº“实体类
    /// </summary>
    public class NoStockOutSubmit
    {
        /// <summary>
        /// æäº¤å…¥åº“单
        /// </summary>
        public string InOderSubmit { get; set; }
        /// <summary>
        /// æäº¤å‡ºåº“单
        /// </summary>
        public string OutOderSubmit { get; set; }
        /// <summary>
        /// æäº¤æ¡ç é›†åˆ
        /// </summary>
        public List<string> BarCodeSubmit { get; set; }
    }

}

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs

@@ -26,6 +26,7 @@
using WIDESEA_DTO.Outbound;
using WIDESEA_IAllocateService;
using WIDESEA_IBasicService;
using WIDESEA_IInboundService;
using WIDESEA_IOutboundService;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
@@ -53,6 +54,9 @@
        private readonly IInvokeMESService _invokeMESService;
        private readonly IDailySequenceService _dailySequenceService;
        private readonly IAllocateService _allocateService;
        private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;
        private readonly IInboundOrderDetailService _inboundOrderDetailService;


        private readonly ILogger<OutboundPickingService> _logger;

@@ -73,7 +77,7 @@
        public OutboundPickingService(IRepository<Dt_PickingRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IStockService stockService,
            IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, ILocationInfoService locationInfoService,
            IOutboundOrderDetailService outboundOrderDetailService, ISplitPackageService splitPackageService, IOutboundOrderService outboundOrderService,
            IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService) : base(BaseDal)
            IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_InboundOrder> inboundOrderRepository,IInboundOrderDetailService inboundOrderDetailService) : base(BaseDal)
        {
            _unitOfWorkManage = unitOfWorkManage;
            _stockInfoService = stockInfoService;
@@ -90,6 +94,8 @@
            _invokeMESService = invokeMESService;
            _dailySequenceService = dailySequenceService;
            _allocateService = allocateService;
            _inboundOrderRepository = inboundOrderRepository;
            _inboundOrderDetailService = inboundOrderDetailService;
        }


@@ -2395,9 +2401,212 @@
            return WebResponseContent.Instance.OK("拣选确认成功", new { SplitResults = new List<SplitResult>() });
        }



        #region è™šæ‹Ÿå‡ºå…¥åº“
        public WebResponseContent GetAvailablePurchaseOrders()
        {
            List<Dt_InboundOrder> InOders = _inboundOrderRepository.QueryData().Where(x => x.OrderStatus != InOrderStatusEnum.入库完成.ObjToInt()).ToList();
            List<string> InOderCodes = InOders.Select(x => x.UpperOrderNo).ToList();
            return WebResponseContent.Instance.OK("成功",data: InOderCodes);
        }

        public WebResponseContent GetAvailablePickingOrders()
        {
            List<Dt_OutboundOrder> outOders = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus != OutOrderStatusEnum.出库完成.ObjToInt()).ToList();

            List<string> outOderCodes = outOders.Select(x => x.UpperOrderNo).ToList();
            return WebResponseContent.Instance.OK("成功", data: outOderCodes);

        }
        public WebResponseContent BarcodeValidate(NoStockOutModel noStockOut)
        {
            try
            {
                Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == noStockOut.inOder && x.OrderStatus != InOrderStatusEnum.入库完成.ObjToInt()).Includes(x => x.Details).First();
                if(inboundOrder == null)
                {
                    return WebResponseContent.Instance.Error($"未找到采购单：{noStockOut.inOder}");
                }
                var matchedDetail = inboundOrder.Details.FirstOrDefault(detail => detail.Barcode == noStockOut.barCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

                if (matchedDetail == null)
                {
                    return WebResponseContent.Instance.Error($"在采购单 {noStockOut.inOder} ä¸­æœªæ‰¾åˆ°æ¡ç ä¸º {noStockOut.barCode} çš„明细。");
                }
                matchedDetail.NoStockOutQty = 0;

                Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == noStockOut.outOder && x.OrderStatus != OutOrderStatusEnum.出库完成.ObjToInt()).Includes(x => x.Details).First();
                if (outboundOrder == null)
                {
                    return WebResponseContent.Instance.Error($"未找到出库单：{noStockOut.inOder}");
                }
                var matchedCode = outboundOrder.Details.FirstOrDefault(detail => detail.MaterielCode == matchedDetail.MaterielCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

                if (matchedCode == null)
                {
                    return WebResponseContent.Instance.Error($"在出库单的物料编码中未找到与采购单中的{matchedDetail.MaterielCode} å¯¹åº”的物料。");
                }
                matchedCode.NoStockOutQty = 0;

                //剩余入库数量即虚拟出入库剩余可出数量
                decimal outQuantity = matchedDetail.OrderQuantity - matchedDetail.ReceiptQuantity;
                if(outQuantity == 0)
                {
                    return WebResponseContent.Instance.Error($"该采购单中的条码对应的可出数量为0");
                }
                if (matchedCode.OrderQuantity < outQuantity)
                {
                    return WebResponseContent.Instance.Error($"该采购单中的条码对应的可出数量超出出库单出库数量{matchedDetail.OrderQuantity - matchedCode.OrderQuantity},不满足整包出库");
                }
                //单据出库锁定数量
                matchedDetail.NoStockOutQty += outQuantity;
                matchedCode.NoStockOutQty += outQuantity;

                if ((matchedCode.LockQuantity + matchedCode.NoStockOutQty) > matchedCode.OrderQuantity)
                {
                   return WebResponseContent.Instance.Error($"出库单明细数量溢出{matchedCode.LockQuantity - matchedCode.OrderQuantity}");
                }
                matchedDetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
                matchedCode.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();

                _unitOfWorkManage.BeginTran();
                _inboundOrderDetailService.UpdateData(matchedDetail);
                _outboundOrderDetailService.UpdateData(matchedCode);
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch(Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }


        public WebResponseContent DeleteBarcode(NoStockOutModel noStockOut)
        {
            try
            {
                Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == noStockOut.inOder && x.OrderStatus != InOrderStatusEnum.入库完成.ObjToInt()).Includes(x => x.Details).First();
                if (inboundOrder == null)
                {
                    return WebResponseContent.Instance.Error($"未找到采购单：{noStockOut.inOder}");
                }
                var matchedDetail = inboundOrder.Details.FirstOrDefault(detail => detail.Barcode == noStockOut.barCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

                if (matchedDetail == null)
                {
                    return WebResponseContent.Instance.Error($"在采购单 {noStockOut.inOder} ä¸­æœªæ‰¾åˆ°æ¡ç ä¸º {noStockOut.barCode} çš„明细。");
                }
                matchedDetail.NoStockOutQty = 0;

                Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == noStockOut.outOder && x.OrderStatus != OutOrderStatusEnum.出库完成.ObjToInt()).Includes(x => x.Details).First();
                if (outboundOrder == null)
                {
                    return WebResponseContent.Instance.Error($"未找到出库单：{noStockOut.inOder}");
                }
                var matchedCode = outboundOrder.Details.FirstOrDefault(detail => detail.MaterielCode == matchedDetail.MaterielCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

                if (matchedCode == null)
                {
                    return WebResponseContent.Instance.Error($"在出库单的物料编码中未找到与采购单中的{matchedDetail.MaterielCode} å¯¹åº”的物料。");
                }
                matchedCode.NoStockOutQty = 0;
                _unitOfWorkManage.BeginTran();
                _inboundOrderDetailService.UpdateData(matchedDetail);
                _outboundOrderDetailService.UpdateData(matchedCode);
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();

            }
            catch(Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        public WebResponseContent NoStockOutSubmit(NoStockOutSubmit noStockOutSubmit)
        {
            try
            {
                Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == noStockOutSubmit.InOderSubmit && x.OrderStatus != InOrderStatusEnum.入库完成.ObjToInt()).Includes(x => x.Details).First();
                if (inboundOrder == null)
                {
                    return WebResponseContent.Instance.Error($"未找到采购单：{noStockOutSubmit.InOderSubmit}");
                }
                Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == noStockOutSubmit.OutOderSubmit && x.OrderStatus != OutOrderStatusEnum.出库完成.ObjToInt()).Includes(x => x.Details).First();
                if (outboundOrder == null)
                {
                    return WebResponseContent.Instance.Error($"未找到出库单：{noStockOutSubmit.OutOderSubmit}");
                }
                List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
                List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
                foreach (var BarCode in noStockOutSubmit.BarCodeSubmit)
                {
                   var inboundOrderDetail = inboundOrder.Details.FirstOrDefault(detail => detail.Barcode == BarCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

                    if(inboundOrderDetail == null)
                    {
                        return WebResponseContent.Instance.Error($"在采购单 {noStockOutSubmit.InOderSubmit} ä¸­æœªæ‰¾åˆ°æ¡ç ä¸º {BarCode} çš„明细。");
                    }
                    var outboundOrderDetail = outboundOrder.Details.FirstOrDefault(detail => detail.MaterielCode == inboundOrderDetail.MaterielCode && detail.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt());

                    if (outboundOrderDetail == null)
                    {
                        return WebResponseContent.Instance.Error($"在出库单的物料编码中未找到与采购单中的{inboundOrderDetail.MaterielCode} å¯¹åº”的物料。");
                    }
                    inboundOrderDetail.ReceiptQuantity += inboundOrderDetail.NoStockOutQty;
                    inboundOrderDetail.OverInQuantity = inboundOrderDetail.ReceiptQuantity;
                    inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                    inboundOrderDetails.Add(inboundOrderDetail);

                    outboundOrderDetail.LockQuantity += outboundOrderDetail.NoStockOutQty;
                    outboundOrderDetail.OverOutQuantity = outboundOrderDetail.LockQuantity;
                    if(outboundOrderDetail.OrderQuantity == outboundOrderDetail.OverOutQuantity)
                    {
                        outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                    }
                    outboundOrderDetails.Add(outboundOrderDetail);

                }
                //判断入库单据明细是否全部是完成状态
                bool inoderOver = inboundOrder.Details.Count() == inboundOrder.Details.Select(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
                if (inoderOver)
                {
                    inboundOrder.OrderStatus = InOrderStatusEnum.入库完成.ObjToInt();
                }
                //判断出库单据明细是否全部是完成状态
                bool outOderOver = outboundOrder.Details.Count() == outboundOrder.Details.Select(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
                if (outOderOver)
                {
                    outboundOrder.OrderStatus = OutOrderStatusEnum.出库完成.ObjToInt();
                }
                //数据处理
                _unitOfWorkManage.BeginTran();
                _inboundOrderDetailService.UpdateData(inboundOrderDetails);
                _outboundOrderDetailService.UpdateData(outboundOrderDetails);
                _inboundOrderRepository.UpdateData(inboundOrder);
                _outboundOrderService.UpdateData(outboundOrder);
                _unitOfWorkManage.CommitTran();

                return WebResponseContent.Instance.OK();
            }
            catch(Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        #endregion


        #endregion
    }

   

    #region æ”¯æŒç±»å®šä¹‰

    public class ValidationResult<T>

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/WIDESEA_OutboundService.csproj

@@ -10,6 +10,7 @@
    <ProjectReference Include="..\WIDESEA_BasicService\WIDESEA_BasicService.csproj" />
    <ProjectReference Include="..\WIDESEA_IAllocateService\WIDESEA_IAllocateService.csproj" />
    <ProjectReference Include="..\WIDESEA_IBasicService\WIDESEA_IBasicService.csproj" />
    <ProjectReference Include="..\WIDESEA_IInboundService\WIDESEA_IInboundService.csproj" />
    <ProjectReference Include="..\WIDESEA_IOutboundService\WIDESEA_IOutboundService.csproj" />
    <ProjectReference Include="..\WIDESEA_IRecordService\WIDESEA_IRecordService.csproj" />
    <ProjectReference Include="..\WIDESEA_IStockService\WIDESEA_IStockService.csproj" />

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs

@@ -1,4 +1,5 @@
using Autofac.Core;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core;
@@ -113,5 +114,35 @@
        {
            return await Service.CancelPicking(dto.OrderNo,dto.PalletCode,dto.Barcode);
        }

        [HttpPost,HttpGet, Route("GetAvailablePurchaseOrders"),AllowAnonymous]
        public WebResponseContent GetAvailablePurchaseOrders()
        {
            return  Service.GetAvailablePurchaseOrders();
        }

        [HttpPost, HttpGet, Route("GetAvailablePickingOrders"),AllowAnonymous]
        public WebResponseContent GetAvailablePickingOrders()
        {
            return Service.GetAvailablePickingOrders();
        }

        [HttpPost, HttpGet, Route("BarcodeValidate"), AllowAnonymous]
        public WebResponseContent BarcodeValidate([FromBody] NoStockOutModel noStockOut)
        {
            return Service.BarcodeValidate(noStockOut);
        }

        [HttpPost, HttpGet, Route("DeleteBarcode"), AllowAnonymous]
        public WebResponseContent DeleteBarcode([FromBody] NoStockOutModel noStockOut)
        {
            return Service.DeleteBarcode(noStockOut);
        }

        [HttpPost, HttpGet, Route("NoStockOutSubmit"), AllowAnonymous]
        public WebResponseContent NoStockOutSubmit([FromBody] NoStockOutSubmit noStockOutSubmit)
        {
            return Service.NoStockOutSubmit(noStockOutSubmit);
        }
    }
}