fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新

liding

6 天以前 df084ef7fc2f3b1a00790ed55616188b280f9594

 src/views/inventoryManagement/stockManagement/Subtract.vue

@@ -30,19 +30,115 @@
          <el-input v-model="formState.model"  disabled />
        </el-form-item>

        <!-- 非原材料显示数量字段 -->
        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-input v-model="formState.unit"  disabled />
        </el-form-item>

        <el-form-item
            v-if="props.record.productType !== 0"
            label="数量"
            prop="qualitity"
            :rules="[
              { required: true, message: '请输入数量', trigger: ['blur', 'change'] }
            ]"
        >
          <el-input-number v-model="formState.qualitity" :step="1" :min="1" :max="maxQuality" style="width: 100%" />
          <el-input-number
              v-model="formState.qualitity"
              :min="0"
              :step="1"
              :precision="0"
              style="width: 100%"
              controls-position="right"
              placeholder="请输入数量"
          />
        </el-form-item>

        <!-- 原材料显示过磅相关字段 -->
        <template v-if="props.record.productType === 0">
          <el-form-item
              label="车牌号"
              prop="licensePlateNo"
              :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]"
          >
            <el-input v-model="formState.licensePlateNo" />
          </el-form-item>
          <el-form-item
              label="单位"
              prop="unit"
          >
            <el-select
                v-model="formState.unit"
                placeholder="请选择单位"
                style="width: 100%"
                clearable
            >
              <el-option label="吨" value="吨" />
              <el-option label="公斤" value="公斤" />
            </el-select>
          </el-form-item>
          <el-form-item
              label="毛重"
              prop="grossWeight"
              :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
          >
            <el-input-number
                v-model="formState.grossWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                @change="computeNetWeight"
            />
          </el-form-item>

          <el-form-item
              label="皮重"
              prop="tareWeight"
              :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
          >
            <el-input-number
                v-model="formState.tareWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                @change="computeNetWeight"
            />
          </el-form-item>

          <el-form-item
              label="净重"
              prop="netWeight"
              :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
          >
            <el-input-number
                v-model="formState.netWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                disabled
            />
          </el-form-item>

          <el-form-item
              label="过磅日期"
              prop="weighingDate"
              :rules="[{ required: true, message: '请选择过磅日期', trigger: 'change' }]"
          >
            <el-date-picker
                style="width: 100%"
                v-model="formState.weighingDate"
                value-format="YYYY-MM-DD HH:mm:ss"
                format="YYYY-MM-DD HH:mm:ss"
                type="datetime"
                placeholder="请选择过磅日期"
                clearable
            />
          </el-form-item>

          <el-form-item
              label="过磅员"
              prop="weighingOperator"
              :rules="[{ required: true, message: '请输入过磅员', trigger: ['blur','change'] }]"
          >
            <el-input v-model="formState.weighingOperator" />
          </el-form-item>
        </template>

        <el-form-item label="备注" prop="remark">
          <el-input v-model="formState.remark" type="textarea" />
@@ -66,7 +162,7 @@
</template>

<script setup>
import {ref, computed, getCurrentInstance} from "vue";
import {ref, computed, getCurrentInstance, onMounted} from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import {subtractStockInventory} from "@/api/inventoryManagement/stockInventory.js";
import {subtractStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";
@@ -93,15 +189,22 @@
  initFormData()
})

const maxQuality = computed(() => {
  return props.record.unLockedQuantity ? props.record.unLockedQuantity :  0;
const isRawMaterial = computed(() => {
  return props.record.parentName === '原材料';
})

const ledgerNetWeight = computed(() => {
  const n = Number(props.record?.netWeight ?? 0);
  return Number.isFinite(n) ? n : 0;
});

const initFormData = () => {
  if (props.record) {
    formState.value = {
      ...props.record,
    }
    // 初始化时也触发一次净重计算，避免接口回填后净重为空
    computeNetWeight()
  }
}

@@ -112,7 +215,13 @@
  productName: "",
  model: "",
  unit: "",
  qualitity: 0,
  // 过磅相关字段
  licensePlateNo: "",
  grossWeight: undefined,
  tareWeight: undefined,
  netWeight: undefined,
  weighingDate: undefined,
  weighingOperator: "",
  remark: '',
});

@@ -135,10 +244,42 @@
    productId: undefined,
    productModelId: undefined,
    productName: "",
    productModelName: "",
    description: '',
    model: "",
    unit: "",
    licensePlateNo: "",
    grossWeight: undefined,
    tareWeight: undefined,
    netWeight: undefined,
    weighingDate: undefined,
    weighingOperator: "",
    remark: '',
  };
  isShow.value = false;
};

// 净重 = 毛重 - 皮重
const computeNetWeight = () => {
  const { grossWeight, tareWeight } = formState.value;
  if (grossWeight != null && tareWeight != null) {
    const net = Number(grossWeight) - Number(tareWeight);
    const safeNet = Number(net.toFixed(2));
    const computedNet = safeNet > 0 ? safeNet : 0;
    const maxNet = ledgerNetWeight.value;
    if (Number.isFinite(maxNet) && maxNet > 0 && computedNet > maxNet) {
      const cappedNet = Number(maxNet.toFixed(2));
      formState.value.netWeight = cappedNet;
      // 同步毛重，保持：净重 = 毛重 - 皮重
      const tare = Number(tareWeight);
      if (Number.isFinite(tare)) {
        formState.value.grossWeight = Number((tare + cappedNet).toFixed(2));
      }
      proxy?.$modal?.msgWarning?.(`领用净重不能超过台账净重（${maxNet.toFixed(2)} 吨）`);
      return;
    }
    formState.value.netWeight = computedNet;
  } else {
    formState.value.netWeight = undefined;
  }
};

// 产品选择处理
@@ -169,6 +310,12 @@
        proxy.$modal.msgError("请选择规格");
        return;
      }
      const maxNet = ledgerNetWeight.value;
      const usedNet = Number(formState.value.netWeight ?? 0);
      if (Number.isFinite(maxNet) && maxNet > 0 && Number.isFinite(usedNet) && usedNet > maxNet) {
        proxy.$modal.msgError(`领用净重不能超过台账净重（${maxNet.toFixed(2)} 吨）`);
        return;
      }
      if (props.type === 'qualified') {
        subtractStockInventory(formState.value).then(res => {
          // 关闭模态框