Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2025-10-28 20b7db8f827c755111e722c7275f420206804c16

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MateNumRelationController.cs

@@ -483,19 +483,19 @@

                    LogService.Write("客户物料对应表" + @"Insert Into Gy_MateNumRelation_Sec " +
                          "(HItemID,HCusID,HCusRelationNumber,HCusRelationName,HMaterID" +
                          ",HUsed,HCREATEORGID,HUSEORGID,HRemark,HMakeDate,HMaker" +
                          ",HUsed,HCREATEORGID,HUSEORGID,HRemark,HMakeDate,HMaker,HShopID" +
                          ") " +
                          " values('" + item.HItemID + "','" + item.HCusID + "','" + item.HCusRelationNumber + "','" + item.HCusRelationName + "','" + item.HMaterID + "'," +
                          "'" + item.HUsed + "','" + item.HUSEORGID + "','" + item.HUSEORGID + "','" + item.HRemark + "',getdate(),'" + item.HMaker +
                          "'" + item.HUsed + "','" + item.HUSEORGID + "','" + item.HUSEORGID + "','" + item.HRemark + "',getdate(),'" + item.HMaker + "','" + item.HShopID + 
                          "') ");

                    // æ’入当前item的记录
                    sql = "Insert Into Gy_MateNumRelation_Sec " +
                          "(HItemID,HCusID,HCusRelationNumber,HCusRelationName,HMaterID" +
                          ",HUsed,HCREATEORGID,HUSEORGID,HRemark,HMakeDate,HMaker" +
                          ",HUsed,HCREATEORGID,HUSEORGID,HRemark,HMakeDate,HMaker,HShopID" +
                          ") " +
                          " values('" + item.HItemID + "','" + item.HCusID + "','" + item.HCusRelationNumber + "','" + item.HCusRelationName + "','" + item.HMaterID + "'," +
                          "'" + item.HUsed + "','" + item.HUSEORGID + "','" + item.HUSEORGID + "','" + item.HRemark + "',getdate(),'" + item.HMaker +
                          "'" + item.HUsed + "','" + item.HUSEORGID + "','" + item.HUSEORGID + "','" + item.HRemark + "',getdate(),'" + item.HMaker + "','" + item.HShopID +
                         "') ";
                    oCN.RunProc(sql);                   
                    // å…³é—­identity_insert