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

wtt

6 天以前 eb81d0bafea6f4af9a17045e67fc8fe09b6bc353

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

 DAL/ClsWL_YayBillMain.cs

@@ -231,6 +231,7 @@
                // èŽ·å–当前日期时间，用于空日期字段的默认值
                // èŽ·å–当前日期时间
                string currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                string safeDateTime = "2000-01-01";
                // è¾…助方法：安全转换为字符串，处理null和空字符串


@@ -303,21 +304,21 @@
                           SafeDateTime(omodel.HDateForRequestedPick?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeDateTime(omodel.HDataForRequestedArrived?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeInt(omodel.HCarryStatus?.ToString(), 1) + "," + // HCarryStatus
                           SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + safeDateTime + "'") + "," +
                           SafeDateTime(omodel.HDate_AllocationDriver?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeInt(omodel.HCarID?.ToString(), 0) + "," + // HCarID
                           SafeInt(omodel.HDriverID?.ToString(), 0) + "," + // HDriverID
                           "'" + SafeString(omodel.HSurer_Arrive) + "'," +
                           SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + safeDateTime + "'") + "," +
                           "'" + SafeString(omodel.HSurer_Pick) + "'," +
                           SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + safeDateTime + "'") + "," +
                           "'" + SafeString(omodel.HSurer_Trans) + "'," +
                           SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + safeDateTime + "'") + "," +
                           "'" + SafeString(omodel.HSurer_Receive) + "'," +
                           "'" + omodel.HExRate + "'," +
                           SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + safeDateTime + "'") + "," +
                           "'" + SafeString(omodel.HSurer_Accounting) + "'," +
                           SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + currentDateTime + "'") + ")"; 
                           SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + safeDateTime + "'") + ")"; 

                oCn.RunProc(sql);
                //主表              

 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache

Binary files differ

 SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs

New file
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache

New file
@@ -0,0 +1 @@
5dd9c82feb12f833c78ecebea7d9a46c99f29e3f

 SyntacticSugar/obj/Release/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.pdb

Binary files differ

 WebAPI/Controllers/³É±¾¹ÜÀí/CB_ActualItemMoneyCostController.cs

New file
@@ -0,0 +1,78 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web;
using System.Web.Http;
using WebAPI.Models;
using WebAPI.Controllers.SCGL.日计划管理;
using System.IO;
using System.Linq;
using System.Text;

namespace WebAPI.Controllers.成本管理
{
    public class CB_ActualItemMoneyCostController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        //public DAL.ClsCB_ItemMoneyBillMain BillOld = new DAL.ClsCB_ItemMoneyBillMain();
        //public DAL.ClsCB_ItemMoneyBillMain BillNew0 = new DAL.ClsCB_ItemMoneyBillMain();

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;


        #region 
        [Route("CB_ActualItemMoneyCostController/CB_ActualItemMoneyCostList")]
        [HttpGet]
        public object CB_ActualItemMoneyCostList(string sWhere)
        {
            try
            {
                ds = oCN.RunProcReturn(sWhere, "WindowPrint");
                List<object> columnNameList = new List<object>();
                //客户制定
                string sErr = "";
                //if (oSystemParameter.ShowBill(ref sErr))
                //{
                //    if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
                //    {
                //        if (ds.Tables[0].Columns.Count > 8)
                //        {
                //            LogService.CustomWriteLog("单据号:" + ds.Tables[0].Rows[0][7].ToString(), "CS" + DateTime.Now.ToString("yyyyMMdd"));
                //        }
                //    }

                //}
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "[0000-1-037]Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/ÎïÁ÷¹ÜÀí/³öÔ˵¥/WLYayBillController.cs

@@ -446,7 +446,7 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0].Rows[0]["HDate_AllocationDriver"] == null || ds.Tables[0].Rows[0]["HDate_AllocationDriver"].ToString() == ""|| ds.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "")
                    if (ds.Tables[0].Rows[0]["HDate_AllocationDriver"] == null || ds.Tables[0].Rows[0]["HDate_AllocationDriver"].ToString() == ""|| ds.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || ds.Tables[0].Rows[0]["HDriverID"].ToString() == "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -495,7 +495,7 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0].Rows[0]["HSurer_Pick"] == null || ds.Tables[0].Rows[0]["HSurer_Pick"].ToString() == "")
                    if (ds.Tables[0].Rows[0]["HSurer_Pick"] == null || ds.Tables[0].Rows[0]["HSurer_Pick"].ToString() == "" )
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -577,7 +577,7 @@
                }
                DataSet ds;
                var dss = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
                if (dss.Tables[0].Rows[0]["HDate_CarrierSure"] == null || dss.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || dss.Tables[0].Rows[0]["HChecker"].ToString() == "")
                if (dss.Tables[0].Rows[0]["HDate_CarrierSure"] == null || dss.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || dss.Tables[0].Rows[0]["HChecker"].ToString() == "" || dss.Tables[0].Rows[0]["HDate_CarrierSure"] == "2000-01-01 00:00:00.000")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;

 WebAPI/WebAPI.csproj

@@ -709,6 +709,7 @@
    <Compile Include="Controllers\基础资料\基础资料\Gy_CostItemFixRateController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_CostItemAverageTypeController.cs" />
    <Compile Include="Controllers\成本管理\CB_ItemMoneyBillController.cs" />
    <Compile Include="Controllers\成本管理\CB_ActualItemMoneyCostController.cs" />
    <Compile Include="Controllers\成本管理\CB_WipProcessTableController.cs" />
    <Compile Include="Controllers\成本管理\成本费用调整单\CB_ChangeMoneyBillController.cs" />
    <Compile Include="Controllers\检验申请单\QC_RequestCheckBillController.cs" />