feat: 烟丝单柜产耗统计

zhuguifei

2026-03-06 b12c9e77a6b6a7b410ac421c5a3d68da88823460

 ruoyi-plus-soybean/src/views/qm/batch/modules/batch-operate-drawer.vue

@@ -67,63 +67,60 @@

function createDefaultModel(): Model {
  return {
      id: '',
      batchCode: '',
      batchName: '',
      typ: '',
      eqpCode: '',
      matCode: '',
      judgeCode: '',
      batchDate: null,
      isflag: '',
      enabled: '',
      totalNum: null,
      results: '',
      approver: '',
      auditor: '',
      creater: '',
      tabDate: null,
      verName: '',
      verCode: '',
      archDate: '',
      flag: '',
      toMesDate: null,
      fromMesDate: null,
      deleted: null,
      batchDes: '',
      category: '',
      makeno: '',
      shifteqpno: '',
      boxno: '',
      pid: '',
      reviewer: '',
      rvcount: null,
      state: '',
      reviewTime: null,
      auditTime: null,
      spec: '',
      approveTime: null,
      unit: '',
      arrivalTime: null,
      storagePlace: '',
      checker: '',
      receiveTime: null,
      inspTime: null,
      storer: '',
      isverify: '',
      ischk: '',
      bak1: '',
      bak2: ''
    id: '',
    batchCode: '',
    batchName: '',
    typ: '',
    eqpCode: '',
    matCode: '',
    judgeCode: '',
    batchDate: null,
    isflag: '',
    enabled: '',
    totalNum: null,
    results: '',
    approver: '',
    auditor: '',
    creater: '',
    tabDate: null,
    verName: '',
    verCode: '',
    archDate: '',
    flag: '',
    toMesDate: null,
    fromMesDate: null,
    deleted: null,
    batchDes: '',
    category: '',
    makeno: '',
    shifteqpno: '',
    boxno: '',
    pid: '',
    reviewer: '',
    rvcount: null,
    state: '',
    reviewTime: null,
    auditTime: null,
    spec: '',
    approveTime: null,
    unit: '',
    arrivalTime: null,
    storagePlace: '',
    checker: '',
    receiveTime: null,
    inspTime: null,
    storer: '',
    isverify: '',
    ischk: '',
    bak1: '',
    bak2: ''
  };
}

type RuleKey = Extract<
  keyof Model,
  | 'id'
>;
type RuleKey = Extract<keyof Model, 'id'>;

const rules: Record<RuleKey, App.Global.FormRule> = {
  id: createRequiredRule('编码不能为空'),
  id: createRequiredRule('编码不能为空')
};

