1.以下基础资料 测试并完善功能； 供应商，职员，物料，客户，班组 （测试必录项目，新增，修改，删除，审核，反审核 等功能，有图片预览的 完善图片预览...

zrg

2024-04-25 d36ee02a8062d81006324ac3f2170cb1c45e3359

1.以下基础资料 测试并完善功能； 供应商，职员，物料，客户，班组 （测试必录项目，新增，修改，删除，审核，反审核 等功能，有图片预览的 完善图片预览以及上传功能）
2.客户 增加字段 领用人 HMateOutEmp varchar(100) 生产班组 增加 字段 劳务单位 HCompName varchar(200)

 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs

@@ -148,7 +148,7 @@
            try
            {
                string sql = string.Format(@"select  c.HItemID,c.HNumber 客户代码,c.HName 客户名称,c.HHelpCode  助记码,c.HShortName 简称,c.HAddress 地址,c.HLinkMan 联系人,c.HLinkPhone 联系电话
                                            ,c.HMobilePhone 手机,c.HFax 传真,c.HPostalCode 邮编,c.HEmail 电子邮件,c.HCorMan 法人代表,c.HBank 开户银行,c.HBankAccount 银行账号,
                                            ,c.HMobilePhone 手机,c.HFax 传真,c.HPostalCode 邮编,c.HEmail 电子邮件,c.HCorMan 法人代表,c.HBank 开户银行,c.HBankAccount 银行账号,c.HMateOutEmp 领用人,
                                            c.HTaxNum 税务登记号,c.HTaxRate 增值税率,c.HEnglishName 英文名称,c.HEngLishAddress 英文地址,c.HCountry 国家,c.HCusStatus 客户状态
                                            ,c.HStopflag 禁用标志,c.HRemark 备注,c.HAreaID 地区ID,a.HName 地区名称,c.HCurID 默认货币ID,r.HName 默认货币,
                                            c.HSSID 结算方式ID,s.HName 结算方式,c.HCusTypeID 客户分类ID,t.HName 客户分类 from Gy_Customer c
@@ -354,7 +354,7 @@
                DateTime HMakeTime = list[0].HMakeTime;
                long HCreateOrgID = list[0].HCREATEORGID;
                long HUseOrgID = list[0].HUSEORGID;

                string HMateOutEmp = list[0].HMateOutEmp;
                //DateTime HDeleteDate = list[0].HDeleteDate;


@@ -382,7 +382,7 @@
                    ",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
                    ",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
                    ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
                    ",HCusTypeID,HCREATEORGID,HUSEORGID) " +
                    ",HCusTypeID,HCREATEORGID,HUSEORGID,HMateOutEmp) " +
                    " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
                    ", " + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
                    ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
@@ -392,7 +392,7 @@
                    "," + HEmpID + "," + HCreditDate + "," + HCreditRatingDate + "," + HMaxCredRatingDate +
                    "," + HMonthUseQty + "," + HForecastCreditRating + "," + HCreditLevelID + "," + HCountAccrualRating +
                    "," + HSubsidyAccrualRating + "," + HCreditRating + "," + HMaxCreditRating +
                    ", " + HCusTypeID + ","+ HCreateOrgID + ","+ HUseOrgID + ")");
                    ", " + HCusTypeID + ","+ HCreateOrgID + ","+ HUseOrgID + ",'"+ HMateOutEmp + "')");
                //修改上级为非末级代码
                oCN.RunProc("Update Gy_Customer set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

@@ -608,7 +608,7 @@
                DateTime HMakeTime = list[0].HMakeTime;
                long HCreateOrgID = list[0].HCREATEORGID;
                long HUseOrgID = list[0].HUSEORGID;

                string HMateOutEmp = list[0].HMateOutEmp;

                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, false, msg4))
@@ -665,7 +665,8 @@
                    ",HAreaID  ='" + HAreaID + "'" +
                    ",HCusStatus  ='" + HCusStatus + "'" +
                    ",HCusTypeID  ='" + HCusTypeID + "'" +
                    ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    ",HMateOutEmp='"+ HMateOutEmp+
                    "',HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 为非末级

 WebAPI/Controllers/BaseSet/Gy_GroupController.cs

