不良评审单保存逻辑完成以及页面选中完成

WYB

2021-04-15 6da44ebfe2539d054e06691aba47c397c9ce5061

不良评审单保存逻辑完成以及页面选中完成

 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user

@@ -17,10 +17,10 @@
      <publishTime>03/23/2021 16:57:43</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>04/14/2021 19:13:34</publishTime>
      <publishTime>04/15/2021 19:44:58</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>04/14/2021 19:13:34</publishTime>
      <publishTime>04/15/2021 19:44:58</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>03/23/2021 16:57:43</publishTime>
@@ -725,7 +725,7 @@
      <publishTime>03/31/2021 16:14:26</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_ProcList.html">
      <publishTime>04/09/2021 09:06:20</publishTime>
      <publishTime>04/15/2021 19:57:06</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_StockPlaceList.html">
      <publishTime>03/23/2021 16:57:43</publishTime>
@@ -741,6 +741,9 @@
    </File>
    <File Include="views/Baseset/基础资料/Gy_WorkCenterList.html">
      <publishTime>03/23/2021 16:57:43</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Sc_ProcessPlanViewList.html">
      <publishTime>04/15/2021 17:57:24</publishTime>
    </File>
    <File Include="views/component/anim/index.html">
      <publishTime>03/23/2021 16:57:43</publishTime>
@@ -1175,7 +1178,7 @@
      <publishTime>04/08/2021 10:57:44</publishTime>
    </File>
    <File Include="views/生产工序管理/增加不良评审单/QC_Add_NoPassProdCheckBill.html">
      <publishTime>04/14/2021 19:28:40</publishTime>
      <publishTime>04/15/2021 21:27:39</publishTime>
    </File>
    <File Include="views/生产工序管理/增加不良评审单/QC_NoPassProdCheckBill.html">
      <publishTime>04/12/2021 19:50:54</publishTime>
@@ -1394,7 +1397,7 @@
      <publishTime>03/29/2021 20:16:17</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>04/09/2021 17:02:35</publishTime>
      <publishTime>04/15/2021 19:47:05</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_ProcList.html

@@ -35,6 +35,19 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
            function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
        var params = getUrlVars();
        var Type = params[params[0]];

        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
@@ -47,8 +60,17 @@
            form.on('submit(FH)', function () {
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                var checkStatus = table.checkStatus('ck-table')
                 , data = checkStatus.data;
                parent.GetHProcValue(data);
                    , data = checkStatus.data;

                 switch (Type) {
                    case "HZR":  //返回保管
                        parent.GetHZRValue(data);
                         break;
                     default:
                         parent.GetHProcValue(data);
                         break;
                }
               
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Sc_ProcessPlanViewList.html

@@ -48,7 +48,7 @@
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                var checkStatus = table.checkStatus('ck-table')
                 , data = checkStatus.data;
                parent.GetHUnitNameValue(data);
                parent.GetHPlanValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
@@ -60,9 +60,17 @@
              , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 æ–°å¢ž
              , cols: [[
                  { type: 'radio' }
                , { field: 'HItemID', width: 150, title: '单位ID', hide: true }
                , { field: 'HNumber', width: 150, title: '计量单位代码' }
                , { field: 'HName', width: 150, title: '计量单位', sort: true }
                  , { field: 'hmainid', width: 150, title: 'hmainid', hide: true, sort: true }
                  , { field: 'hsubid', width: 150, title: 'hsubid', hide: true }
                  , { field: '单据号', width: 150, title: '单据号' }
                  , { field: 'HMaterID', width: 150, title: 'HMaterID', hide: true }
                  , { field: '物料代码', width: 150, title: '物料代码' }
                  , { field: '物料名称', width: 150, title: '物料名称' }
                  , { field: 'HCenterID', width: 150, title: 'HCenterID', hide: true }
                  , { field: '工作中心', width: 150, title: '工作中心' }
                  , { field: '规格型号', width: 150, title: '规格型号' }
                  , { field: '计划数量', width: 150, title: '计划数量' }

              ]]
              , page: true
            });
