a

07.珠海英搏尔/Enpower.Python/POSH_CB_PROCOSTRESULTREC/产品成本还原查询报表_20240819.py

@@ -54,14 +54,14 @@ def ShowReturnData(resultData):
     else:
         filterString = resultData.ReturnData.FilterString;
         if filterString != None and filterString != "":
-            whereSql += " AND " + filterString.replace("FBILLNO","t0.FPRODUCTNO");
+            whereSql += " AND " + filterString.replace("FBILLNO","t0.FPRODUCTNO").replace("FACCTGORGID","t2.FACCTGORGID");
         
         customFilter = resultData.ReturnData.CustomFilter;
         if customFilter != None:
             FYear = customFilter["FYear"]
             FPeriod = customFilter["FPeriod"]
             yearVal = 0 if FYear == None or FYear == "" else int(FYear)
-            periodVal = 0 if FPeriod == None or FPeriod == "" else int(FPeriod)            
+            periodVal = 0 if FPeriod == None or FPeriod == "" else int(FPeriod)
             if yearVal > 0:
                 if periodVal > 0:
                     dateVal = str(yearVal * 100 + periodVal)
@@ -100,12 +100,12 @@ SET @ACCTGORGID = 1
 		,t3.FSUMQUALIFIEDINQTY AS '累计完工数量'
         ,RANK() OVER (PARTITION BY t0.FBILLID,t0.FBILLENTRYID ORDER BY (t2.FYEAR * 100 + t2.FPERIOD) DESC) 'RN'
 		,(t2.FYEAR * 100 + t2.FPERIOD) AS 'FPERIOD'
+        ,t2.FACCTGORGID
     FROM T_CB_PROORDERDIME t0
         INNER JOIN V_CB_PROORDERINFO t1 on t1.FPRODUCTDIMEID = t0.FPRODUCTDIMEID
         INNER JOIN V_HS_OUTACCTG t2 on t1.FACCTGID = t2.FID
         LEFT JOIN V_CB_COSTCALEXPENSE t3 on t3.FID = t1.FID
     WHERE 1 = 1
-        AND t2.FACCTGORGID = @ACCTGORGID
         AND t2.FCOMPUTEID != ''
         AND t1.FENDINITKEY = 1
         AND t0.FFORMID = 'PRD_MO'
@@ -136,21 +136,23 @@ WHERE t0.RN = 1
             
             period = data["FPERIOD"]
             billNo = data["FPRODUCTNO"]
-            
+            acctgOrgId = data["FACCTGORGID"]
             # row["FRN"] = data["FRN"]
             row["FMoBillNo"] = billNo
             row["FProMaterialNumber"] = data["FNUMBER"]
             row["FProMaterialName"] = data["FNAME"]
             row["FQUALIFIEDINQTY"] = data["本期完工数量"]
+            _cResult = "错误"
             # raise Exception("AAAA2");
             num = num + 1
             this.View.Session["ProcessRateValue"] = int(num * 100/ count);
             this.View.Session["ProcessTips"] = "共{0}条数据,已处理{1}条数据，正在处理{2}".format(count,(num-1),billNo);
             
-            costDataList = GetExecCost(billNo,period,1)
+            costDataList = GetExecCost(billNo, period, acctgOrgId)
             
             if costDataList != None and costDataList.Count > 0:
                 costData = costDataList[0]
+                _cResult = "完成"
                 row["FMaterialCostQ"] = float(costData["原材料Q1"])
                 row["FLaborCostS"] = costData["直接人工S"]
                 row["FProcessCostO"] = costData["制造费用O"]
@@ -172,6 +174,7 @@ WHERE t0.RN = 1
                 row["FO15"] = costData["制造费用_委外加工费"]
                 row["FALLHRWORKTIME"] = costData["总工时"]
                 
+            row["FResult"] = _cResult
             proRows.Add(row)
             # raise Exception("AAAA3");
     this.View.UpdateView("FEntity")