用户列表优化 单品过站输入流转卡带出之前有保存的出站单 否则新增

yangle

2023-11-21 becdff314aa755f63e2d27ee2d9b161782eff722

用户列表优化
单品过站输入流转卡带出之前有保存的出站单 否则新增

 WebTM/WebTM.csproj

@@ -324,12 +324,15 @@
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleList_PDA.html" />
    <Content Include="views\质量管理\工序检验单\MES_ProcessCheckBillList_PDA.html" />
    <Content Include="views\质量管理\工序检验单\MES_ProcessCheckBill_PDA.html" />
    <Content Include="views\车间管理\单品过站\BadQueryReport.html" />
    <Content Include="views\车间管理\单品过站\Cj_CollectionOfSingleProductDefects.html" />
    <Content Include="views\质量管理\首件检验单\QC_FirstPieceCheckReport_ZTFB.html" />
    <Content Include="views\质量管理\首件检验单\QC_FirstPieceCheckReport_ZDQX.html" />
    <Content Include="views\车间管理\单品过站\Cj_ProcessItemBGA.html" />
    <Content Include="views\车间管理\单品过站\Cj_ProcessItemBGA_PJGH.html" />
    <Content Include="views\车间管理\单品过站\Cj_ProcessItemStationPlatform.html" />
    <Content Include="views\车间管理\单品过站\RetrospectiveQueryReport.html" />
    <Content Include="views\车间管理\单品过站\Sc_SourceLineRepairBillList.html" />
    <Content Include="views\车间管理\工序流转\MES_ProcessExchangeBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_Sc_ICMOBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />

 WebTM/views/index.html

@@ -600,7 +600,8 @@
                                        <dd><a lay-href="车间管理/单品过站/Cj_ProcessItemBGA.html">工序单品返修台</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/Cj_ProcessItemBGA_PJGH.html">工序单品返修台(配件更换)</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/Sc_SourceLineRepairBillList.html">返修记录列表</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/RetrospectiveQueryReport.html">追溯查询报表</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/RetrospectiveQueryReport.html">合格追溯查询报表</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/BadQueryReport.html">不良追溯查询报表</a></dd>
                                    </dl>
                                </dd>
                            </dl>

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserListEdit.html

@@ -124,6 +124,18 @@
                                                                    </div>
                                                                </div>
                                                            </div>
                                                            <div class="layui-inline">
                                                                <label class="layui-form-label">对应班组</label>
                                                                <div class="layui-input-inline">
                                                                    <div class="layui-input-inline">
                                                                        <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                                        <input type="text" name="HGroupID" id="HGroupID" value="0" hidden>
                                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHGroup" style="width:40px;">
                                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                        </button>
                                                                    </div>
                                                                </div>
                                                            </div>
                                                        </div>
                                                        <div class="layui-form-item">
                                                            <div class="layui-inline">
@@ -145,6 +157,18 @@
                                                                        <input type="text" name="HSecManager" id="HSecManager" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                                        <input type="text" name="HSecManagerID" id="HSecManagerID" value="0" hidden>
                                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
                                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                        </button>
                                                                    </div>
                                                                </div>
                                                            </div>
                                                            <div class="layui-inline">
                                                                <label class="layui-form-label">对应生产资源</label>
                                                                <div class="layui-input-inline">
                                                                    <div class="layui-input-inline">
                                                                        <input type="text" name="HSourceName" id="HSourceName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                                        <input type="text" name="HSourceID" id="HSourceID" value="0" hidden>
                                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHSource" style="width:40px;">
                                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                        </button>
                                                                    </div>
@@ -211,6 +235,18 @@
                                                                        <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                                        <input type="text" name="HSupID" id="HSupID" value="0" hidden>
                                                                        <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>
                                                                    </div>
                                                                </div>
                                                            </div>
                                                            <div class="layui-inline">
                                                                <label class="layui-form-label">对应工序</label>
                                                                <div class="layui-input-inline">
                                                                    <div class="layui-input-inline">
                                                                        <input type="text" name="HProcName" id="HProcName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                                        <input type="text" name="HProcID" id="HProcID" value="0" hidden>
                                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHProc" style="width:40px;">
                                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                        </button>
                                                                    </div>
