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

wtt

2024-08-07 c2ef1e65edb97ddbd00cc130e9f4dd9d47e0252d

 WebAPI/DLL/ClsSc_MESBeginWorkBill.cs

@@ -9,12 +9,13 @@
    {
        public Models.ClsSc_MESBeginWorkBillMain omodel = new Models.ClsSc_MESBeginWorkBillMain();
        public List<Models.ClsSc_MESBeginWorkBillSub> DetailColl = new List<Models.ClsSc_MESBeginWorkBillSub>();
        public List<Models.ClsSc_MESBeginWorkBillSub_RelationBill> DetailCol2 = new List<Models.ClsSc_MESBeginWorkBillSub_RelationBill>();
        //public List<Model.ClsSc_MESBeginWorkBillSub_Item> DetailColl1 = new List<Model.ClsSc_MESBeginWorkBillSub_Item>();

        public ClsSc_MESBeginWorkBill()
        {
            base.MvarItemKeySub = "Sc_MESBeginWorkBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub2 = "Sc_MESBeginWorkBillSub_RelationBill";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey="Sc_MESBeginWorkBillMain";
@@ -152,8 +153,41 @@
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                DeleteBillSub2(lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;

                //插入子表_副产计划
                foreach (Models.ClsSc_MESBeginWorkBillSub_RelationBill oSub in DetailCol2)
                {
                    string subSql = "insert into Sc_MESBeginWorkBillSub_RelationBill " +
                        "(HInterID, HEntryID,HBillNo_bak, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HRemark, " +
                        "HRelationBillInterID, HRelationBillEntryID, HRelationBillNo, HRelationBillType, HICMOInterID, HICMOEntryID, HICMOBillNo, " +
                        "HProcExchInterID, HProcExchEntryID, HProcExchBillNo, HMaterID, HProcID) " +
                        "values(" +
                        "'" + omodel.HInterID.ToString() + "'," +
                        "'" + oSub.HEntryID.ToString() + "'," +
                        "'" + omodel.HBillNo + "'," +
                        "'" + oSub.HSourceInterID + "'," +
                        "'" + oSub.HSourceEntryID + "'," +
                        "'" + oSub.HSourceBillNo + "'," +
                        "'" + oSub.HSourceBillType + "'," +
                        "'" + oSub.HRemark + "'," +
                        "'" + oSub.HRelationBillInterID + "'," +
                        "'" + oSub.HRelationBillEntryID + "'," +
                        "'" + oSub.HRelationBillNo + "'," +
                        "'" + oSub.HRelationBillType + "'," +
                        "'" + oSub.HICMOInterID + "'," +
                        "'" + oSub.HICMOEntryID + "'," +
                        "'" + oSub.HICMOBillNo + "'," +
                        "'" + oSub.HProcExchInterID + "'," +
                        "'" + oSub.HProcExchEntryID + "'," +
                        "'" + oSub.HProcExchBillNo + "'," +
                        "'" + oSub.HMaterID + "'," +
                        "'" + oSub.HProcID + "')";
                    oCn.RunProc(subSql);
                }

                foreach (Models.ClsSc_MESBeginWorkBillSub oSub in DetailColl)
                {
                    //oCn.RunProc("Insert into Sc_MESBeginWorkBillSub " +
@@ -249,6 +283,38 @@
                "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate(),'"+ omodel.HRunStatus + "','"+ omodel.HSourceBeginQty.ToString() + "'" +
              ") ");

                //插入子表
                foreach (Models.ClsSc_MESBeginWorkBillSub_RelationBill oSub in DetailCol2)
                {
                    string subSql = "insert into Sc_MESBeginWorkBillSub_RelationBill " +
                        "(HInterID, HEntryID,HBillNo_bak, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HRemark, " +
                        "HRelationBillInterID, HRelationBillEntryID, HRelationBillNo, HRelationBillType, HICMOInterID, HICMOEntryID, HICMOBillNo, " +
                        "HProcExchInterID, HProcExchEntryID, HProcExchBillNo, HMaterID, HProcID) " +
                        "values(" +
                        "'" + omodel.HInterID.ToString() + "'," +
                        "'" + oSub.HEntryID.ToString() + "'," +
                        "'" + omodel.HBillNo + "'," +
                        "'" + oSub.HSourceInterID + "'," +
                        "'" + oSub.HSourceEntryID + "'," +
                        "'" + oSub.HSourceBillNo + "'," +
                        "'" + oSub.HSourceBillType + "'," +
                        "'" + oSub.HRemark + "'," +
                        "'" + oSub.HRelationBillInterID + "'," +
                        "'" + oSub.HRelationBillEntryID + "'," +
                        "'" + oSub.HRelationBillNo + "'," +
                        "'" + oSub.HRelationBillType + "'," +
                        "'" + oSub.HICMOInterID + "'," +
                        "'" + oSub.HICMOEntryID + "'," +
                        "'" + oSub.HICMOBillNo + "'," +
                        "'" + oSub.HProcExchInterID + "'," +
                        "'" + oSub.HProcExchEntryID + "'," +
                        "'" + oSub.HProcExchBillNo + "'," +
                        "'" + oSub.HMaterID + "'," +
                        "'" + oSub.HProcID + "')";
                    oCn.RunProc(subSql);
                }


                //再次验证 保存是否 合理
                ds = oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_SaveCtrl @HInterId=" + omodel.HInterID + "", "h_p_JIT_MESBeginWorkBill_SaveCtrl");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)