合并分支

chenhaozhe

2026-04-13 b76803783b4c5df1f9c540926896c4b319fff249

 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs

@@ -4007,7 +4007,7 @@
        #region 解除包装关系、拆除物料(1:解除包装关系；2.拆除物料)
        [Route("Cj_SingleStation/DelRelation")]
        [HttpGet]
        public object DelRelation(string HBarCodeIDs, Int64 HICMOInterID, Int64 HICMOEntryID, Int64 HProcID, Int64 HType, string user)
        public object DelRelation(string HBarCodeIDs, Int64 HICMOInterID, Int64 HICMOEntryID, Int64 HProcID, Int64 HType, string user, string HUnBindMaterArr)
        {
            try
            {
@@ -4021,7 +4021,7 @@
                }
                else
                {
                    string sql = "exec h_p_Sc_DelbindBarRelation '" + HBarCodeIDs + "'," + HICMOInterID + "," + HICMOEntryID + "," + HProcID + "," + HType;
                    string sql = "exec h_p_Sc_DelbindBarRelation '" + HBarCodeIDs + "'," + HICMOInterID + "," + HICMOEntryID + "," + HProcID + "," + HType + ",'" + HUnBindMaterArr + "'";
                    ds = oCN.RunProcReturn(sql, "h_p_Sc_DelbindBarRelation");
                }