1.巡检上下限为0的，判定为选择合格不合格(已更新) 2.AGV选择点位 3.现场收料新增参数

南骏 池

21 小时以前 b48cbaed482a5e530052a9e31fa0d2e8fd06cec4

1.巡检上下限为0的，判定为选择合格不合格(已更新)
2.AGV选择点位
3.现场收料新增参数

 H5/IPQC_XJ/Add.aspx

@@ -253,11 +253,11 @@
                    </template>
                    <template>
                              <!-- 输入框 -->
                              <div v-if="jymxData.fdownAllow !== '' && jymxData.fupAllow !== ''" class="si-input-box">
                              <div v-if="jymxData.fdownAllow !== '' && jymxData.fdownAllow !== '0' && jymxData.fupAllow !== ''&& jymxData.fupAllow !== '0'" class="si-input-box">
                                <div class="si-input__left">
                                  <span class="si-input__label">检验值输入</span>
                                </div>
                                <div v-if="jymxData.fdownAllow !== '' && jymxData.fupAllow !== ''" class="si-status__right">
                                <div v-if="jymxData.fdownAllow !== '' && jymxData.fdownAllow !== '0' && jymxData.fupAllow !== ''&& jymxData.fupAllow !== '0'" class="si-status__right">
                                  <van-field
                                      :ref="'inputValue' + tabActive"
                                      v-model="inputValue"

 H5/Js/Scll.js

@@ -29,6 +29,7 @@
            // 存储选中行数据对象
            selItem: {} ,
            ItemBarKw: [],//当天行相关条码库位信息
            DaaInfo: {},
        }
    },
    mounted() {
@@ -106,6 +107,7 @@
                    var json = res;
                    if (json.status == 0) {
                        that.ItemDetail = json.data.tbBillList;
                        that.DaaInfo = json.data.tbBillList.daaInfo;
                        that.modeInfo.planNo = json.data.tbBillList.planNo;
                        that.modeInfo.startTime = json.data.tbBillList.startTime;
                        that.$refs.barcode.focus();

 H5/Js/Sctl.js

@@ -82,12 +82,12 @@
                    var json = res;
                    if (json.status == 0) {
                        that.ItemDetail = json.data.tbBillList;
                        that.$refs.sectionCode.focus();
                        //that.$refs.sectionCode.focus();
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$refs.billNo.focus();
                        that.ItemDetail = null;
                        that.ItemDetail = [];
                        that.billNo = null;
                    }
                    that.isLoading = false;
@@ -96,7 +96,7 @@
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$refs.billNo.focus();
                    that.ItemDetail = null;
                    that.ItemDetail = [];
                    that.billNo = null;
                    console.log(error);
                });
@@ -186,12 +186,16 @@
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$refs.barcode.focus();
                        that.barcode = null;
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$refs.barcode.focus();
                    that.barcode = null;
                    console.log(error);
                });
        },

 H5/Js/Xcsl.js

@@ -23,6 +23,7 @@
            selectKey: "",//查询关键字
            actions: [],//列表的值
            show: false,//列表展示
            DaaInfo: {  },

        }
    },
@@ -39,6 +40,7 @@

            if (!that.DAA001 || that.DAA001.length <= 0) {
                that.$toast.fail("工单单号不能为空！");
                that.$playSound('error');
                that.$refs.DAA001.focus();
                return;
            }
@@ -50,8 +52,9 @@
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.DAANum = json.data.tbBillList.gD_Num;
                        that.DAA021 = json.data.tbBillList.workNo;
                        //that.DAANum = json.data.tbBillList.gD_Num;
                        //that.DAA021 = json.data.tbBillList.workNo;
                        that.DaaInfo = json.data.tbBillList.daaInfoList[0];
                        that.xcslItemList = json.data.tbBillList.xcslItemList;
                        that.xcslWjsBarList = json.data.tbBillList.xcslWjsBarList;
                        that.xcslYjsBarList = json.data.tbBillList.xcslYjsBarList;
@@ -59,6 +62,7 @@
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                        that.$refs.DAA001.focus();
                        that.DAA001 = "";
                    }
@@ -67,6 +71,7 @@
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                });
        },
        ScanXcsl() {
@@ -78,6 +83,7 @@
            var that = this;
            if (!that.Bar ||that.Bar.length <= 0) {
                that.$toast.fail("物料条码不能为空！");
                that.$playSound('error');
                that.$refs.Bar.focus();
                return;
            }
@@ -85,6 +91,7 @@

            if (!that.DAA001 ||that.DAA001.length <= 0) {
                that.$toast.fail("工单单号不能为空！");
                that.$playSound('error');
                that.$refs.DAA001.focus();
                return;
            }
@@ -100,10 +107,12 @@
                    if (json.status == 0) {
                        // that.scanInfo = json.data.tbBillList;
                        that.$notify({ type: 'success', message: json.message });
                        that.$playSound('success');
                        that.GetItemsXcsl();
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                    }
                    that.isLoading = false;
                    that.$refs.Bar.focus();
@@ -112,6 +121,7 @@
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                });
        },
        //获取工单信息
