diff --git a/03.珠海市汇威精密制造有限公司/HUIWEI.Python/产品Bom层级缺料分析查询表/产品Bom缺料分析报表构造.py b/03.珠海市汇威精密制造有限公司/HUIWEI.Python/产品Bom层级缺料分析查询表/产品Bom缺料分析报表构造.py index 7da4abc..d0783ca 100644 --- a/03.珠海市汇威精密制造有限公司/HUIWEI.Python/产品Bom层级缺料分析查询表/产品Bom缺料分析报表构造.py +++ b/03.珠海市汇威精密制造有限公司/HUIWEI.Python/产品Bom层级缺料分析查询表/产品Bom缺料分析报表构造.py @@ -128,7 +128,10 @@ FROM T_BD_MATERIAL t0 WHERE 1=1 AND tt0.FSTOCKID != 106441 --104-07 装配线边仓2 AND tt0.FSTOCKID != 106446 --203-07 装配线边仓1 + AND tt0.FSTOCKID != 106455 --605-08 待处理仓 + AND tt0.FSTOCKID != 750629 --105-02 OEM待处理仓 AND tt0.FSTOCKID != 813683 --104-08 装配线边仓3 + AND tt0.FSTOCKID != 962875 --106-03 OEM装配线边仓 GROUP BY tt0.FMATERIALID,tt0.FSTOCKORGID ) t3 on t3.FMATERIALID = t0.FMASTERID AND t3.FSTOCKORGID = t0.FUSEORGID LEFT JOIN ( diff --git a/03.珠海市汇威精密制造有限公司/HUIWEI.Python/生产投料bom层级展示.py b/03.珠海市汇威精密制造有限公司/HUIWEI.Python/生产投料bom层级展示.py index a743537..df259b4 100644 --- a/03.珠海市汇威精密制造有限公司/HUIWEI.Python/生产投料bom层级展示.py +++ b/03.珠海市汇威精密制造有限公司/HUIWEI.Python/生产投料bom层级展示.py @@ -278,11 +278,11 @@ SELECT ,t0e.FENTRYID ,t0e.FMATERIALID ,t0e_a.FREPQUAQTY + ,t0e_a.FSTATUS '业务状态' --,t0e_a.FREQSRC --1.销售订单 ,(CASE WHEN t1e.FSRCBILLNO is null THEN (CASE t0e_a.FREQSRC WHEN 1 THEN t0e.FSALEORDERNO ELSE '' END) ELSE t1e.FSRCBILLNO END) AS 'FSALEORDERNO' INTO #TEMPMO -FROM - T_PRD_MO t0 +FROM T_PRD_MO t0 INNER JOIN T_PRD_MOENTRY t0e ON t0.FID = t0E.FID INNER JOIN T_PRD_MOENTRY_A t0e_a ON t0e_a.FENTRYID = t0e.FENTRYID LEFT JOIN T_SAL_DELIVERYNOTICEENTRY t1e ON t1e.FENTRYID = t0e.FSRCBILLENTRYID AND t0e.FSRCBILLID = t0e.FSALEORDERID diff --git a/05.长园/CYG/销售合同数据计算/销售合同计算_20250618.sql b/05.长园/CYG/销售合同数据计算/销售合同计算_20250618.sql index a618afc..739bd84 100644 --- a/05.长园/CYG/销售合同数据计算/销售合同计算_20250618.sql +++ b/05.长园/CYG/销售合同数据计算/销售合同计算_20250618.sql @@ -63,7 +63,7 @@ FROM # ,t0f.FCONTRACTAMOUNT_LC AS 'ͬ' ,t0.F_CYG_ORIGINAL_AMOUNT AS 'ԭʼͬ' --,ISNULL(t4.FCONTRACTAMOUNT_X,t0f.F_CYG_CONTRACTCHANGE) AS 'ͬ仯' - ,t0f.FCONTRACTAMOUNT_LC - t0.F_CYG_ORIGINAL_AMOUNT AS 'ͬ仯' + ,t0f.FCONTRACTAMOUNT - t0.F_CYG_ORIGINAL_AMOUNT AS 'ͬ仯' ,ISNULL(t1.ۼ۶λ,0) AS 'ۼ۶λ' ,ISNULL(t1.С,0) AS 'С' ,ISNULL(t1.⹺С,0) AS '⹺С' diff --git a/07.珠海英搏尔/Enpower.Python/工单工时还原202410260937.sql b/07.珠海英搏尔/Enpower.Python/工单工时还原202410260937.sql index ab9d0e5..557ba91 100644 --- a/07.珠海英搏尔/Enpower.Python/工单工时还原202410260937.sql +++ b/07.珠海英搏尔/Enpower.Python/工单工时还原202410260937.sql @@ -206,7 +206,7 @@ BEGIN AND t2.FCOMPUTEID != '' AND t1.FENDINITKEY = 1 --AND t4.FSUMQUALIFIEDINQTY != 0 - AND tt.FLEVEL < 2 + --AND tt.FLEVEL < 2 ) , #ɱת AS ( SELECT * diff --git a/GZ.LJY000.PiLot/SAL_OUTSTOCK/UploadExtension/BillEventPlugInEx.cs b/GZ.LJY000.PiLot/SAL_OUTSTOCK/UploadExtension/BillEventPlugInEx.cs index c855a23..3d8bf8a 100644 --- a/GZ.LJY000.PiLot/SAL_OUTSTOCK/UploadExtension/BillEventPlugInEx.cs +++ b/GZ.LJY000.PiLot/SAL_OUTSTOCK/UploadExtension/BillEventPlugInEx.cs @@ -142,7 +142,7 @@ namespace GZ.LJY000.PiLot.SAL_OUTSTOCK.UploadExtension } /// - /// + /// 执行上传 /// private void DoUpLoad() {