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

zzr99

2022-05-27 9305340d0d22505ead926186eb5bc441c9cbf76b

 WebAPI/Controllers/²©ÈÕ×Ô¶¯É¨ÂëÏß/ScanlineAPIController.cs

@@ -84,6 +84,7 @@
                    ds = oCN.RunProcReturn("Select HBarCode barcode,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType from Gy_BarCodeBill where HSourceBillNo='" + list.billno.ToString().Trim() + "'  Order by HItemID ", "Gy_BarCodeBill");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        LogService.Write("当前订单无绑定条码");
                        objJsonResult.status = -1;
                        objJsonResult.msg = "当前订单无绑定条码!";
                        objJsonResult.data = null;
@@ -95,6 +96,7 @@
                    if (strList.Count > 0)
                    {
                        string Str = String.Join(",", strList.ToArray());
                        LogService.Write("条码:" + Str.ToString() + " ä¸åŒ…含在订单:" + list.billno + "中!");
                        objJsonResult.status = -1;
                        objJsonResult.msg = "条码:" + Str.ToString() + " ä¸åŒ…含在订单:" + list.billno + "中!";
                        objJsonResult.data = null;
@@ -106,6 +108,7 @@
                bool IsBarCodePack = oBill.IsBarCodePack(list.packagebarcode);
                if (IsBarCodePack == false)
                {
                    LogService.Write("箱码已存在,不能重复绑定！");
                    objJsonResult.status = -1;
                    objJsonResult.msg = "箱码已存在,不能重复绑定！";
                    objJsonResult.data = null;
@@ -114,6 +117,7 @@
                ds = oCN.RunProcReturn("Select * from Gy_BarCodeBill where HBarCode='" + list.packagebarcode.ToString().Trim() + "' and HStopflag='1'", "Gy_BarCodeBill");
                if (ds != null && ds.Tables[0].Rows.Count > 0)
                {
                    LogService.Write("此箱条码已作废");
                    objJsonResult.status = -1;
                    objJsonResult.msg = "此箱条码已作废";
                    objJsonResult.data = null;
@@ -158,6 +162,7 @@
                    bool IsBarCode = oBill.IsBarCodePack(list.barcodes[i].barcode);
                    if (IsBarCodePack == false)
                    {
                        LogService.Write("条码已存在,不能重复绑定！");
                        objJsonResult.status = -1;
                        objJsonResult.msg = "条码已存在,不能重复绑定！";
                        objJsonResult.data = null;
@@ -200,14 +205,16 @@
                }
                if (bResult)
                {
                    LogService.Write("提交成功箱条码：" + list.packagebarcode);
                    Log.LogSaveInfo("提交成功箱条码：" + list.packagebarcode); //记录提交数据
                    objJsonResult.status = 0;
                    objJsonResult.msg = "success";
                    objJsonResult.data = null;
                    Log.LogSaveInfo("提交成功箱条码：" + list.packagebarcode); //记录提交数据
                    return objJsonResult;
                }
                else
                {
                    LogService.Write("保存失败：" +DBUtility.ClsPub.sExeReturnInfo);
                    objJsonResult.status = -1;
                    objJsonResult.msg = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
@@ -216,6 +223,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("箱条码绑定关系提交接口 æŠ›å‡ºå¼‚常" + e.Message.ToString());
                objJsonResult.status = -1;
                objJsonResult.msg = e.Message;
                objJsonResult.data = null;