perf: 1.优化储丝柜单柜卷包产量计算方式，支持未出料结束计算统计 2.新增储丝柜单柜卷包产量桑基图

zhuguifei

2026-03-12 c425a8afba0a76eb62d5650cc9c98c42d8339f06

 ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue

@@ -1,5 +1,5 @@
<script setup lang="ts">
import { toRaw } from 'vue';
import { onMounted, ref, toRaw, watch } from 'vue';
import { jsonClone } from '@sa/utils';
import { useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales';
@@ -24,15 +24,88 @@
  Object.assign(model.value, defaultModel);
}

function getDefaultRange(): [string, string] {
  const now = new Date();
  const threeDaysAgo = new Date(now.getTime() - 3 * 24 * 60 * 60 * 1000);
  const todayStart = `${threeDaysAgo.getFullYear()}-${String(threeDaysAgo.getMonth() + 1).padStart(2, '0')}-${String(threeDaysAgo.getDate()).padStart(2, '0')} 00:00:00`;
  const todayEnd = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} 23:59:59`;
  return [todayStart, todayEnd];
}

const dateRange = ref<[string, string] | null>(null);

function onDateRangeUpdate(value: [string, string] | null) {
  if (!model.value.params) {
    model.value.params = {};
  }

  const beginTime = value?.[0] ? String(value[0]).trim() : '';
  const endTime = value?.[1] ? String(value[1]).trim() : '';

  if (beginTime && endTime) {
    model.value.params.beginTime = beginTime;
    model.value.params.endTime = endTime;
  } else {
    delete model.value.params.beginTime;
    delete model.value.params.endTime;
  }
}

function setDefaultRange() {
  const range = getDefaultRange();
  dateRange.value = range;
  onDateRangeUpdate(range);
}

onMounted(() => {
  if (!model.value.params) {
    model.value.params = {};
  }

  const beginTime = model.value.params.beginTime ? String(model.value.params.beginTime).trim() : '';
  const endTime = model.value.params.endTime ? String(model.value.params.endTime).trim() : '';

  if (beginTime && endTime) {
    dateRange.value = [beginTime, endTime];
  } else {
    setDefaultRange();
  }
});

async function reset() {
  await restoreValidation();
  resetModel();
  setDefaultRange();
  emit('search');
}

async function search() {
  await validate();
  emit('search');
}

const siloOptions = Array.from({ length: 12 }, (_, i) => ({
  label: `${i + 1}号储丝柜`,
  value: String(i + 1)
}));

const selectedSilos = ref<string[]>([]);

watch(
  () => model.value.siloid,
  val => {
    if (val) {
      selectedSilos.value = (val as string).split(',');
    } else {
      selectedSilos.value = [];
    }
  },
  { immediate: true }
);

function handleSiloChange(val: string[]) {
  selectedSilos.value = val;
  model.value.siloid = val.join(',');
}
</script>

@@ -42,38 +115,65 @@
      <NCollapseItem :title="$t('common.search')" name="analy-store-silk-search">
        <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
          <NGrid responsive="screen" item-responsive>
            <NFormItemGi span="24 s:12 m:6" label="牌号" label-width="auto" path="materialname" class="pr-24px">
              <NInput v-model:value="model.materialname" placeholder="请输入牌号" />
            <NFormItemGi
              span="24 s:12 m:8 l:8 xl:8"
              label="牌号"
              label-width="auto"
              path="materialname"
              class="pr-24px"
            >
              <NInput v-model:value="model.materialname" clearable placeholder="请输入牌号" />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:6" label="批次号" label-width="auto" path="batchcode" class="pr-24px">
              <NInput v-model:value="model.batchcode" placeholder="请输入批次号" />
            <NFormItemGi span="24 s:12 m:8 l:8 xl:8" label="批次号" label-width="auto" path="batchcode" class="pr-24px">
              <NInput v-model:value="model.batchcode" clearable placeholder="请输入批次号" />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:6" label="投料日期" label-width="auto" path="actualstarttime" class="pr-24px">
            <NFormItemGi
              span="24 s:12 m:8 l:8 xl:8"
              label="投料日期"
              label-width="auto"
              path="actualstarttime"
              class="pr-24px"
            >
              <NDatePicker
                v-model:formatted-value="model.actualstarttime"
                type="datetime"
                value-format="yyyy-MM-dd HH:mm:ss"
                type="date"
                value-format="yyyy-MM-dd"
                clearable
                class="w-full"
              />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:6" label="储丝柜出料开始时间" label-width="auto" path="distimebegin" class="pr-24px">
            <NFormItemGi
              span="24 s:12 m:8 l:8 xl:8"
              label="出料结束时间"
              label-width="auto"
              path="params.beginTime"
              class="pr-24px"
            >
              <NDatePicker
                v-model:formatted-value="model.distimebegin"
                type="datetime"
                v-model:formatted-value="dateRange"
                type="datetimerange"
                :default-time="['00:00:00', '23:59:59']"
                value-format="yyyy-MM-dd HH:mm:ss"
                clearable
                class="w-full"
                @update:formatted-value="onDateRangeUpdate"
              />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:6" label="储丝柜出料结束时间" label-width="auto" path="distimeend" class="pr-24px">
              <NDatePicker
                v-model:formatted-value="model.distimeend"
                type="datetime"
                value-format="yyyy-MM-dd HH:mm:ss"
            <NFormItemGi
              span="24 s:12 m:8 l:8 xl:8"
              label="柜子号(末位)"
              label-width="auto"
              path="siloid"
              class="pr-24px"
            >
              <NSelect
                v-model:value="selectedSilos"
                multiple
                clearable
                :options="siloOptions"
                placeholder="请选择柜子号"
                @update:value="handleSiloChange"
              />
            </NFormItemGi>
            <NFormItemGi span="24 s:12 m:6" label="柜子号(末位)" label-width="auto" path="siloid" class="pr-24px">
              <NInput v-model:value="model.siloid" placeholder="请输入柜子号(末位)" />
            </NFormItemGi>
            <NFormItemGi :show-feedback="false" span="24" class="pr-24px">
              <NSpace class="w-full" justify="end">