@@ -367,6 +403,21 @@
            //表头信息  ä¾›åº”商弹窗
            form.on('submit(HSupList)', function () {
                Gy_Supplier();
            });

            //表头信息  å·¥åº
            form.on('submit(btnHProc)', function () {
                btnHProc();
            });

            //表头信息  ç­ç»„
            form.on('submit(btnHGroup)', function () {
                btnHGroup();
            });

            //表头信息  ç”Ÿäº§èµ„源
            form.on('submit(btnHSource)', function () {
                btnHSource();
            });


@@ -696,6 +747,93 @@
                });
            }

            //工序列表
            function btnHProc() {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工序列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/基础资料/生产基础资料/Gy_Process.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }

                        $("#HProcName").val(checkStatus.data[0].工序名称);
                        $("#HProcID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                });
            }

            //班组列表
            function btnHGroup() {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '班组列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/基础资料/工资基础资料/Gy_Group.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }

                        $("#HGroupName").val(checkStatus.data[0].班组名称);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                });
            }

            //生产资源列表
            function btnHSource() {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '生产资源列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/基础资料/生产基础资料/Gy_Source.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }

                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                });
            }
            
            //编辑获取表头信息
            function set_EditFromGrid(linterid)
            {
@@ -735,6 +873,12 @@
                                , "HCloudUserName": data.对应CLOUD账号
                                , "HCloudUserPsd": data.HCloudUserPsd
                                , "HOrgID": data.HUSEORGID
                                , "HProcID": data.HProcID
                                , "HProcName": data.工序
                                , "HGroupID": data.HGroupID
                                , "HGroupName": data.班组
                                , "HSourceID": data.HSourceID
                                , "HSourceName": data.生产资源
                            });

                        } else {

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html

@@ -457,7 +457,7 @@
        function set_ClearBill() {
            //进入页面默认光标在流转卡上
            $("#HBardCodeProcExchBillNo").focus();
            createBillNo();
          
            get_Display();
            get_CriticalPartsList();//关键件清单 ä¸è‰¯è®°å½•  åˆæ ¼è®°å½•
          
@@ -465,14 +465,28 @@

        // ç”Ÿæˆå•æ®å·
        function createBillNo() {
            var sql = "select * from Sc_StationOutBillMain  where HProcExchBillNo='" + $("#HProcExchBillNo").val() + "' and HProcID=" + $("#HProcID").val()
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList",
                async: false,
                type: "GET",
                data: { "HBillType": '3791' },
                success: function (d) {
                    $("#HInterID").val(d.data[0].HInterID);
                    $("#HBillNo").val(d.data[0].HBillNo);
                data: { "sWhere": sql },
                success: function (data) {
                    if (data.data.length > 0) {
                        $("#HInterID").val(data.data[0].HInterID);
                        $("#HBillNo").val(data.data[0].HBillNo);
                    } else {
                        $.ajax({
                            url: GetWEBURL() + "/Web/GetMAXNum",
                            async: false,
                            type: "GET",
                            data: { "HBillType": '3791' },
                            success: function (d) {
                                $("#HInterID").val(d.data[0].HInterID);
                                $("#HBillNo").val(d.data[0].HBillNo);
                            }
                        });
                    }
                }
            });
        }
@@ -814,6 +828,8 @@
                        $("#HPieceQty").val(data1.data[0]["HPieceQty"]);
                        $("#HICMOQty").val(data1.data[0]["HICMOQty"]);

                        createBillNo();

                        option.data = data1.data;
                        table.render(option)
                    }
@@ -838,6 +854,8 @@
                        $("#HProcNo").val(data1.data[0]["HProcNo"]);
                        $("#HPieceQty").val(data1.data[0]["HPieceQty"]);
                        $("#HICMOQty").val(data1.data[0]["HICMOQty"]);

                        createBillNo();
                    } else {
                        layer.close(index);
                        layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -1093,9 +1111,9 @@

        //不良汇报
        function BadReport() {
            var HBarCode_P = $("#HBarCode_P").val();
            var len = option3.data.length;

            if (HBarCode_P != "") {
            if (len != 0) {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框