@@ -75,9 +83,9 @@
                $.ajax({
                    type: "get",
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
                    url: GetWEBURL() + "/Web/GetUnitList_Json",
                    url: GetWEBURL() + "/Web/GetPlanList_Json",
                    async: true,
                    data: { "Unit": Value },
                    data: { "Billno": Value },
                    //data: { "Value": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;

 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/Ôö¼Ó²»Á¼ÆÀÉóµ¥/QC_Add_NoPassProdCheckBill.html

@@ -59,13 +59,14 @@
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label">产品：</label>
                                                    <div class="layui-input-inline">
                                                         <input type="text" name="" id="" lay-verify="" readonly="readonly"  autocomplete="off" class="layui-input">
                                                         <input type="text" name="HMater" id="HMater" lay-verify="HMater" readonly="readonly"  autocomplete="off" class="layui-input">
                                                         <input id="HMaterID" name="HMaterID" type="hidden" />
                                                    </div>
                                                </div>
                                                  <div class="layui-col-xs2">
                                                    <label class="layui-form-label">产品代码：</label>
                                                    <div class="layui-input-inline">
                                                         <input type="text" name="" id="" lay-verify="" readonly="readonly"  autocomplete="off" class="layui-input">
                                                         <input type="text" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" readonly="readonly"  autocomplete="off" class="layui-input">
                                                    </div>
                                                </div>
                                            </div>
@@ -74,36 +75,36 @@
                                        <div class="layui-form-item">
                                            <div class="layui-row">
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label">流转卡号：</label>
                                                    <label class="layui-form-label">工序计划单号：</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="" id="" lay-verify="" autocomplete="off" class="layui-input">
                                                        <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="" autocomplete="off" class="layui-input">
                                                       
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanID-BT">
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                              </button>
                                                   <input id="" name="" type="hidden" />
                                                  
                                                   <input id="HMainSourceInterID" name="HMainSourceInterID" type="hidden" />
                                                    <input id="HMainSourceEntryID" name="HMainSourceEntryID" type="hidden" />
                                                    </div>
                                                </div>
                                              
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label"> å·¥ä½œä¸­å¿ƒï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="" lay-verify="" id="" readonly="readonly" autocomplete="off">
                                                        <input id="" name="" type="hidden" />
                                                        <input class="layui-input" name="HWorkCenterName" lay-verify="" id="HWorkCenterName" readonly="readonly" autocomplete="off">
                                                        <input id="HCenterID" name="HCenterID" type="hidden" />
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label"> æµè½¬å¡æ•°é‡ï¼š</label>
                                                    <label class="layui-form-label"> è®¡åˆ’数量：</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="" lay-verify="" id="" readonly="readonly" autocomplete="off">
                                                        <input class="layui-input" name="HPlanQty" id="HPlanQty" readonly="readonly" autocomplete="off">
                                                        
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label"> è§„格型号：</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="" lay-verify="" id="" readonly="readonly"  autocomplete="off">
                                                        <input class="layui-input" name="HModel" lay-verify="" id="HModel" readonly="readonly"  autocomplete="off">
                                                              <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HMateriaID-BT">
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                              </button>-->
@@ -112,7 +113,7 @@
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label"> ä¸è‰¯æ•°é‡ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="" lay-verify="" id=""  autocomplete="off">
                                                        <input class="layui-input" name="HBadQty"  id="HBadQty"  autocomplete="off">
                                                        
                                                    </div>
                                                </div>
@@ -127,7 +128,7 @@
                                                <div class="layui-colorpicker-xs">
                                                    <label class="layui-form-label"> è¯„审意见：</label>
                                                    <div class="layui-input-block">
                                                        <input class="layui-input" name="" id="" autocomplete="off">
                                                        <input class="layui-input" name="HNote" id="HNote" autocomplete="off">
                                                    </div>
                                                </div>
                                            </div>
@@ -136,7 +137,12 @@
                                        </div>
                                    </div>
                        </div>
                     
                     <table>
                         <tr>

                         </tr>
                     </table>

                        <table class="layui-table" id="mainTable" lay-filter="mainTable">
                            <thead>
                                <tr>
@@ -154,19 +160,37 @@
                            <tbody>
                                <tr>
                                    <td>1</td>
                                    <td><input type="text" id="HName" name="HName" style="width:200px;height:20px;"  />
                                    <td><input type="text" id="HWasterReasonName" name="HWasterReasonName" style="width:200px;height:20px;"  />
                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HBadReasonID-BT">
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                              </button>
                                      <input id="HItemID" name="HItemID" type="hidden" />
                                      <input id="HBadReasonID" name="HBadReasonID" type="hidden" />
                                    </td>
                                    <td><input type="text" id="" style="width:200px;height:20px;" /></td>
                                    <td><input type="text" id="" style="width:200px;height:20px;" /></td>
                                    <td><input type="text" id="" style="width:200px;height:20px;" /></td>
                                    <td><input type="text" id="" style="width:200px;height:20px;" /></td>
                                    <td><input type="text" id="" style="width:200px;height:20px;" /></td>
                                    <td><input type="text" id="" style="width:200px;height:20px;" /></td>
                                    <td><input type="text" id="" style="width:200px;height:20px;" /></td>
                                    <td><input type="text" id="HEmpName" name="HEmpName" style="width:200px;height:20px;" />
                                          <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmployeeID-BT">
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                              </button>
                                      <input id="HItemID" name="HItemID" type="hidden" />
                                   

                                    </td>
                                    <td><input type="text" id="HSQProcName" name="HSQProcName" style="width:200px;height:20px;" />
                                      <button type="button" lay-submit="" class="layui-btn" lay-filter="HSQProcID-BT">
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                              </button>
                                      <input id="HProcID" name="HProcID" type="hidden" />
                                    </td>
                                    <td><input type="text" id="HZRProcName" name="HZRProcName" style="width:200px;height:20px;" />
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HZRProcID-BT">
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                              </button>
                                      <input id="HItemID" name="HItemID" type="hidden" />

                                    </td>
                                    <td><input type="text" id="HBadQty" name="HBadQty" style="width:200px;height:20px;" /></td>
                                    <td><input type="text" id="HRemark" name="HRemark" style="width:200px;height:20px;" /></td>
                                    <td><input type="text" id="HPSProcName" name="HPSProcName" style="width:200px;height:20px;" /></td>
                                    <td><input type="text" id="HQCResultID" name="HQCResultID" style="width:200px;height:20px;" /></td>

                                </tr>

@@ -490,16 +514,16 @@
            })
        });

        //选择仓位
        form.on('submit(HSpID-BT)', function () {//选择仓位
        //选择工序计划单
        form.on('submit(HPlanID-BT)', function () {//选择工序计划单
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '仓位列表'
                , area: ['80%', '80%']
                , title: '工序计划单列表'
                , shade: 0.6 //遮罩透明度
                , maxmin: true //允许全屏最小化
                , anim: 0 //0-6的动画形式，-1不开启
                , content: ['../../../views/Baseset/基础资料/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
                , content: ['../../../views/Baseset/基础资料/Sc_ProcessPlanViewList.html', 'yes']
                , resize: false
                , cancel: function () {
                    //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -507,12 +531,12 @@
            })
        });

        //选择保管
        form.on('submit(HKeeperID-BT)', function () {//选择保管
        //选择责任人
        form.on('submit(HEmployeeID-BT)', function () {//选择责任人
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '保管列表'
                , area: ['80%', '80%']
                , title: '职员列表'
                , shade: 0.6 //遮罩透明度
                , maxmin: true //允许全屏最小化
                , anim: 0 //0-6的动画形式，-1不开启
@@ -524,17 +548,17 @@
            })
        });

        //选择验收
        form.on('submit(HSecManagerID-BT)', function (data) {//选择验收
        //选择申请工序
        form.on('submit(HSQProcID-BT)', function (data) {//选择申请工序
            var sMainStr = JSON.stringify(data.field);
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '验收列表'
                , area: ['80%', '80%']
                , title: '申请工序列表'
                , shade: 0.6 //遮罩透明度
                , maxmin: true //允许全屏最小化
                , anim: 0 //0-6的动画形式，-1不开启
                , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HSecManager', 'yes']
                , content: ['../../../views/Baseset/基础资料/Gy_ProcList.html', 'yes']
                , resize: false
                , cancel: function () {
                    //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -542,16 +566,16 @@
            })
        });

        //选择部门
        form.on('submit(HDeptID-BT)', function () {//选择部门
        //选择责任工序
        form.on('submit(HZRProcID-BT)', function () {//选择责任工序
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '部门列表'
                , area: ['80%', '80%']
                , title: '责任工序列表'
                , shade: 0.6 //遮罩透明度
                , maxmin: true //允许全屏最小化
                , anim: 0 //0-6的动画形式，-1不开启
                , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                , content: ['../../../views/Baseset/基础资料/Gy_ProcList.html?Type=HZR', 'yes']
                , resize: false
                , cancel: function () {
                    //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -585,59 +609,40 @@
            //window.close();//关闭当前页
        })

        //提交
        form.on('submit(Saver)', function (data) {//提交
            //debugger;
            if ($("#HExplanation").val() == "") {
                if ($("#HWHNAME").val() == "宽幅成品仓NEW" || $("#HWHNAME").val() == "样本仓NEW") {
                    $("#HWHNAME").val("");
                    $("#HWHID").val("");
                    layer.msg("请扫MES库位码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                else
                {
                    $("#HExplanation").val($("#HWHNAME").val());
                }
            }
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = table.cache['wl-table'];
            //var sSourceType = $("#HBillType").val();
            var sSourceType = "3711";
            if (AllowLoadData(sSubStr) != false)//非空验证
            {
                layer.load(3);
      form.on('submit(Saver)', function (data) {//保存
                  //debugger;
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                $.ajax(
                {
                    type: "POST",
                    //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/set_SaveProductInBill_Json", //方法所在页面和方法名
                    url: GetWEBURL() + "/ProductIn/set_SaveProductInBill_Json",
                    url: GetWEBURL()+"SaveBadReasonList", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr  },
                    data: {"msg": sMainSub},
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                            layer.confirm("生成产品入库单" + data.Message + $("#HBillNo").val(), {
                                icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                btn2: function () {
                                    //parent.layui.admin.events.closeThisTabs();关闭页签
                                    //window.close();//关闭页面，浏览器有效，PDA无效
                                    parent.location.href = "../../../views/index.html"
                                }//关闭
                            }, function () { window.location.reload(); });//新增
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                        }
                        else {
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            
                            f_alert(data.Message);
                            console.log("Reason" + sMainStr + "sub:::" + sSubStr);
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        error: function (err) {
                        
                            f_alert("错误:" + err);
                            console.log("Reason"+sMainStr);
                    }
                });
                return false;
            } 
        });
              });
                function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });
               
            }

        //监听提交
        form.verify({
@@ -668,25 +673,35 @@
    });
    function GetHReasonValue(obj)  //返回不良原因
    {
        $("#HName").val(obj[0].HName);
        $("#HWasterReasonName").val(obj[0].HName);
        //sessionStorage["HWHID"] = obj[0].HItemID;
        $("#HItemID").val(obj[0].HItemID);
        $("#HBadReasonID").val(obj[0].HItemID);
    }
    function GetHSpValue(obj) {  //返回调入仓位
        $("#HStockPlaceName").val(obj[0].HName);
        $("#HStockPlaceID").val(obj[0].HItemID);
    function GetHPlanValue(obj) {  //返回工序计划单
        $("#HMainSourceInterID").val(obj[0].hmainid);
        $("#HMainSourceEntryID").val(obj[0].hsubid);
        $("#HMainSourceBillNo").val(obj[0].单据号);
        $("#HMaterID").val(obj[0].HMaterID);
        $("#HMaterNumber").val(obj[0].物料代码);
        $("#HMater").val(obj[0].物料名称);
        $("#HCenterID").val(obj[0].HCenterID);
        $("#HWorkCenterName").val(obj[0].工作中心);
        $("#HModel").val(obj[0].规格型号);
        $("#HPlanQty").val(obj[0].计划数量);


    }
    function GetHKeeperValue(obj) {  //返回保管
        $("#HKeeper").val(obj[0].HName);
        $("#HKeeperID").val(obj[0].HItemID);
    function GetHKeeperValue(obj) {  //返回职员
        $("#HEmpName").val(obj[0].HName);
        //$("#HItemID").val(obj[0].HItemID);
    }
    function GetHSecManagerValue(obj) {  //返回验收
        $("#HSecManager").val(obj[0].HName);
        $("#HSecManagerID").val(obj[0].HItemID);
    function GetHProcValue(obj) {  //返回申请工序
        $("#HSQProcName").val(obj[0].工序);
        $("#HProcID").val(obj[0].HItemID);
    }
    function GetHDeptNameValue(obj) {   //返回部门
        $("#HDeptName").val(obj[0].HName);
        $("#HDeptID").val(obj[0].HItemID);
    function GetHZRValue(obj) {   //返回责任工序
        $("#HZRProcName").val(obj[0].工序);
        //$("#HItemID").val(obj[0].HItemID);
    }
    function AllowLoadData(sSubStr) {  //非空验证
        //if ($("#HSourceBillNo").val() == '') {