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

yusijie

2023-01-04 9bf9b1c4df6f49d770858410974fc3cbd960c5e5

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -363,6 +363,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("物料同步插件,保存方法执行完成异常：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff")+ e.Message.ToString());
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
@@ -480,22 +481,11 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
@@ -915,7 +905,7 @@
                Double HProdQty = mainList[0].HProdQty;
                Double HProdWeight = mainList[0].HProdWeight;
                string HRemark = mainList[0].HRemark;
                string HMaker = mainList[0].HMaker;
                string HUpDater = mainList[0].HUpDater;
                string HMaterNumber = mainList[0].HMaterNumber;
                string HSupNumber = mainList[0].HSupNumber;
                long HPrintQty = mainList[0].HPrintQty;
@@ -936,7 +926,7 @@
                ",HYear='" + HYear.ToString() + "'" +
                ",HPeriod='" + HPeriod.ToString() + "'" +
                ",HRemark='" + HRemark + "'" +
                ",HUpDater='" + HMaker + "'" +
                ",HUpDater='" + HUpDater + "'" +
                ",HUpDateDate=getdate()" +
                //========================================
                ",HMouldNo='" + HMouldNo + "'" +
@@ -977,7 +967,7 @@
                ",HNowSupID=" + HNowSupID.ToString() +
                ",HNowSupTypeID=" + HNowSupTypeID.ToString() +
                ",HProdWeight=" + HProdWeight.ToString() +
                ",HBarCode=" + HBarCode.ToString() +
                ",HBarCode='" + HBarCode.ToString() + "'" +
                " where HInterID=" + HInterID.ToString());

                //修改子项目代码