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

yusijie

2023-03-27 b7ca9d7706ecb5037c9f23b419aa6ba52dcdc048

 WebAPI/Controllers/MoveStockBillController.cs

@@ -614,7 +614,7 @@
                websLsmain.HBillerID = 0;
                websLsmain.HExplanation = "";
                websLsmain.HInnerBillNo = "";
                websLsmain.HRedBlueFlag = true;
                websLsmain.HRedBlueFlag = false;
                websLsmain.HMainSourceBillType = "-1";
                websLsmain.HStockStyle = "";
                websLsmain.HBillType = "1207";
@@ -622,34 +622,34 @@
                websLsmain.HSupID = 0;
                //websLsmain.HGroupID = lsmain[0].HGroupID;
                string sErrMsg = "";
                //上传前判断
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBill_AR " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillNo + "','" + websLsmain.HBillType + "'", "h_p_WMS_BeforeUpload_MoveStockBill_AR");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    sErrMsg = "校验上传前判断，发生错误！"; 
                    //return false;
                ////上传前判断
                //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                //DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBill_AR " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillNo + "','" + websLsmain.HBillType + "'", "h_p_WMS_BeforeUpload_MoveStockBill_AR");
                //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                //{
                //    sErrMsg = "校验上传前判断，发生错误！"; 
                //    //return false;

                    objJsonResult.code = "99";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败！" + sErrMsg;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
                    {
                        sErrMsg = "单据号：" + websLsmain.HBillNo + "，单据ID：" + websLsmain.HInterID + "；" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                        //return false;
                        objJsonResult.code = "99";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "上传失败！" + sErrMsg;
                        objJsonResult.data = null;
                        return objJsonResult;
                //    objJsonResult.code = "99";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "上传失败！" + sErrMsg;
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //else
                //{
                //    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
                //    {
                //        sErrMsg = "单据号：" + websLsmain.HBillNo + "，单据ID：" + websLsmain.HInterID + "；" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                //        //return false;
                //        objJsonResult.code = "99";
                //        objJsonResult.count = 0;
                //        objJsonResult.Message = "上传失败！" + sErrMsg;
                //        objJsonResult.data = null;
                //        return objJsonResult;

                    }
                }
                //    }
                //}