南骏 池
2025-09-21 4c1f4d48607b10b3c42b1577a9f384ca8ff38e4c
1.委外退料优化
2.委外出库-pda
已修改3个文件
91 ■■■■■ 文件已修改
H5/Js/Wwck.js 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Wwck.aspx 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Wwtl.aspx 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Wwck.js
@@ -23,6 +23,7 @@
            selItem: {},
            ItemBarKw: [],//当天行相关条码库位信息
            DaaInfo: {},
            billno:"",
        }
    },
    mounted() {
@@ -91,8 +92,8 @@
        getModel() {
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'WwGd/GetItemsByDaa001', {
                daa001: that.modeInfo.daa001,
            that.AxiosHttp("post", 'WwGd/GetItemsByWwckNo', {
                daa001: that.billno,
                userName: that.userInfo.loginAccount
            }, false)
                .then(function (res) {
@@ -102,7 +103,11 @@
                        that.DaaInfo = json.data.tbBillList.daaInfo;
                        that.modeInfo.planNo = json.data.tbBillList.planNo;
                        that.modeInfo.startTime = json.data.tbBillList.startTime;
                        that.modeInfo.daa001 = json.data.tbBillList.allList[0].daA001;
                        that.$refs.barcode.focus();
                        // 重置所有行的选中状态
                        that.currentIndex = -1;
                        that.ItemBarKw = [];
                    }
                    else {
                        that.$toast.fail(json.message);
@@ -131,10 +136,12 @@
                return;
            }
            that.isLoading = true;
            that.AxiosHttp("post", 'WwGd/ScanCode', {
            that.AxiosHttp("post", 'WwGd/WwckScanCode', {
                daa001: that.modeInfo.daa001,
                userName: that.userInfo.loginAccount,
                barcode: that.scanInfo.barcode,
                blNo: that.billno,
                type: '委外领料',
            }, false)
                .then(function (res) {
                    var json = res;
@@ -180,11 +187,13 @@
                return;
            }
            that.isLoading = true;
            that.AxiosHttp("post", 'WwGd/ScanCodeCF', {
            that.AxiosHttp("post", 'WwGd/WwckScanCodeCF', {
                daa001: that.modeInfo.daa001,
                userName: that.userInfo.loginAccount,
                barcode: that.scanInfo.barcode,
                Num: that.scanInfo.splitNum,
                blNo: that.billno,
                type: '委外领料',
            }, false)
                .then(function (res) {
                    var json = res;
@@ -255,17 +264,8 @@
            // 可以通过 close-on-click-action 属性开启自动收起
            this.show = false;
            console.log(item);
            // 正则匹配第一个方括号内容
            const regex = /\[([^\]]+)\]/;
            const matchResult = item.name.match(regex);
            if (matchResult && matchResult[1]) {
                this.modeInfo.daa001 = matchResult[1]; // PPBOM00000088-1
                console.log('提取的DAA001:', this.modeInfo.daa001);
            } else {
                this.$toast.fail('工单号格式异常');
                this.modeInfo.daa001 = '';
            }
            this.billno = item.name;
            this.getModel();
            //this.$toast(item.name);
        },
H5/Wwck.aspx
@@ -30,13 +30,14 @@
        <van-cell-group>
                <van-field
                    ref ="selectKey"
                    ref ="billno"
                value=""
                label="申请单号"
                clearable 
                    placeholder="请选择申请单号"
                :right-icon-size="19"
                    v-model="selectKey"
                    v-model="billno"
                    @keyup.enter.native ="getModel"
                ><template #button>
                <van-button size="small" type="info" plain @click="getInfo" >选择</van-button>
                </template></van-field>
@@ -183,5 +184,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Wwck.js?<%=101 %>"></script>
    <script src="Js/Wwck.js?<%=105321 %>"></script>
</asp:Content>
H5/Wwtl.aspx
@@ -67,24 +67,46 @@
</van-cell-group>
    </div>
      <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
          <van-tabs color="#000" title-active-color="#0283EF">
  <van-tab title="待扫物料" class="mySolid font">
              <van-tab title="待退明细" class="mySolid font">
  <van-row>
        <van-col span="12" class="text-left padding-left">物料</van-col>
         <van-col span="6">待扫</van-col>
        <van-col span="6">已扫</van-col>
</van-row>
  <van-row v-for="value in ItemTblDetail.items" class="font">
        <van-col span="12"  class="text-left padding-left">
              <div>{{value.itemNo}}</div>
              <div>{{value.itemName}}</div>
          </van-col>
        <van-col span="6">申请数{{value.tld005}}</van-col>
        <van-col span="6">已领数{{value.tld006}}</van-col>
  </van-row>
</van-tab>
          <van-tab title="已退明细"></van-tab>
    <van-row>
        <van-col span="8" class="text-left padding-left">物料</van-col>
        <van-col span="8" class="text-left padding-left">规格</van-col>
        <van-col span="8">待入库数</van-col>
        <%--<van-col span="4">条码张数</van-col>--%>
    </van-row>
    <van-row v-for="(itm,index) in ItemTblDetail.items" :key="index">
        <van-col span="8" class="text-left padding-left">
            <div class="blue-text">{{itm.itemNo}}</div>
            <div>{{itm.itemName}}</div>
        </van-col>
        <van-col span="8" class="text-left padding-left">
            <div>{{itm.itemModel}}</div>
        </van-col>
        <van-col span="8" class="blue-text">{{itm.dsQty}}</van-col>
        <%--<van-col span="4">{{itm.recoKw}}</van-col>--%>
    </van-row>
  </van-tab>
   <van-tab title="已扫物料" class="mySolid font">
         <van-row>
                    <van-col span="8" class="text-left padding-left">物料</van-col>
        <van-col span="8" class="text-left padding-left">规格</van-col>
             <%--<van-col span="4">需求数</van-col>--%>
            <van-col span="8">已入库数</van-col>
        </van-row>
        <van-row  v-for="(itm,index) in ItemTblDetail.ysitems" :key="index">
                   <van-col span="8" class="text-left padding-left">
            <div class="blue-text">{{itm.itemNo}}</div>
            <div>{{itm.itemName}}</div>
        </van-col>
        <van-col span="8" class="text-left padding-left">
            <div>{{itm.itemModel}}</div>
        </van-col>
<%--            <van-col span="4">{{itm.fQty}}</van-col>--%>
           <van-col span="8" class="blue-text">{{itm.sQty}}</van-col>
       </van-row>
   </van-tab>
</van-tabs>
    <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>