异常反馈单增加根据生产资源获取设备编码,模具微信记录单增加默认值,供应商改为不是必须

zrg

2024-07-23 8a3b1a594f8490077a3591fe0725ddb1fe59764e

异常反馈单增加根据生产资源获取设备编码,模具微信记录单增加默认值,供应商改为不是必须

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,8 +8,8 @@
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    /*var WEBURL = "http://localhost:8082/API/";    *//*//张瑞广本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:8082/API/";    /*//张瑞广本地配置*/
   // var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sb_Add_MouldRepairWorkBillList.html

@@ -137,10 +137,10 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">供应商<label style="color:red"> * </label></label>
                                                <label class="layui-form-label">供应商</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -192,7 +192,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">新设计寿命</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HNewDesignLife" id="HNewDesignLife" class="layui-input" value="">
                                                    <input type="text" name="HNewDesignLife" id="HNewDesignLife" class="layui-input" value="0">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
@@ -1519,10 +1519,10 @@
                layer.msg("请填写器具规格", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if ($("#HSupName").val() == '') {
                layer.msg("供应商没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            //if ($("#HSupName").val() == '') {
            //    layer.msg("供应商没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            if ($("#HEquipName").val() == '') {
                layer.msg("设备没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
@@ -1541,10 +1541,10 @@
                layer.msg("实际维修工时请填写数字", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if (reg.test($("#HNewDesignLife").val()) == false || $("#HTimes").val() == '') {
                layer.msg("新设计寿命请填写数字", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            //if (reg.test($("#HNewDesignLife").val()) == false || $("#HTimes").val() == '') {
            //    layer.msg("新设计寿命请填写数字", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            if ($("#HBillNo").val() == '') {
                layer.msg("错误的单据号", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html

@@ -636,7 +636,7 @@
                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_ErrMsgBackType", //方法所在页面和方法名
                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/set_EquipFile", //方法所在页面和方法名
                        async: false,
                        data: {
                            "HSourceName": HSourceName