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

YL

2022-01-17 86caf686b39e00ba072bcbdf65388250a6abe5d4

 WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs

@@ -150,7 +150,7 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    ds = oCn.RunProcReturn("Select * from Sc_PackUnionBillMain where HinterID='" + lngBillKey, "Sc_PackUnionBillMain");
                    ds = oCn.RunProcReturn("Select * from Sc_PackUnionBillMain where HinterID=" + lngBillKey, "Sc_PackUnionBillMain");
                    var HBarCode_Pack = ds.Tables[0].Rows[0]["HBarCode_Pack"].ToString();
                    if (ds.Tables.Count < 1)
                    {