63e5a1095c2a976551f8241d6045b0612bcb5441..330623e0e45837c51067cec6dfc973648723b230
9 天以前 yyb
计算核磅重量总和的取值逻辑更改
330623 对比 | 目录
9 天以前 yyb
更改装备发货的逻辑
074014 对比 | 目录
已修改3个文件
28 ■■■■ 文件已修改
pages/wareHouse/inventory/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/wareHouse/nuclearScale/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/wareHouse/nuclearScale/nuclearscalerecord.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/wareHouse/inventory/index.vue
@@ -358,9 +358,10 @@
    },
    scanHandle(val) {
      this.submitList = {};
      const isZhuangBei = val.hasOwnProperty("part_no");
      const { PN, BN, NW } = val;
      this.$u.api.shiftingParking
        .selPartInfoPDA({ outBatchNo: BN })
        .selPartInfoPDA({ outBatchNo: isZhuangBei ? val.sn_no : BN })
        .then((res) => {
          console.log("res", res);
          this.submitList = res.data;
@@ -436,13 +437,14 @@
        this.$u.toast("请选择盘点报告号");
        return;
      }
      const isZhuangBei = this.getDifferentFields.hasOwnProperty("part_no");
      const diff = this.getDifferentFields(
        this.registerInfo,
        this.scanHandleList,
        {
          partNo: { fixed: this.scanHandleList.PN },
          partNo: { fixed: isZhuangBei ? this.scanHandleList.part_no : this.scanHandleList.PN },
          // qtyAvailable: { fixed: Number(this.scanHandleList.NW) },
          ifsBatchNo: { fixed: this.scanHandleList.BN },
          ifsBatchNo: { fixed: isZhuangBei ? this.scanHandleList.sn_no : this.scanHandleList.BN },
        }
      );
      console.log("差异字段:", diff);
pages/wareHouse/nuclearScale/index.vue
@@ -337,14 +337,14 @@
          });
          return;
        }
        const isZhuangBei = codeInfo.hasOwnProperty("part_no");
        let ScanCodeRecordList = {
          outBatchNo: codeInfo.BN,
          netWeight: codeInfo.NW,
          outBatchNo: isZhuangBei ? codeInfo.sn_no : codeInfo.BN,
          netWeight: isZhuangBei ? codeInfo.qty_arrived : codeInfo.NW,
          tareWeight: codeInfo.TR, // 皮重
          partNo: codeInfo.PN,
          partNo: isZhuangBei ? codeInfo.part_no : codeInfo.PN,
          grossWeight: codeInfo.TW,
          partName: codeInfo.ST,
          partName: isZhuangBei ? codeInfo.part_name : codeInfo.ST,
          originalLength: codeInfo.LN, // 长度
          palletNo: codeInfo.PNO, // 盘号
          waivDevRejNo: codeInfo.WDR ? codeInfo.WDR : "*", // wdr号
pages/wareHouse/nuclearScale/nuclearscalerecord.vue
@@ -245,16 +245,16 @@
  computed: {
    // 计算核磅重量总和
totalVerificationWeight() {
  const processedBatches = new Set(); // 用于记录已经处理过的batchNo
  const processedBatches = new Set(); // 用于记录已经处理过的forkliftPalletBatch
  
  return this.list.reduce((sum, item) => {
    // 如果这个batchNo已经处理过,直接返回当前总和(跳过)
    if (processedBatches.has(item.batchNo)) {
    // 如果这个forkliftPalletBatch已经处理过,直接返回当前总和(跳过)
    if (processedBatches.has(item.forkliftPalletBatch)) {
      return sum;
    }
    
    // 标记这个batchNo为已处理
    processedBatches.add(item.batchNo);
    // 标记这个forkliftPalletBatch为已处理
    processedBatches.add(item.forkliftPalletBatch);
    
    // 计算权重并累加
    const weight = parseFloat(item.verificationWeight) || 0;