Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

chenhaozhe

2025-10-27 96475c2fd6a0f8b11c24f06ca65d9d8955302b26

 DAL/²Ö¿â¹ÜÀí/ClsKf_SellOutBillForLayUI.cs

@@ -53,7 +53,7 @@
                }
                else if (DetailColl[0].HSourceBillType == "1402")                    //发货通知单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Add " + lngBillKey.ToString());
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Delete " + lngBillKey.ToString());
                }
                else
                {
@@ -170,6 +170,7 @@
                    ",HSTOCKORGID = " + omodel.HOrgID + "" +
                    ",HOWNERID = " + omodel.HOrgID + "" +
                    ",HOrgID = " + omodel.HOrgID + "" +
                    ",HBillNo='" + omodel.HBillNo + "'" +
                    ",HMainSourceInterID = " + omodel.HMainSourceInterID + "" +
                    ",HMainSourceEntryID = " + omodel.HMainSourceEntryID + "" +
                    ",HMainSourceBillNo = '" + omodel.HMainSourceBillNo + "'" +
@@ -219,7 +220,7 @@
                     ",HSPID,HSCWHID,HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
                     ",HQty_Full,HQty_Empty,HQty_Back,HCostPrice,HCostMoney,HSalePrice" +
                     ",HPropertyID,HSecUnitID,HSecUnitRate" +
                     ",HEngineNum,HUnderPanNum,HLeaveFactCard" +
                     ",HEngineNum,HUnderPanNum,HLeaveFactCard,HReqBuyQty,HReqOutQty,HCurrentInventory" +
                     ") values(" +
                     "" + omodel.HInterID.ToString() + "" +
                     "," + (HEntryID++) + "" +
@@ -274,6 +275,9 @@
                     ",'" + oSub.HEngineNum + "'" +
                     ",'" + oSub.HUnderPanNum + "'" +
                     ",'" + oSub.HLeaveFactCard + "'" +
                     "," + oSub.HReqBuyQty +
                     "," + oSub.HReqOutQty +
                     "," + oSub.HCurrentInventory +
                     ") ";

                    oCn.RunProc(subSql);
@@ -305,7 +309,7 @@
                //控制关联数量

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("h_p_Kf_SellOutBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBill_AfterSaveCtrl");
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Kf_SellOutBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败！";
@@ -384,7 +388,7 @@
                    "," + omodel.HYear.ToString() + "" +
                    "," + omodel.HPeriod.ToString() + "" +
                    ",'" + this.BillType + "'" +
                    ",'" + this.HBillSubType + "'" +
                    ",'" + omodel.HBillSubType + "'" +
                    ",'" + omodel.HRemark + "'" +
                    ",'" + omodel.HMaker + "'" +
                    "," + "getdate()" + "" +
@@ -464,7 +468,7 @@
                      ",HSPID,HSCWHID,HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
                      ",HQty_Full,HQty_Empty,HQty_Back,HCostPrice,HCostMoney,HSalePrice" +
                      ",HPropertyID,HSecUnitID,HSecUnitRate" +
                      ",HEngineNum,HUnderPanNum,HLeaveFactCard" +
                      ",HEngineNum,HUnderPanNum,HLeaveFactCard,HReqBuyQty,HReqOutQty,HCurrentInventory" +
                      ") values(" +
                      "" + omodel.HInterID.ToString() + "" +
                      "," + (HEntryID++) + "" +
@@ -519,6 +523,9 @@
                      ",'" + oSub.HEngineNum + "'" +
                      ",'" + oSub.HUnderPanNum + "'" +
                      ",'" + oSub.HLeaveFactCard + "'" +
                      "," + oSub.HReqBuyQty +
                      "," + oSub.HReqOutQty + 
                      "," + oSub.HCurrentInventory +
                      ") ";

                    oCn.RunProc(subSql);
@@ -550,7 +557,7 @@

                //
                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("h_p_Kf_SellOutBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBill_AfterSaveCtrl");
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Kf_SellOutBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败！";