yusijie
2022-11-29 ad6942e580b2f5391244401a02bdbad04ec96d9b
产品与器具;工序流转卡;销售订单
4个文件已修改
49 ■■■■■ 已修改文件
DAL/基础资料/其他基础资料/ClsGy_MateMould_Ctl.cs 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Gy_MateMouldController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LMESController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/»ù´¡×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/ClsGy_MateMould_Ctl.cs
@@ -59,26 +59,28 @@
            {
                oCn.BeginTran();
                DataSet Ds;
                Int64 HInterID = 1;
                Ds = oCn.RunProcReturn("select MAX(HInterID) HInterID from Gy_MateMouldInfo", "Gy_MateMouldInfo");
                if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
                {
                    HInterID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
                    HInterID += 1;
                }
                DataSet Cs;
                Int64 HEntryID = 1;
                Cs = oCn.RunProcReturn("select MAX(HEntryID) HEntryID from Gy_MateMouldInfo", "Gy_MateMouldInfo");
                if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
                {
                    HEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
                    HEntryID += 1;
                }
                //插入表
                foreach (Model.ClsGy_MateMould_Model oSub in DetailColl)
                {
                    DataSet Ds;
                    Int64 HInterID = 1;
                    Ds = oCn.RunProcReturn("select MAX(HInterID) HInterID from Gy_MateMouldInfo", "Gy_MateMouldInfo");
                    if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
                    {
                        HInterID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
                        HInterID += 1;
                    }
                    DataSet Cs;
                    Int64 HEntryID = 1;
                    Cs = oCn.RunProcReturn("select MAX(HEntryID) HEntryID from Gy_MateMouldInfo", "Gy_MateMouldInfo");
                    if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
                    {
                        HEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
                        HEntryID += 1;
                    }
                    oCn.RunProc("Insert into Gy_MateMouldInfo " +
                        " (HInterID,HEntryID,HMaterID,HRelationID,HUnitID" +
                        ",HBeginDate,HEndDate" +
@@ -114,6 +116,9 @@
                    //        ",'" + oSub.HBeginDate.ToShortDateString() + "','" + oSub.HEndDate.ToShortDateString() + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
                    oCn.RunProc("Update Gy_MateMouldInfo set " +
                       "HRemark='" + oSub.HRemark + "'" +
                       ",HMaterID='" + oSub.HMaterID + "'" +
                       ",HRelationID='" + oSub.HRelationID + "'" +
                       ",HUnitID='" + oSub.HUnitID + "'" +
                       //",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
                       //",HUseFlag=" + Convert.ToString(HUseFlag ? 1 : 0) +
                       //",HMakeTime= getdate()" +
WebAPI/Controllers/Gy_MateMouldController.cs
@@ -183,7 +183,7 @@
                }
                else
                {
                    bResult = BillNew.ModifyByID(DBUtility.ClsPub.isLong(mainList[0].HItemID));
                    bResult = BillNew.ModifyByID(DBUtility.ClsPub.isLong(subList[0].HItemID));
                }
                //提示
                if (bResult == true)
@@ -234,8 +234,8 @@
                //    " left join Gy_Material c on a.HMaterID = c.HItemID " +
                //    " left join Gy_Unit d on a.HUnitID = d.HItemID where a.HItemID = " + HItemID, "Gy_MateMouldInfo");
                ds = oCN.RunProcReturn("select " +
                    "a.HItemID,a.模具产品对应表代码,a.HUnitID,b.HName æ¨¡å…·åç§°" +
                    ",b.HNumber æ¨¡å…·ä»£ç ,a.HMaterID HMaterIDCol,c.HNumber ç‰©æ–™ä»£ç ,c.HName ç‰©æ–™åç§°,c.HModel è§„格型号" +
                    "a.HItemID,a.模具产品对应表代码,a.HUnitID,b.hitemid HMouldIDCol,b.HNumber æ¨¡å…·ä»£ç " +
                    ",b.HName æ¨¡å…·åç§°,a.HMaterID HMaterIDCol,c.HNumber ç‰©æ–™ä»£ç ,c.HName ç‰©æ–™åç§°,c.HModel è§„格型号" +
                    ",a.HRelationID HRelationIDCol,d.HNumber å•位代码,d.HName å•位名称" +
                    ",a.HUnitID HUnitIDCol" +
                    ",a.开始日期,a.结束日期" +
WebAPI/Controllers/LMESController.cs
@@ -125,6 +125,7 @@
                string sql = "select * from h_v_Sc_ProcessExchangeBillQuerySub where hmainid = ";
                string sql1 = sql + sWhere;
                ds = oCN.RunProcReturn(sql1 + " order by cast(工序号 as int)", "h_v_Sc_ProcessExchangeBillQuerySub");
                return GetObjectJson(ds);
            }
            catch (Exception e)
            {
@@ -134,7 +135,6 @@
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }
        #region å·¥åºæµè½¬å¡ï¼ˆä¸‹è¾¾ï¼‰
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -32,7 +32,7 @@
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where HitemID=" + HInterID, "h_v_IF_SeOrderBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID, "h_v_IF_SeOrderBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";