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

chenhaozhe

昨天 26811940119aa8e107c65d72a19bd172d7d1854e

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -632,6 +632,15 @@
                        objJsonResult.Verify = "N";
                    }
                }
                //判断是否是新增
                if ("Add".Equals(eventType))
                {
                    //判断客户为海诚 同步金蝶工序汇报单
                    if (oSystemParameter.omodel.WMS_CampanyName == "海诚")
                    {
                        object objResult = set_SaveStationOutBill_CLD_Json(HInterID, HBillNo, user);
                    }
                }
                sw.Stop();//结束计时
                LogService.Write($"11.参数查询结束,新增结束，用时" + sw.Elapsed);
                LogService.Write("END--出站单据保存结束，出站单号：" + HBillNo);
@@ -4359,6 +4368,25 @@
        {
            try
            {
                //同步前控制=========================================
                ds = oCN.RunProcReturn("Exec  h_p_Sc_StationOutBill_BeforeSyncCtrl  " + HInterID.ToString() + ", '" + HBillNo + "','" + HMaker + "'", " h_p_Sc_StationOutBill_BeforeSyncCtrl ");
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "[0000-2-012]保存前判断失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "[0000-1-051]同步失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //=========================================================
                if (oWebs.set_SaveStationOutBill_CLD(HInterID, HBillNo, HMaker, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";