南骏 池
2025-04-15 2edeef58633a0a303c243f1b8fcc85b79780eea1
1.采购退货优化
2.生产补料优化
3.生产领料优化
4.生产退料优化
已修改7个文件
300 ■■■■■ 文件已修改
H5/Js/PurchaseReturn.js 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Scbl.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/PurchaseReturn.aspx 151 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Scbg.aspx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Scbl.aspx 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Scll.aspx 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Sctl.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/PurchaseReturn.js
@@ -14,7 +14,7 @@
                quantity:0
            },
            formData: {},
            tableData: [],
            ItemDetail: [],
            codeTableData: [],
            itemOutNoList: [],
            itemOutNoStr: [],
@@ -148,46 +148,22 @@
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.tableData = json.data.tbBillList.sumItem;
                        that.scanFormData.itemNo = json.data.tbBillList.itemNo
                        //that.scanFormData.quantity = json.data.tbBillList.quantity
                        //console.log(json);
                        that.ItemDetail = json.data.tbBillList;
                        that.$refs.barcode.focus();
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.ItemDetail = [];
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误,请重试!");
                    console.log(error);
                    that.ItemDetail = [];
                });
        },
        //getScanBarcode() {
        //    var that = this;
        //    that.isLoading = true;
        //    that.AxiosHttp("post", 'MesInvItemOuts/GetScanBarcode', {
        //        id: that.formData.guid
        //    }, false)
        //        .then(function (res) {
        //            var json = res;
        //            if (json.status == 0) {
        //                that.codeTableData = res.data.tbBillList;
        //            }
        //            else {
        //                that.$toast.fail(json.message);
        //            }
        //            that.isLoading = false;
        //        })
        //        .catch(function (error) {
        //            that.isLoading = false;
        //            that.$toast.fail("网络错误,请重试!");
        //            console.log(error);
        //        });
        //},
        SaveBarCodes() {
            //if (!this.scanFormData.barcode) {
H5/Js/Scbl.js
@@ -19,6 +19,7 @@
            active: 0,
            show: false,
            actions: [],
            ItemDetail: [],
        }
    },
    mounted() {
@@ -64,11 +65,6 @@
                    console.log(error);
                });
        },
        onClick(index, title) {
            this.$toast(`${index} ${title}`);
            this.$notify({ type: 'success', message: '某某物料扫码成功某某物料扫码成功某某物料扫码成功某某物料扫码成功' });
        },
        onSelect(item) {
            // 默认情况下点击选项时不会自动收起
            // 可以通过 close-on-click-action 属性开启自动收起
@@ -89,8 +85,8 @@
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.ItemBlDetail = json.data.tbBillList.item2;
                        that.daa001 = json.data.tbBillList.item1;
                        that.ItemDetail = json.data.tbBillList;
                        that.daa001 = json.data.tbBillList.daa001;
                        that.$refs.barcode.focus();
                    }
                    else {
H5/PurchaseReturn.aspx
@@ -8,6 +8,7 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
        <div class="content-wrapper">
    <van-nav-bar
  title="采购退料"
  left-text="返回"
@@ -54,122 +55,50 @@
</van-cell-group>
    </div>
  <van-tabs color="#000" title-active-color="#0283EF">
  <van-tab title="待退货的物料" class="mySolid font">
      <van-row>
             <van-col span="12">物料</van-col>
          <%--<van-col span="6" 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="(itm,index) in tableData" :key="index">
        <van-col span="12"  class="text-left padding-left">
               <div>{{itm.itemNo}}</div>
               <div>{{itm.itemName}}</div>
          </van-col>
        <%--<van-col span="6">{{itm.invBillNo}}</van-col>--%>
          <van-col span="6">{{itm.sqNum}}</van-col>
          <van-col span="6">{{itm.ysNum}}</van-col>
    </van-row>
  </van-tab>
   <%--<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-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="3">待扫</van-col>
            <van-col span="5">推荐库位</van-col>
        </van-row>
        <van-row  v-for="(itm,index) in codeTableData" :key="index">
           <van-col span="12" class="text-left padding-left">
                <div>{{itm.itemNo}}</div>
        <van-row v-for="(itm,index) in ItemDetail.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="6" class="text-left padding-left">
                <div>{{itm.quantity}}</div>
                <div>{{itm.itemUnit}}</div>
            </van-col>
           <van-col span="6">{{itm.depotSectionCode}}</van-col>
       </van-row>
   </van-tab>--%>
      <%--<van-tab title="退货单" class="mySolid font">
         <van-field
          v-model="formData.itemOutNo"
          label="出库单号"
          placeholder="出库单号"
          disabled
        ></van-field>
        <van-field
          v-model="formData.billTypeName"
          label="单据类型"
          placeholder="单据类型"
          disabled
        ></van-field>
        <van-field
          v-model="formData.createBy"
          label="创建人"
          placeholder="创建人"
          disabled
        ></van-field>
        <van-field
          v-model="formData.createDate"
          label="创建时间"
          placeholder="创建时间"
          disabled
        ></van-field>
        <van-field
          v-model="formData.depotName"
          label="退料仓库"
          placeholder="退料仓库"
          disabled
        ></van-field>
        <van-checkbox v-model="formData.fType == 1" disabled>委外退货</van-checkbox>
        <van-field
          v-model="formData.reason"
          label="退货原因"
          placeholder="退货原因"
          disabled
        ></van-field>
        <van-field
          v-model="formData.fmrmode"
          label="退料方式"
          placeholder="退料方式"
          disabled
        ></van-field>
        <van-field
          v-model="formData.suppNo"
          label="供应商编码"
          placeholder="供应商编码"
          disabled
        ></van-field>
        <van-field
          v-model="formData.suppName"
          label="供应商名称"
          placeholder="供应商名称"
          disabled
        ></van-field>
        <van-field
           v-model="formData.checkUserFname"
           label="审核人"
           placeholder="审核人"
           disabled
         ></van-field>
          <van-field
           v-model="formData.checkDate"
           label="审核时间"
           placeholder="审核时间"
           disabled
         ></van-field>
          <van-field
           v-model="formData.remark"
           label="备注"
           placeholder="备注"
           disabled
         ></van-field>
      </van-tab>--%>
            <van-col span="8" class="text-left padding-left">
                <div>{{itm.itemModel}}</div>
            </van-col>
            <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
            <van-col span="5">{{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="3">需领数</van-col>
            <van-col span="5">已领数</van-col>
        </van-row>
        <van-row v-for="(itm,index) in ItemDetail.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="3">{{itm.fQty}}</van-col>
            <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
        </van-row>
    </van-tab>
</van-tabs>
    <van-button type="primary" @click="SaveBarCodes" >确认</van-button>
<%--    <van-button type="primary" @click="SaveBarCodes" >确认</van-button>--%>
    <van-action-sheet v-model="show" :actions="itemOutNoStr" @select="onSelect" ></van-action-sheet>
                </div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
@@ -178,5 +107,5 @@
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/PurchaseReturn.js?<%=128 %>"></script>
    <script src="Js/PurchaseReturn.js?<%=12811 %>"></script>
</asp:Content>
H5/Scbg.aspx
@@ -14,7 +14,7 @@
          left-arrow
          @click-left="GoBack()"
        ></van-nav-bar>
        <div>
        <div class="content-wrapper">
        <van-cell-group>
  <van-field
    value=""
@@ -121,10 +121,10 @@
   placeholder="报工数量"
></van-field>
</van-cell-group>
    </div>
    <van-button type="primary" @click="tmcf" :loading="load" loading-text="发送中">确认</van-button>
    <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
</div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
H5/Scbl.aspx
@@ -14,7 +14,7 @@
          left-arrow
          @click-left="GoBack()"
        ></van-nav-bar>
        <div>
        <div class="content-wrapper">
        <van-cell-group>
  <van-field
      ref="billNo"
@@ -69,40 +69,56 @@
    <van-button size="small" type="info" plain @click="tmcf" >条码拆分</van-button>
  </template></van-field>
</van-cell-group>
    </div>
    <div  class="van-tab-left">
              <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
  <van-tab title="待发物料" class="mySolid font">
<%--    <van-row v-for="value in ItemBlDetail" class="font">
          <van-col span="12">物料:{{value.bld002}}</van-col>
          <van-col span="6">申请数{{value.bld007}}</van-col>
          <van-col span="6">已领数{{value.bld008}}</van-col>
    </van-row>--%>
            <van-tabs color="#000" title-active-color="#0283EF">
    <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 ItemBlDetail" class="font">
      <van-col span="12"  class="text-left padding-left">
           <div>{{value.bld002}}</div>
           <div>{{value.bld003}}</div>
      </van-col>
      <van-col span="6">{{value.bld007}}</van-col>
     <van-col span="6">{{value.bld008}}</van-col>
</van-row>
  </van-tab>
            <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="3">待扫</van-col>
            <van-col span="5">推荐库位</van-col>
        </van-row>
        <van-row v-for="(itm,index) in ItemDetail.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="3" class="blue-text">{{itm.dsQty}}</van-col>
            <van-col span="5">{{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="3">需领数</van-col>
            <van-col span="5">已领数</van-col>
        </van-row>
        <van-row v-for="(itm,index) in ItemDetail.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="3">{{itm.fQty}}</van-col>
            <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
        </van-row>
    </van-tab>
</van-tabs>
    </div>
    <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
    </div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Scbl.js?<%=12318 %>"></script>
 <script src="Js/Scbl.js?<%=1231811 %>"></script>
</asp:Content>
H5/Scll.aspx
@@ -1,30 +1,9 @@
<%@ Page Title="生产领料" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Scll.aspx.cs" Inherits="H5_Scll" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
  <style>
/*.van-nav-bar__content {
    height: 0.8267rem;
}*/
/*.van-nav-bar__title {
    max-width: 60%;
    margin: 0 auto;
    color: #323233;
    font-weight: 500;
    font-size: .3267rem;
}*/
/* 特殊文本样式 */
/*.blue-text {
    color: #1989fa;
    font-weight: 500;
}*/
       .bg-info {
     background-color: #fff;
    }
</style>
</asp:Content>
H5/Sctl.aspx
@@ -68,7 +68,7 @@
disabled
  ></van-field>
</van-cell-group>
    </div>
<%--      <van-tabs  color="#000" title-active-color="#0283EF" >
  <van-tab title="待退明细">
@@ -124,7 +124,7 @@
</van-tabs>
    <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
    </div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
   <comloading  v-if="isLoading"></comloading>