工序汇报入库的入库按钮换位置

zzr99

2022-08-03 e182f23e393e4c7f3ff08daae540d0434cd81f6d

工序汇报入库的入库按钮换位置

 WebTM/App_Data/MssqlReportData.cs

@@ -19,10 +19,10 @@
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井
    public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井
    //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//雅琪诺测试
    public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特
    //public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特

    //public string sServer;
    //public string sDataBase;

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/Vlog/webapi20220731.txt

New file
@@ -0,0 +1,61 @@
2022/7/31 14:16:08 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:16:08 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:18:53 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:18:53 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:18:53 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2022/7/31 14:18:53 ReportDataSet:1

2022/7/31 14:19:14 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:19:14 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/31 14:19:14 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2022/7/31 14:19:14 ReportDataSet:1

 WebTM/views/×é×°µ¥/Sc_PCruxBindingPDA.html

@@ -179,8 +179,8 @@


            //表头初始化赋值（根据登录用户获取工序 ç”Ÿäº§èµ„源、操作员、生产班组） new
            //工序 
            
            //工序

            $("#HProcID").val(sessionStorage["HProcID"]);
            $("#HProc").val(sessionStorage["HProc"]);
            //生产资源
@@ -315,7 +315,7 @@
                    }
                });
            })
           

            //删除
            form.on('submit(cmdDelete)', function () {
                var checkStatus = table.checkStatus('tm-table')
@@ -328,7 +328,7 @@
                        type: "Get",
                        url: GetWEBURL() + "/Sc_PckSplit/Delete_PHPCruxBillListByME",
                        async: true,
                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HBarCode": sBarCode},
                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HBarCode": sBarCode },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
@@ -351,33 +351,33 @@
                var sSubStr = JSON.stringify(table.cache['pj-table']);
                var sSubStr1 = JSON.stringify(table.cache['tm-table']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ';' + sessionStorage["HUserName"];
                 $.ajax(
                        {
                            type: "POST",
                         url: GetWEBURL() + "/Sc_PckSplit/Add_PHPCruxBillList",
                            async: true,
                            data: { "msg": sMainSub },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                    layer.msg("提交成功" + data.Message + $("#HBillNo").val(), { time: 1 * 1000, icon: 1 }, function () {
                                        location.reload();
                                    });
                                    //layer.msg("提交成功" + data.Message + $("#HBillNo").val(), { icon: 1, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                    //location.reload();
                                }
                                else {
                                    //layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                    layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                                layer.closeAll("loading");
                                layui.form.render();
                            },
                            error: function (err) {
                                //layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/Sc_PckSplit/Add_PHPCruxBillList",
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                layer.msg("提交成功" + data.Message + $("#HBillNo").val(), { time: 1 * 1000, icon: 1 }, function () {
                                    location.reload();
                                });
                                //layer.msg("提交成功" + data.Message + $("#HBillNo").val(), { icon: 1, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                //location.reload();
                            }
                        });
                            else {
                                //layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            layer.closeAll("loading");
                            layui.form.render();
                        },
                        error: function (err) {
                            //layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
            });

            //监听提交
@@ -410,7 +410,7 @@
                        url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxSNBillList",
                        type: "GET",
                        async: false,
                        data: { "HinterID": sInterID, "HBarCode": sBarCode, "HProcID": sProcID, "HBillNo": sBillNo},
                        data: { "HinterID": sInterID, "HBarCode": sBarCode, "HProcID": sProcID, "HBillNo": sBillNo },
                        success: function (result) {
                            if (result.count == 1) {
                                option.data = result.data;
@@ -426,7 +426,7 @@
                    $("#HPCrux").focus();
                }
            });
             //关键件回车方法
            //关键件回车方法
            $('#HPCrux').on('keydown', function (event) {
                var sHPCrux = $('#HPCrux').val()
                var sInterID = $('#HInterID').val()
@@ -440,7 +440,7 @@
                        url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxBillList",
                        type: "GET",
                        async: false,
                        data: { "HinterID": sInterID, "HPCrux": sHPCrux, "HBillNo": sBillNo},
                        data: { "HinterID": sInterID, "HPCrux": sHPCrux, "HBillNo": sBillNo },
                        success: function (result) {
                            if (result.count == 1) {
                                option1.data = result.data;
@@ -507,10 +507,10 @@
                option1.data = [];
                table1.render(option1);
            }
            

        });
        
        


    </script>
</body>
</html>

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -41,6 +41,7 @@
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-event="btn-InStorage" lay-filter="btn-InStorage" id="btn-InStorage"></i>入库</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
@@ -504,6 +505,8 @@
                , element = layui.element;
            //进入页面默认光标在条形码上
            $("#HBarCode").focus();
            //进入页面入库按钮置灰
            $('#btn-InStorage').addClass("layui-btn-disabled").attr("disabled", true);

            /*固定代码，每张单据都要begin*/
            /* 1.无源单新增
@@ -573,8 +576,8 @@
            }



            function RoadBillMain(linterid)//加载表头
            //加载表头
            function RoadBillMain(linterid)
            {
                var index = layer.load();
                $.ajax({
@@ -800,9 +803,12 @@
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");
                            //入库按钮启用
                            $('#btn-InStorage').removeClass("layui-btn-disabled").attr("disabled", false);
                            if (result.Verify == "Y") {
                                location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
                            } else {
                            }
                            else {
                                //保存后浏览
                                ReRoadBillMain();
                            }
@@ -815,6 +821,33 @@
                    error: function (err) {
                        layer.close(index);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            });

            //入库
            form.on('submit(btn-InStorage)', function (data) {
                var InterID = $("#HInterID").val();
                var BillNo = $("#HBillNo").val();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //方法所在页面和方法名
                    async: true,
                    data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
                });
            });
@@ -899,9 +932,18 @@
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HWorker', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    , 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('请选择数据');
                        }
                        $("#HEmpName").val(checkStatus.data[0].HName);
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
            //选择操作员2

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -763,7 +763,7 @@
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                    window.location.href = "http://localhost:8082/LuBaoUi/views/index_Mobile.html"
                });
            })


 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html

@@ -684,7 +684,7 @@
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                    window.history.back();
                });
            })