yangle
2022-11-29 85df8bdea2ad7729b4c0797badb2f49c7f43ce43
工序流转卡 打印问题
3个文件已添加
5个文件已修改
108 ■■■■■ 已修改文件
WebTM/App_Data/MssqlReportData.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.designer.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/App_Data/MssqlReportData.cs
@@ -18,8 +18,8 @@
    //public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //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=192.168.0.193\SWE2014;Initial Catalog=HX_LimsSys;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;";//YL测试
    //public const string SqlConnStr = @"Data Source=192.168.0.193\SWE2014;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=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特
    //public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪
WebTM/WebTM.csproj
@@ -186,6 +186,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_ConkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_MateMouldList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnitList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnit_Add_Edit_.html" />
@@ -843,7 +844,6 @@
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileResume.html" />
    <Content Include="views\模治具管理\模治具管理\KF_BarCodeStatusChangeBill.html" />
    <Content Include="views\模治具管理\模治具管理\Sb_Add_MouldRepairWorkBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldConkBookBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckBillList.html" />
@@ -1475,6 +1475,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx.cs">
      <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -4,11 +4,11 @@
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/HBarPlanPrint.html
@@ -176,7 +176,12 @@
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?typename='" + OpenTmp + "'&linterid=" + value, true, "");
                break;
            case "HProcessExchange"://工序流转卡
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillList.aspx?linterid=" + value, true, "");
                var ListTrue = value.split(',');
                if (ListTrue[1] == 0) {
                    CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp  + ".grf", "xmlLBM_Sc_ProcessExchangeBillList.aspx?linterid=" + ListTrue[0], true, "");
                } else {
                    CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + "_Sub.grf", "xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx?linterid=" + ListTrue[0], true, "");
                }
                break;
            case "HPPickingBill"://生产领料拆码列表
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_HPPickingBillList.aspx?linterid=" + value, true, "");
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx
New file
@@ -0,0 +1,29 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_Sc_ProcessExchangeBillList_SubList" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title></title>
      <script runat="server">
        protected void Page_Load(object sender, EventArgs e)
        {
             //★特别提示★:
            //不同的数据库应该选用不同的报表XML数据生成类,SQL Server数据库用SqlXMLReportData,Oracle数据库用OracleXMLReportData
            //OledbXMLReportData适合于Access等本地数据库,为了演示方便,这里从Grid++Report的Access例子数据库中获取报表数据
            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            string sql1 = "select  distinct b.流水号,a.任务单号,a.唯一ID,1 æ¨¡å…·ç¼–码,a.流转卡数量,a.产品代码,a.芯体物料代码,a.芯体规格型号,a.版本,a.成品编号,a.产品名称,b.工序代码,a.日期,a.日计划工单日期,a.制单日期,a.计划完工日期,a.单据号,a.材质,b.工序名称,b.生产数量,a.生产数量,a.源单客户编码,a.包装标识,a.包装标识编码,a.销售订单号,a.子件规格 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid=" + Request.Params["linterid"];
            string sql2 = "select  å™¨å…·ç¼–码 ,器具名称, åº“位,  å™¨å…·ERP对应规格型号 from h_v_Sc_ProcessExchangeBillQuerySub_Mould where hmainid=" + Request.Params["linterid"];
            SqlXMLReportData.GenEntireData(this,sql1 ,sql2);
        }
    </script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.cs
New file
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WebTM.views.基础资料.公用基础资料
{
    public partial class xmlLBM_Sc_ProcessExchangeBillList_SubList : System.Web.UI.Page
    {
        protected void Page_Load(object sender, EventArgs e)
        {
        }
    }
}
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.designer.cs
New file
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„æ›´æ”¹å¯èƒ½å¯¼è‡´ä¸æ­£ç¡®çš„行为,如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------
namespace WebTM.views.基础资料.公用基础资料
{
    public partial class xmlLBM_Sc_ProcessExchangeBillList_SubList
    {
        /// <summary>
        /// form1 æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„å­—æ®µã€‚
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -193,6 +193,7 @@
            var option4 = "";
            var HBillNo = "";
            var wybj = false;
            var QJQD = 0;//判断器具清单查询列表是否有数据  0没有 1有
            var Organization = sessionStorage["Organization"]
            //#endregion
@@ -520,6 +521,13 @@
                    data: { "HProcExchHinteID": HMainID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            if (data1.data.length == 0) {
                                QJQD = 0;
                            } else {
                                QJQD = 1;
                            }
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
@@ -1406,7 +1414,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + QJQD + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
                        , resize: false
                    })
                }
@@ -1426,7 +1434,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() +","+ QJQD + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
                        , resize: false
                    })
                }