chenhaozhe
2025-06-27 905e88d6a8acc124f3c5c2c28430dbccc1780409
WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormImportController.cs
@@ -614,9 +614,21 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //查找是否存在对应生产订单
                    string sql1 = string.Format("select * from h_v_IF_ICMOBillList where å®¢æˆ·è®¢å•号='{0}' and äº§å“ä»£ç ='{1}' and çŠ¶æ€ in ('计划确认','开工')",
                        tb2.Rows[i]["客户订单号"].ToString(), tb2.Rows[i]["物料编码"].ToString());
                    string sql1 = "";
                    //明细行号为空不考虑
                    if (tb2.Rows[i]["明细行号"].ToString() == "")
                    {
                        //查找是否存在对应生产订单
                        sql1 = string.Format("select * from h_v_IF_ICMOBillList where å®¢æˆ·è®¢å•号='{0}' and äº§å“ä»£ç ='{1}' and çŠ¶æ€ in ('计划确认','开工')",
                            tb2.Rows[i]["客户订单号"].ToString(), tb2.Rows[i]["物料编码"].ToString());
                    }
                    else
                    {
                        //查找是否存在对应生产订单
                        sql1 = string.Format("select * from h_v_IF_ICMOBillList where å®¢æˆ·è®¢å•号='{0}' and äº§å“ä»£ç ='{1}' and çŠ¶æ€ in ('计划确认','开工') and æ˜Žç»†è¡Œå· = '{2}'",
                            tb2.Rows[i]["客户订单号"].ToString(), tb2.Rows[i]["物料编码"].ToString(),tb2.Rows[i]["明细行号"].ToString());
                    }
                    ds = oCN.RunProcReturn(sql1, "h_v_IF_ICMOBillList");
                    if (ds.Tables[0].Rows.Count == 0)
@@ -917,9 +929,20 @@
                        }
                    }
                    //查找是否存在对应生产订单
                    string sql1 = string.Format("select * from h_v_IF_ICMOBillList where å®¢æˆ·è®¢å•号='{0}' and äº§å“ä»£ç ='{1}' and çŠ¶æ€ in ('计划确认','开工')",
                        tb2.Rows[i]["客户订单号"].ToString(), tb2.Rows[i]["物料编码"].ToString());
                    string sql1 = "";
                    //明细行号为空不考虑
                    if (tb2.Rows[i]["明细行号"].ToString() == "")
                    {
                        //查找是否存在对应生产订单
                        sql1 = string.Format("select * from h_v_IF_ICMOBillList where å®¢æˆ·è®¢å•号='{0}' and äº§å“ä»£ç ='{1}' and çŠ¶æ€ in ('计划确认','开工')",
                            tb2.Rows[i]["客户订单号"].ToString(), tb2.Rows[i]["物料编码"].ToString());
                    }
                    else
                    {
                        //查找是否存在对应生产订单
                        sql1 = string.Format("select * from h_v_IF_ICMOBillList where å®¢æˆ·è®¢å•号='{0}' and äº§å“ä»£ç ='{1}' and çŠ¶æ€ in ('计划确认','开工') and æ˜Žç»†è¡Œå· = '{2}'",
                            tb2.Rows[i]["客户订单号"].ToString(), tb2.Rows[i]["物料编码"].ToString(), tb2.Rows[i]["明细行号"].ToString());
                    }
                    ds = oCN.RunProcReturn(sql1, "h_v_IF_ICMOBillList");
                    if (ds.Tables[0].Rows.Count == 0)
@@ -1096,6 +1119,8 @@
                        var HSourceID = list[i]["HSourceID"].ToString();
                        var HYX = list[i]["优先级"].ToString();
                        var HPlanEndDate = list[i]["计划结束日期"].ToString();
                        //更新时删除子表内容
                        oCN.RunProc($"delete from Sc_WorkBillSortBillSub where HInterID ={hmainid}");
                        //更新小时产能
                        if (HWorkQty != ""&& HWorkQty != "0")
                        {