1

647556386

2026-01-09 da2d7be1a34015d921ead5d74b69c55bb422f50a

1

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue

@@ -165,7 +165,7 @@
              @keydown.enter="handleStockTakeComplete"
              :disabled="!formData.stockQuantity || loading"
              class="custom-input"
              :class="{ 'has-value': formData.actualQuantity }"
              :class="{ 'has-value': formData.actualQuantity !== '' }"
            ></el-input>
          </el-form-item>
        </el-form>
@@ -185,13 +185,7 @@
            type="primary"
            size="small"
            @click="handleStockTakeComplete"
            :disabled="
              loading ||
              !formData.boxNo.trim() ||
              !formData.barcode.trim() ||
              !formData.stockQuantity ||
              !formData.actualQuantity
            "
            :disabled="isFormCompleteDisabled"
            class="complete-btn"
          >
            <Check /> ç›˜ç‚¹å®Œæˆ
@@ -251,6 +245,20 @@
// æ£€æµ‹æ˜¯å¦ä¸ºç§»åŠ¨ç«¯
const isMobile = computed(() => {
  return window.innerWidth < 768;
});

// è®¡ç®—属性：盘点完成按钮是否禁用
const isFormCompleteDisabled = computed(() => {
  return (
    loading.value ||
    !formData.boxNo.trim() ||
    !formData.barcode.trim() ||
    !formData.stockQuantity ||
    formData.actualQuantity === "" ||
    formData.actualQuantity === null ||
    formData.actualQuantity === undefined ||
    Number(formData.actualQuantity) < 0 // å°äºŽ0时禁用，0是允许的
  );
});

// ç»„件挂载时聚焦到料箱号输入框
@@ -334,7 +342,7 @@
  }
};

// å®žé™…盘点数量验证：仅验证数值不小于0
// å®žé™…盘点数量验证：允许0，但不允许小于0
const validateActualQuantity = (rule, value, callback) => {
  // ç©ºå€¼ç”±required规则处理，这里只验证数值合法性
  if (value === null || value === undefined || value === "") {
@@ -344,7 +352,7 @@
  else if (value < 0) {
    callback(new Error("实际盘点数量不能小于0"));
  } 
  // éªŒè¯é€šè¿‡
  // éªŒè¯é€šè¿‡ï¼ˆå…è®¸0）
  else {
    callback();
  }
@@ -474,6 +482,12 @@
  const valid = await formRef.value.validate();
  if (!valid) return;

  // é¢å¤–检查实际盘点数量是否小于0
  if (formData.actualQuantity < 0) {
    ElMessage.error("实际盘点数量不能小于0");
    return;
  }

  const { boxNo, barcode, actualQuantity, stockQuantity } = formData;
  const receiptNo = orderNo.value;


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

@@ -78,7 +78,7 @@
                    {
                        Dt_AllocateOrderDetail orderDetail = new Dt_AllocateOrderDetail
                        {
                            WarehouseCode = detailDto.WarehouseCode,
                            WarehouseCode = model.toWarehouse,
                            MaterielCode = detailDto.MaterialCode,
                            MaterielName = materialName,
                            LineNo = detailDto.LineNo,
@@ -99,7 +99,7 @@
                {
                    Dt_AllocateOrderDetail orderDetail = new Dt_AllocateOrderDetail
                    {
                        WarehouseCode = detailDto.WarehouseCode,
                        WarehouseCode = model.toWarehouse,
                        MaterielCode = detailDto.MaterialCode,
                        LineNo = detailDto.LineNo,
                        OrderQuantity = detailDto.Qty,