提交说明10/13

This commit is contained in:
2026-10-13 03:41:34 +08:00
parent 62119b5852
commit 068d733f3e
55 changed files with 263340 additions and 34 deletions
+4 -5
View File
@@ -2718,7 +2718,7 @@ namespace GThinking.U20261363_N_XLXSBJ
TSQL sql = new TSQL(dberp);
sql.Add("select XLXSJGBYZZC_YZZ,XLXSJGBYZZC_YZID ");
sql.Add(" from XLXSJGBYZZC,XLXSTZYZ ");
sql.Add(" where XLXSTZYZ_JGBID=XLXSJGBYZZC_JGBID and XLXSTZYZ_YZID=XLXSJGBYZZC_YZID and XLXSTZYZ_MXBH='JZJ' and XLXSJGBYZZC_ZXJM=:pZXJM ");
sql.Add(" where XLXSTZYZ_JGBID=XLXSJGBYZZC_JGBID and XLXSTZYZ_YZID=XLXSJGBYZZC_YZID and XLXSTZYZ_MXBH='JZJ' and (XLXSJGBYZZC_ZXJM=:pZXJM or XLXSJGBYZZC_CPTX='无特性' ) ");
sql.Add(" and exists(select 1 from XLXSJGBYZ where XLXSJGBYZ_JGBID =:pJGEJGBID and XLXSJGBYZ_YZID = XLXSTZYZ_YZID)");
sql.Add(" and exists(select 1 from XLXSBJCPYS where XLXSBJCPYS_XLJBXHID=:pXLXHID and XLXSBJCPYS_DYDJID=:pDYDJID and XLXSBJCPYS_XXJGID =XLXSJGBYZZC_CPTX )");
sql.ParamByName("pJGEJGBID").Value = sJGEJGBID;
@@ -7915,7 +7915,7 @@ namespace GThinking.U20261363_N_XLXSBJ
{
double dSHL = CMISproConvert.StrToFloat(strJJYZZ[i - 1]);
BJFLXX flxx = GetBJFLXX(sBJFLID);
double dQTSH = GetCLCBSH(sBJFLID, sBJRQ, sBJDID, dicXLJBXX["XLXHID"], dicXLJBXX["XLGGID"], dicXLJBXX["XLBZID"], dicXLJBXX["DYDJID"], flxx.XLXSBJFL_TBJCLID, flxx.XLXSBJFL_LBJCLID, "QTCLSH", sTJ, sLJ) * dSHL / 100.0;
double dQTSH = GetCLCBSH(sBJFLID, sBJRQ, sBJDID, dicXLJBXX["XLXHID"], dicXLJBXX["XLGGID"], dicXLJBXX["XLBZID"], dicXLJBXX["DYDJID"], flxx.XLXSBJFL_TBJCLID, flxx.XLXSBJFL_LBJCLID, "QTCLSH", sTJ, sLJ, bHSBZ) * dSHL / 100.0;
strJJYZZ[i - 1] = dQTSH.ToString();
}
@@ -8002,7 +8002,7 @@ namespace GThinking.U20261363_N_XLXSBJ
{
double dSHL = CMISproConvert.StrToFloat(strJJYZZ[i - 1]);
BJFLXX flxx = GetBJFLXX(sBJFLID);
double dDTSH = GetCLCBSH(sBJFLID, sBJRQ, sBJDID, dicXLJBXX["XLXHID"], dicXLJBXX["XLGGID"], dicXLJBXX["XLBZID"], dicXLJBXX["DYDJID"], flxx.XLXSBJFL_TBJCLID, flxx.XLXSBJFL_LBJCLID, "DTCLSH", sTJ, sLJ) * dSHL / 100.0;
double dDTSH = GetCLCBSH(sBJFLID, sBJRQ, sBJDID, dicXLJBXX["XLXHID"], dicXLJBXX["XLGGID"], dicXLJBXX["XLBZID"], dicXLJBXX["DYDJID"], flxx.XLXSBJFL_TBJCLID, flxx.XLXSBJFL_LBJCLID, "DTCLSH", sTJ, sLJ, bHSBZ) * dSHL / 100.0;
strJJYZZ[i - 1] = dDTSH.ToString();
}
if (GetYZXXByYZID("JZ" + i.ToString().PadLeft(2, '0')).XLXSTZYZ_YZMC == "销售毛利")
@@ -8110,11 +8110,10 @@ namespace GThinking.U20261363_N_XLXSBJ
return sJSJ + "," + sUpdJJYZList;
}
public static double GetCLCBSH(string sBJFLID, string sBJRQ, string sBJDID, string sXLXHID, string sXLGGID, string sXLBZID, string sDYDJID, string sTBJCLID, string sLBJCLID, string CLLX, string sTJ, string sLJ)
public static double GetCLCBSH(string sBJFLID, string sBJRQ, string sBJDID, string sXLXHID, string sXLGGID, string sXLBZID, string sDYDJID, string sTBJCLID, string sLBJCLID, string CLLX, string sTJ, string sLJ, bool bHSBZ)
{
double dCLCB1 = 0.0;
double dCLCB2 = 0.0;
bool bHSBZ = CMISproDataBase.ExistsRecord("DBERP", string.Format("select 1 from XLXSBJD where XLXSBJD_BJDID='{0}' and XLXSBJD_JZBJHS='Y' ", sBJDID));
TDatabase dberp = TContextDatabases.GetDatabase("DBERP");
TSQL sSQL = new TSQL(dberp);