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

yusijie

2023-01-03 919f5fcd6818d7a62f7cd149e051e4ae48cfd3f6

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

 DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckRuleBill.cs

@@ -8,8 +8,8 @@
    public class ClsSc_MouldDotCheckRuleBill : DBUtility.ClsXt_BaseBill
    {
        public Model.ClsSc_MouldDotCheckRuleBillMain omodel = new Model.ClsSc_MouldDotCheckRuleBillMain();
        public List<Model.ClsSc_MouldDotCheckRuleBillSub> DetailCol = new List<Model.ClsSc_MouldDotCheckRuleBillSub>();
        public List<Model.ClsSc_MouldDotCheckRuleBillSub_Item> DetailColl = new List<Model.ClsSc_MouldDotCheckRuleBillSub_Item>();
        public List<Model.ClsSc_MouldDotCheckRuleBillSub>  DetailColl = new List<Model.ClsSc_MouldDotCheckRuleBillSub>();
        public List<Model.ClsSc_MouldDotCheckRuleBillSub_Item> DetailCol = new List<Model.ClsSc_MouldDotCheckRuleBillSub_Item>();

        public ClsSc_MouldDotCheckRuleBill()
        {
@@ -61,7 +61,7 @@
                //oCn.RunProc("delete from Sc_MouldDotCheckRuleBillSub_Item where HInterID=" + lngBillKey);
                ////插入子表
                omodel.HInterID = lngBillKey;
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub oSub in DetailCol)
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckRuleBillSub " +
                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
@@ -122,7 +122,7 @@
                
                ") ");
                ////插入子表
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub oSub in DetailCol)
                foreach (Model.ClsSc_MouldDotCheckRuleBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckRuleBillSub " +
                     " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
@@ -211,7 +211,7 @@
                //循环
                DataSet DsSub;
                DsSub = oCn.RunProcReturn("Select * from Sc_MouldDotCheckRuleBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldDotCheckRuleBillSub");
                DetailCol.Clear();//清空
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Model.ClsSc_MouldDotCheckRuleBillSub oSub = new Model.ClsSc_MouldDotCheckRuleBillSub();
@@ -235,7 +235,7 @@
                    oSub.HClaim = DsSub.Tables[0].Rows[0]["HClaim"].ToString().Trim();
                    oSub.HManagerID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HManagerID"]);
                   
                    DetailCol.Add(oSub);
                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功！";
                return true;

 DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainPlanBill.cs

@@ -103,8 +103,8 @@
                          ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
                          "," + Item.HManagerID.ToString() +
                          ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
                          "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() + "," + Item.HMaintainItem.ToString() +
                          ") ");
                          "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() + ",'" + Item.HMaintainItem.ToString() +
                          "') ");
                }
                //
                //foreach (Model.ClsSc_MouldMaintainPlanBillSub oSub in DetailColl)

 WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs

@@ -146,7 +146,7 @@
                    item.HSourceInterID = 0;     // æºå•ä¸»å†…码
                    item.HSourceEntryID = 0;   //源单子内码
                    item.HRelationQty = 0;     //关联数量
                    oBill.DetailCol.Add(item);
                    oBill.DetailColl.Add(item);

                }