@@ -298,6 +298,7 @@
                var HDeptID = list[0].HDeptID;
                long HProcID = list[0].HProcID;
                int HUSEORGID = list[0].HUSEORGID;
                string HCompName = list[0].HCompName;
                var HDeptNumber = "";
                //var HEndFlag = 0;
                long HLevel = 1;
@@ -338,10 +339,10 @@
                    oCN.RunProc("Insert into Gy_Group " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HEmpQty,HDeptID,HDeptNumber,HProcID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase,HUSEORGID) " +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase,HUSEORGID,HCompName) " +
                    " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                    "," + HEmpQty.ToString() + "," + HDeptID.ToString() + ",'" + HDeptNumber + "'," + HProcID.ToString() +
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "',"+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "',"+ HUSEORGID + ",'" + HCompName + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
@@ -360,7 +361,8 @@
                                 ",HRemark= '" + HRemark + "'" +
                                 ",HDeptID=" + HDeptID +
                                 ",HEmpQty=" + HEmpQty +
                                 ",HBarCodeForBase='" + HBarCodeForBase + "' " +
                                 ",HCompName='"+ HCompName+
                                 "',HBarCodeForBase='" + HBarCodeForBase + "' " +
                                 ", HProcID = '" + HProcID + "'  Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();

 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs

@@ -121,7 +121,7 @@
        {
            try
            {
                string sql = string.Format(@"select  s.HItemID,s.HNumber 编码,s.HName 名称,s.HHelpCode  助记码,s.HShortName 简称,s.HAddress 地址,s.HLinkMan 联系人,s.HLinkPhone 联系电话
                string sql = string.Format(@"select  s.HItemID,s.HUSEORGID,o.Hname 使用组织,s.HCREATEORGID ,d.Hname 创建组织,s.HNumber 编码,s.HName 名称,s.HHelpCode  助记码,s.HShortName 简称,s.HAddress 地址,s.HLinkMan 联系人,s.HLinkPhone 联系电话
                                            ,s.HMobilePhone 手机,s.HFax 传真,s.HPostalCode 邮编,s.HEmail 电子邮件,s.HCorMan 法人代表,s.HBank 开户银行,s.HBankAccount 银行账号,
                                           s.HTaxNum 税务登记号,s.HEnglishName 英文名称,s.HEngLishAddress 英文地址,s.HCountry 国家,s.HStopflag 禁用标志
                                           ,s.HRemark 备注,s.HAreaID 地区ID,a.HName 地区名称,s.HTaxRate 增值税率,s.HCurID 默认货币ID,r.HName 默认货币,
@@ -129,6 +129,8 @@
                                           left join Gy_AreaSet a on s.HAreaID=a.HItemID
                                           left join Gy_Currency r on s.HCurID=r.HItemID 
                                           left  join Gy_SettleStyle e on s.HSSID=e.HItemID
                                           left join Xt_ORGANIZATIONS o on s.HUSEORGID=o.HItemID
                                           left join Xt_ORGANIZATIONS d on s.HCREATEORGID=d.HItemID
                                           where s.HItemID='" + HInterID + "'");
                ds = oCN.RunProcReturn(sql, "Gy_Supplier");

@@ -228,13 +230,13 @@
                    ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                    ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                    ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
                    ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass) " +
                    ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass,HUSEORGID,HCREATEORGID) " +
                " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
                "," + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
                ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
                ",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
                ",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
                ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + 
                ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + " ','" + HUseOrgID + "' ,'" + HCreateOrgID +
              "') ");
                //修改上级为非末级代码
                oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -422,6 +424,8 @@
                   ",HCurID=" + HCurID.ToString() +
                   ",HSSID=" + HSSID.ToString() +
                   ",HMaterClass='" + HMaterClass +
                   "',HUSEORGID='" + HUseOrgID.ToString() +
                   "',HCREATEORGID='" + HCreateOrgID.ToString() +
                   "',HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);



 WebAPI/Models/Customer.cs

@@ -96,7 +96,7 @@

        public long HUSEORGID { get; set; }


        public string HMateOutEmp { get; set; }//领用人


    }

 WebAPI/Models/Gy_Group.cs

@@ -23,6 +23,9 @@
        public int HUSEORGID;

        public string HBarCodeForBase { get; set; }
        

        public string HCompName { get; set; }//劳务单位


    }
}

 WebAPI/Models/Supplier.cs

@@ -75,5 +75,6 @@

        public string HMaterClass { get; set; }


    }
}