导体计算磅差逻辑变更

yyb

3 天以前 7375ea60fa4c8fee428e1eae9c0692f5b09ae281

 pages/wareHouse/nuclearScale/index.vue

@@ -130,7 +130,7 @@
            @click="cancelReport(item)"
          >
            <view class="content-header">
              <view class="content-header-title">{{ index + 1 }}</view>
              <view class="content-header-title">{{ ScanCodeRecord.length - index }}</view>
            </view>
            <view class="content-body">
              <view class="row-list">
@@ -170,7 +170,7 @@
                  <view class="_label-name">盘重：</view>
                </view>
                <view class="_content">
                  {{ item.trayWeight }}
                  {{ item.tareWeight }}
                </view>
              </view>
              <view class="row-list">
@@ -204,6 +204,7 @@
              </view>
              <view class="packing-registration-param-item-right">
                <u-input
                type="number"
                  class="item-one item-two"
                  v-model="modalList.verificationWeight"
                />
@@ -215,6 +216,7 @@
              </view>
              <view class="packing-registration-param-item-right">
                <u-input
                type="number"
                  class="item-one item-two"
                  v-model="modalList.forkliftWeight"
                />
@@ -228,6 +230,7 @@
      type="primary"
      class="bottom-button"
      @click="submit"
      :disabled="ScanCodeRecord.length == 0"
      v-show="form.productType != 'TG01'"
      >提交</u-button
    >
@@ -257,9 +260,9 @@
      modalList: {},
      showModal: false,
      productTypeMap: {
        1: "导体",
        2: "铜杆",
        3: "导体2.6",
        DTO1: "导体",
        TG01: "铜杆",
        DT02: "导体2.6",
      },
      ScanCodeRecord: [],
      background: {
@@ -301,15 +304,22 @@
      console.log("页面扫码结果：", data.code);
      if (data.code) {
        let codeInfo = JSON.parse(data.code);
        // try {
        // } catch (e) {
        //    uni.showToast({
        //       icon: "none",
        //       title: "扫码数据解析失败，请重试！",
        //       duration: 2 * 1000,
        //    });
        //    return;
        // }

        // 添加重复扫码检查
        const batchNo = codeInfo.BN;
        const isDuplicate = that.ScanCodeRecord.some(
          (item) => item.outBatchNo === batchNo
        );

        if (isDuplicate) {
          uni.showToast({
            icon: "none",
            title: "请勿重复扫码！",
            duration: 2 * 1000,
          });
          return;
        }

        let ScanCodeRecordList = {
          outBatchNo: codeInfo.BN,
          netWeight: codeInfo.NW,
@@ -322,26 +332,45 @@
          waivDevRejNo: codeInfo.WDR ? codeInfo.WDR : "*", // wdr号
          productType: that.form.productType,
        };
        if (codeInfo.CN != that.form.customerName1) {
          // 扫描报工单二维码
          uni.showModal({
            title: "提示",
            content:
              "客户不一致：" + codeInfo.CN + "||" + that.form.customerName1,
            showCancel: true,
            success: function () {
              if (that.form.productType == "TG01") {
                that.$refs.saveForm.open(ScanCodeRecordList);
              } else {
                that.ScanCodeRecord.push(ScanCodeRecordList);
              }
            },
          });
        if (codeInfo.CN != "") {
          if (codeInfo.CN != that.form.customerName1) {
            // 扫描报工单二维码
            uni.showModal({
              title: "提示",
              content:
                "客户不一致：" + codeInfo.CN + "||" + that.form.customerName1,
              showCancel: true,
              success: function (res) {
                const isDuplicate = that.ScanCodeRecord.some(
                  (item) => item.outBatchNo === codeInfo.BN
                );
                if (!isDuplicate) {
                  if (that.form.productType == "TG01") {
                    that.$refs.saveForm.open(ScanCodeRecordList);
                  } else {
                    that.ScanCodeRecord.unshift(ScanCodeRecordList);
                  }
                } else {
                  uni.showToast({
                    icon: "none",
                    title: "请勿重复扫码！",
                    duration: 2 * 1000,
                  });
                }
              },
            });
          } else {
            if (that.form.productType == "TG01") {
              that.$refs.saveForm.open(ScanCodeRecordList);
            } else {
              that.ScanCodeRecord.unshift(ScanCodeRecordList);
            }
          }
        } else {
          if (that.form.productType == "TG01") {
            that.$refs.saveForm.open(ScanCodeRecordList);
          } else {
            that.ScanCodeRecord.push(ScanCodeRecordList);
            that.ScanCodeRecord.unshift(ScanCodeRecordList);
          }
        }
      }
@@ -384,11 +413,10 @@
      this.form.forkliftWeight = this.modalList.forkliftWeight;
      switch (this.form.productType) {
        case "DT01":
          if (magnetic >= 0 && magnetic <= 3) {
          if (magnetic >= -3 && magnetic <= 3) {
            this.allSubmit();
            // this.ScanCodeRecord.push(this.form);
          } else {
            this.$u.toast("生产核查");
            this.$u.toast("磅差:" + magnetic + "，请车间核查");
          }
          break;
        case "DT02":
@@ -396,7 +424,7 @@
            // this.ScanCodeRecord.push(this.form);
            this.allSubmit();
          } else {
            this.$u.toast("生产核查");
            this.$u.toast("磅差:" + magnetic + "，请车间核查");
          }
          break;
      }
@@ -416,10 +444,21 @@
      this.$u.api.NuclearScaleEntry.createDetail(this.form)
        .then((res) => {
          this.$u.toast("提交成功");
          this.ScanCodeRecord = [];
          // if (this.form.productTypeMap == "DT01") {
            this.modalList = {
              verificationWeight: "",
            // };
          }
        })
        .catch(() => {
        .catch((err) => {
          uni.hideLoading();
          this.$u.toast("网络异常，请重试");
          uni.showModal({
            title: "提示",
            content: err.message || "网络异常，请重试",
            showCancel: true,
            success: function (res) {},
          });
        });
    },

@@ -441,7 +480,7 @@
      this.$u.api.NuclearScaleEntry.createDetail(this.form)
        .then((res) => {
          this.$u.toast("提交成功");
          this.ScanCodeRecord.push(Obj);
          this.ScanCodeRecord.unshift(Obj);
          this.$refs.saveForm.cancel();
        })
        .catch(() => {
@@ -472,7 +511,7 @@
    },
    //核磅记录
    openNuclearScaleRecord() {
      if (this.form.verificationNo == "") {
      if (!this.form.verificationNo) {
        uni.showToast({
          icon: "none",
          title: "请先选择核磅单号！",
@@ -481,7 +520,9 @@
        return;
      }
      uni.navigateTo({
        url: "/pages/wareHouse/nuclearScale/nuclearscalerecord",
        url:
          "/pages/wareHouse/nuclearScale/nuclearscalerecord?verificationNo=" +
          encodeURIComponent(JSON.stringify(this.form.verificationNo)),
      });
    },
    // 存订单号