function handleUpdateModelWhenEdit() {
@@ -141,16 +138,159 @@
async function handleSubmit() {
  await validate();

  const { id, batchCode, batchName, typ, eqpCode, matCode, judgeCode, batchDate, isflag, enabled, totalNum, results, approver, auditor, creater, tabDate, verName, verCode, archDate, flag, toMesDate, fromMesDate, deleted, batchDes, category, makeno, shifteqpno, boxno, pid, reviewer, rvcount, state, reviewTime, auditTime, spec, approveTime, unit, arrivalTime, storagePlace, checker, receiveTime, inspTime, storer, isverify, ischk, bak1, bak2 } = model.value;
  const {
    id,
    batchCode,
    batchName,
    typ,
    eqpCode,
    matCode,
    judgeCode,
    batchDate,
    isflag,
    enabled,
    totalNum,
    results,
    approver,
    auditor,
    creater,
    tabDate,
    verName,
    verCode,
    archDate,
    flag,
    toMesDate,
    fromMesDate,
    deleted,
    batchDes,
    category,
    makeno,
    shifteqpno,
    boxno,
    pid,
    reviewer,
    rvcount,
    state,
    reviewTime,
    auditTime,
    spec,
    approveTime,
    unit,
    arrivalTime,
    storagePlace,
    checker,
    receiveTime,
    inspTime,
    storer,
    isverify,
    ischk,
    bak1,
    bak2
  } = model.value;

  // request
  if (props.operateType === 'add') {
    const { error } = await fetchCreateBatch({ batchCode, batchName, typ, eqpCode, matCode, judgeCode, batchDate, isflag, enabled, totalNum, results, approver, auditor, creater, tabDate, verName, verCode, archDate, flag, toMesDate, fromMesDate, deleted, batchDes, category, makeno, shifteqpno, boxno, pid, reviewer, rvcount, state, reviewTime, auditTime, spec, approveTime, unit, arrivalTime, storagePlace, checker, receiveTime, inspTime, storer, isverify, ischk, bak1, bak2 });
    const { error } = await fetchCreateBatch({
      batchCode,
      batchName,
      typ,
      eqpCode,
      matCode,
      judgeCode,
      batchDate,
      isflag,
      enabled,
      totalNum,
      results,
      approver,
      auditor,
      creater,
      tabDate,
      verName,
      verCode,
      archDate,
      flag,
      toMesDate,
      fromMesDate,
      deleted,
      batchDes,
      category,
      makeno,
      shifteqpno,
      boxno,
      pid,
      reviewer,
      rvcount,
      state,
      reviewTime,
      auditTime,
      spec,
      approveTime,
      unit,
      arrivalTime,
      storagePlace,
      checker,
      receiveTime,
      inspTime,
      storer,
      isverify,
      ischk,
      bak1,
      bak2
    });
    if (error) return;
  }

  if (props.operateType === 'edit') {
    const { error } = await fetchUpdateBatch({ id, batchCode, batchName, typ, eqpCode, matCode, judgeCode, batchDate, isflag, enabled, totalNum, results, approver, auditor, creater, tabDate, verName, verCode, archDate, flag, toMesDate, fromMesDate, deleted, batchDes, category, makeno, shifteqpno, boxno, pid, reviewer, rvcount, state, reviewTime, auditTime, spec, approveTime, unit, arrivalTime, storagePlace, checker, receiveTime, inspTime, storer, isverify, ischk, bak1, bak2 });
    const { error } = await fetchUpdateBatch({
      id,
      batchCode,
      batchName,
      typ,
      eqpCode,
      matCode,
      judgeCode,
      batchDate,
      isflag,
      enabled,
      totalNum,
      results,
      approver,
      auditor,
      creater,
      tabDate,
      verName,
      verCode,
      archDate,
      flag,
      toMesDate,
      fromMesDate,
      deleted,
      batchDes,
      category,
      makeno,
      shifteqpno,
      boxno,
      pid,
      reviewer,
      rvcount,
      state,
      reviewTime,
      auditTime,
      spec,
      approveTime,
      unit,
      arrivalTime,
      storagePlace,
      checker,
      receiveTime,
      inspTime,
      storer,
      isverify,
      ischk,
      bak1,
      bak2
    });
    if (error) return;
  }

@@ -204,7 +344,7 @@
          <NInput v-model:value="model.enabled" placeholder="请输入启用标志" />
        </NFormItem>
        <NFormItem label="到货总量" path="totalNum">
          <NInput v-model:value="model.totalNum" placeholder="请输入到货总量" />
          <NInputNumber v-model:value="model.totalNum" placeholder="请输入到货总量" class="w-full" />
        </NFormItem>
        <NFormItem label="综合判定" path="results">
          <NInput v-model:value="model.results" placeholder="请输入综合判定" />
@@ -255,7 +395,7 @@
          />
        </NFormItem>
        <NFormItem label="删除标志" path="deleted">
          <NInput v-model:value="model.deleted" placeholder="请输入删除标志" />
          <NInputNumber v-model:value="model.deleted" placeholder="请输入删除标志" class="w-full" />
        </NFormItem>
        <NFormItem label="批次描述" path="batchDes">
          <NInput v-model:value="model.batchDes" placeholder="请输入批次描述" />
@@ -273,13 +413,13 @@
          <NInput v-model:value="model.boxno" placeholder="请输入装箱号" />
        </NFormItem>
        <NFormItem label="父批次号" path="pid">
          <NInput v-model:value="model.pid" placeholder="请输入父批次号" />
          <NInput v-model:value="model.pid as any" placeholder="请输入父批次号" />
        </NFormItem>
        <NFormItem label="复核人" path="reviewer">
          <NInput v-model:value="model.reviewer" placeholder="请输入复核人" />
        </NFormItem>
        <NFormItem label="复检次数" path="rvcount">
          <NInput v-model:value="model.rvcount" placeholder="请输入复检次数" />
          <NInputNumber v-model:value="model.rvcount" placeholder="请输入复检次数" class="w-full" />
        </NFormItem>
        <NFormItem label="批次状态" path="state">
          <NInput v-model:value="model.state" placeholder="请输入批次状态" />