@@ -122,6 +132,7 @@
            that.isLoading = true;
            that.AxiosHttp("post", 'Womdaa/GetXcslDaa', {
                selectKey: that.selectKey,
                selDaaType: "1",
            }, false)
                .then(function (res) {
                    var json = res;
@@ -134,7 +145,8 @@
                            that.itemInfo = json.data.tbBillList;
                            that.actions = json.data.tbBillList.map(item => {
                                return {
                                    name: item.daaInfo  // 拼接字段
                                    name: item.daaInfo,  // 拼接字段
                                    subname: item.startTime

                                };
                            });
@@ -167,6 +179,7 @@
                console.log('提取的DAA001:', this.DAA001);
            } else {
                this.$toast.fail('工单号格式异常');
                that.$playSound('error');
                this.DAA001 = '';
            }
            this.GetItemsXcsl();

 H5/Scll.aspx

@@ -53,7 +53,7 @@
                </van-field>
                
                <van-field
                    v-model="modeInfo.planNo"
                    v-model="DaaInfo.workNo"
                    label="任务单号"
                    clearable 
                    :right-icon-size="19"
@@ -62,11 +62,20 @@
                </van-field>

                <van-field
                    v-model="modeInfo.startTime"
                    v-model="DaaInfo.startTime"
                    label="开工时间"
                    clearable 
                    :right-icon-size="19"
                    placeholder="开工时间"
                    disabled>
                </van-field>

                <van-field
                    v-model="DaaInfo.lineName"
                    label="线体名称"
                    clearable 
                    :right-icon-size="19"
                    placeholder="线体名称"
                    disabled>
                </van-field>
                
@@ -182,5 +191,5 @@
</asp:Content>

<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Scll.js?<%=1233361591 %>"></script>
    <script src="Js/Scll.js?<%=1233361592 %>"></script>
</asp:Content>

 H5/Sctl.aspx

@@ -8,6 +8,12 @@
        </style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
        <van-notice-bar 
    :scrollable="false" 
    :text="'当前组织：' + (Cookies.get('orgName') || '暂无组织信息')" 
    class="org-info"
/></van-notice-bar>

        <van-nav-bar
          title="生产退料"
          left-text="返回"
@@ -131,6 +137,6 @@
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Sctl.js?<%=16211 %>"></script>
 <script src="Js/Sctl.js?<%=16214 %>"></script>
</asp:Content>


 H5/Xcsl.aspx

@@ -87,14 +87,32 @@
                    >
                </van-field>
                <van-field
                    ref="DAA021"
                    v-model="DAA021"
                    v-model="DaaInfo.workNo"
                    label="任务单号"
                    clearable 
                    :right-icon-size="19"
                    placeholder="任务单号"
                    autofocus="true"
                    readonly
                    >
                    disabled>
                </van-field>

                <van-field
                    v-model="DaaInfo.startTime"
                    label="开工时间"
                    clearable 
                    :right-icon-size="19"
                    placeholder="开工时间"
                    disabled>
                </van-field>

                <van-field
                    v-model="DaaInfo.lineName"
                    label="线体名称"
                    clearable 
                    :right-icon-size="19"
                    placeholder="线体名称"
                    disabled>
                </van-field>

                <van-field
                    v-model="DAANum"
                    label="工单数量"
@@ -133,8 +151,8 @@
                    <van-col span="8" class="text-left padding-left">
                        <div>{{itm.item_model}}</div>
                    </van-col>
                    <van-col span="4" class="blue-text">{{itm.bL_Num}}</van-col>
                    <van-col span="4" class="blue-text">{{itm.jS_Num}}</van-col
                    <van-col span="4" class="blue-text">{{itm.BL_Num}}</van-col>
                    <van-col span="4" class="blue-text">{{itm.JS_Num}}</van-col
                </van-row>
            </van-tab>
            <van-tab title="未接收列表" class="mySolid font">
@@ -148,16 +166,16 @@
                <van-row 
                    v-for="(itm,index) in xcslWjsBarList" 
                    :key="index">
                    <van-col span="5" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
                    <van-col span="5" class="text-left padding-left">{{itm.ITEM_BARCODE}}</van-col>
                    <van-col span="8" class="text-left padding-left">
                        <div class="blue-text">{{itm.item_no}}</div>
                        <div>{{itm.item_name}}</div>
                    </van-col>
                    <van-col span="3" class="text-left padding-left">
                        <div>{{itm.quantity}}</div>
                        <div>{{itm.QUANTITY}}</div>
                    </van-col>
                    <van-col span="3">
                        <div>{{itm.useR_NAME}}</div>
                        <div>{{itm.USER_NAME}}</div>
                    </van-col>
                    <van-col span="5">
                        <div>{{itm.create_date}}</div>
@@ -176,19 +194,19 @@
                <van-row 
                    v-for="(itm,index) in xcslYjsBarList" 
                    :key="index">
                    <van-col span="5" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
                    <van-col span="5" class="text-left padding-left">{{itm.ITEM_BARCODE}}</van-col>
                    <van-col span="8" class="text-left padding-left">
                        <div class="blue-text">{{itm.item_no}}</div>
                        <div>{{itm.item_name}}</div>
                    </van-col>
                    <van-col span="3" class="text-left padding-left">
                        <div>{{itm.quantity}}</div>
                        <div>{{itm.QUANTITY}}</div>
                    </van-col>
                    <van-col span="3">
                        <div>{{itm.useR_NAME}}</div>
                        <div>{{itm.USER_NAME}}</div>
                    </van-col>
                    <van-col span="5">
                        <div>{{itm.xcsL_CREATE_DATE}}</div>
                        <div>{{itm.XCSL_CREATE_DATE}}</div>
                    </van-col>
                </van-row>
            </van-tab>
@@ -201,5 +219,5 @@
</asp:Content>

<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Xcsl.js?<%=11111111 %>"></script>
    <script src="Js/Xcsl.js?<%=11111115 %>"></script>
</asp:Content>