yxj
2022-10-20 67b97c8ad2592c6e4afbfe8d34167b7ee696bdef
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
12个文件已修改
3个文件已添加
807 ■■■■ 已修改文件
WebAPI/Controllers/BLL/Xt_UserController.cs 250 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_CallGoodsBillMainController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs 363 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/日计划管理/JIT_ICMOSortBillController.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/Gy_UserCustomer.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/Gy_UserMater.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/Gy_UserUser.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/StationBill.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -852,5 +852,255 @@
            }
        }
        #endregion
        #region  æ ¹æ®ç”¨æˆ·ç¼–码查找已分配用户列表
        [Route("Xt_User/UserPlaylist")]
        [HttpGet]
        public object UserPlaylist(string HUserID)
        {
            try
            {
                ds = oCN.RunProcReturn("select HUserID2,用户代码 HUserNumber2,用户名称 HUserName2 from h_v_Gy_UserUserList where HUserID='" + HUserID + "' ", "h_v_Gy_UserUserList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无用户信息!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region ç”¨æˆ·å…³è”用户保存
        [Route("Xt_User/SaveUserUser")]
        [HttpPost]
        public object SaveUserUser([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            ListModels oListModels = new ListModels();
            try
            {
                List<Models.Gy_UserUser> lsmain = new List<Models.Gy_UserUser>();
                msg2 = msg2.Substring(1, msg2.Length - 2);
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_UserUser(msg2);
                oCN.BeginTran();
                //删除已经关联的数据
                oCN.RunProc("Delete From Gy_UserByUserRelation  where HUserID='" + msg3.ToString() + "'");
                foreach (Models.Gy_UserUser oItem in lsmain)
                {
                    //重新写入关联数据
                    oCN.RunProc("insert into Gy_UserByUserRelation (HUserID2,HUserID,HBillType,HUseFlag) values ('" + oItem.HUserID2 + "','" + msg3.ToString() + "','" + "" + "','" + "" + "')");
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功!";
                //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
        #region  æ ¹æ®ç”¨æˆ·ç¼–码查找已分配物料列表
        [Route("Xt_User/MaterPlaylist")]
        [HttpGet]
        public object MaterPlaylist(string HUserID)
        {
            try
            {
                ds = oCN.RunProcReturn("select HMaterID,物料代码 HMaterNumber,物料名称 HMaterName from h_v_Gy_UserMaterList where HUserID='" + HUserID + "' ", "h_v_Gy_UserMaterList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无物料信息!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region ç”¨æˆ·å…³è”物料保存
        [Route("Xt_User/SaveUserMater")]
        [HttpPost]
        public object SaveUserMater([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            ListModels oListModels = new ListModels();
            try
            {
                List<Models.Gy_UserMater> lsmain = new List<Models.Gy_UserMater>();
                msg2 = msg2.Substring(1, msg2.Length - 2);
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_UserMater(msg2);
                oCN.BeginTran();
                //删除已经关联的数据
                oCN.RunProc("Delete From Gy_UserMaterRelation  where HUserID='" + msg3.ToString() + "'");
                foreach (Models.Gy_UserMater oItem in lsmain)
                {
                    //重新写入关联数据
                    oCN.RunProc("insert into Gy_UserMaterRelation (HMaterID,HUserID) values ('" + oItem.HMaterID + "','" + msg3.ToString() + "')");
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功!";
                //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
        #region  æ ¹æ®ç”¨æˆ·ç¼–码查找已分配客户列表
        [Route("Xt_User/CustomerPlaylist")]
        [HttpGet]
        public object CustomerPlaylist(string HUserID)
        {
            try
            {
                ds = oCN.RunProcReturn("select HCusID,客户代码 HCustomerNumber,客户名称 HCustomerName from h_v_Gy_UserCustomerList where HUserID='" + HUserID + "' ", "h_v_Gy_UserCustomerList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无客户信息!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region ç”¨æˆ·å…³è”物料保存
        [Route("Xt_User/SaveUserCustomer")]
        [HttpPost]
        public object SaveUserCustomer([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            ListModels oListModels = new ListModels();
            try
            {
                List<Models.Gy_UserCustomer> lsmain = new List<Models.Gy_UserCustomer>();
                msg2 = msg2.Substring(1, msg2.Length - 2);
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_UserCustomer(msg2);
                oCN.BeginTran();
                //删除已经关联的数据
                oCN.RunProc("Delete From Gy_UserCustomerRelation  where HUserID='" + msg3.ToString() + "'");
                foreach (Models.Gy_UserCustomer oItem in lsmain)
                {
                    //重新写入关联数据
                    oCN.RunProc("insert into Gy_UserCustomerRelation (HCusID,HUserID) values ('" + oItem.HCusID + "','" + msg3.ToString() + "')");
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功!";
                //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/CJGL/Cj_CallGoodsBillMainController.cs
@@ -31,7 +31,7 @@
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select * from h_v_IF_JIT_CallGoodsBillList where 1=1 " + sWhere + " order by hmainid desc", "h_v_IF_JIT_CallGoodsBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_JIT_CallGoodsBillList where 1=1 " + sWhere + " and åˆ¶å•人='"+user+"'  order by hmainid desc", "h_v_IF_JIT_CallGoodsBillList");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -149,7 +149,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //得到信息
                ds = oCN.RunProcReturn("exec h_p_Sc_ProcExchBilltransRelationQty " + HProcExchHinteID + "", "h_p_Sc_ProcExchBilltransRelationQty");
                //写入信息
@@ -161,10 +161,20 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //添加列名
                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 = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
@@ -233,7 +243,7 @@
                double HMoney = list[0].HMoney;//金额
                string HRemark = list[0].HRemark;//备注
                double HTaxRate = list[0].HTaxRate;//税率
                long HProcNo = list[0].HProcNo;//流水号
                string HProcNo = list[0].HProcNo;//流水号
                string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                int HWWWorkOrderInterID = 0;//委外工单号子内码
                int HWWWorkOrderEntryID = 0;//委外工单号主内吗
@@ -263,7 +273,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HProcNo <= 0)
                if (HProcNo == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
@@ -144,7 +144,7 @@
                double HMoney = list[0].HMoney;//金额
                string HRemark = list[0].HRemark;//备注
                double HTaxRate = list[0].HTaxRate;//税率
                long HProcNo = list[0].HProcNo;//流水号
                string HProcNo = list[0].HProcNo;//流水号
                string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                int HWWWorkOrderInterID = 0;//委外工单号子内码
                int HWWWorkOrderEntryID = 0;//委外工单号主内吗
@@ -186,7 +186,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HProcNo <= 0)
                if (HProcNo == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -72,8 +72,8 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                long HProcNo = list[0].HProcNo;//流水号
                if (HProcNo <= 0)
                string HProcNo = list[0].HProcNo;//流水号
                if (HProcNo == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -100,7 +100,7 @@
                double HMoney = 0;
                double HBadCount = list[0].HBadCount;//不良数量
                long HCenterID = list[0].HCenterID;//工作中心ID
                long HProcNo = list[0].HProcNo;//流水号
                string HProcNo = list[0].HProcNo;//流水号
                string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                string HSourceNameList = list[0].HSourceNameList;//设备清单
                long HMainSourceInterID = list[0].HInterID;//递入type得到的单据ID
@@ -134,7 +134,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HProcNo <= 0)
                if (HProcNo == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
@@ -105,6 +105,7 @@
            public long HSTOCKID = 0;//HSTOCKID
            public string é€€æ–™åŽŸå›  { get; set; }//退料原因
            public int HMaterialID = 0; //HMaterialIDCol
            public string ç‰©æ–™ä»£ç  = "";
            public string HSourceBillNo { get; set; }//HSourceBillNoCol
            public int è°ƒå‡ºä»“库可用库存数量 = 0;//HKFQtyKYCol
            public int è°ƒå‡ºä»“库库存数量 = 0;//HKFQtySCol
@@ -188,6 +189,33 @@
                {
                    if (listCa[i].HMaterialID != 0 && listCa[i].叫料数量 > 0)
                    {
                        var Hqty = 0.0;
                        var TuiHqty = 0.0;
                        //当前单据已叫料 å’Œ å·²é€€æ–™æ•°é‡
                        ds = oCN.RunProcReturn($@"
                                               select isnull(a.HQty,0) å·²å«æ–™æ•°é‡,isnull(b.HQty,0) å·²é€€æ–™ç”³è¯·æ•°é‡ from (
                                                select sum(b.HQty) HQty,c.HNumber ,b.HSourceBillNo
                                                from JIT_CallGoodsBillMain a
                                                join JIT_CallGoodsBillSub b on a.HInterID=b.HInterID
                                                left join Gy_Material c on b.HMaterID=c.HItemID
                                                where b.HSourceBillNo='{listCa[i].HSourceBillNo}'
                                                group by c.HNumber,b.HSourceBillNo
                                                ) a
                                                left join (
                                                select sum(b.HQty) HQty,c.HNumber,b.HSourceBillNo
                                                from JIT_CallGoodsBackRequestBillMain a
                                                inner join JIT_CallGoodsBackRequestBillSub b on a.HInterID=b.HInterID
                                                left join Gy_Material c on b.HMaterID=c.HItemID
                                                where b.HSourceBillNo='{listCa[i].HSourceBillNo}'
                                                group by c.HNumber,b.HSourceBillNo
                                                ) b  on a.HNumber=b.HNumber and a.HSourceBillNo=b.HSourceBillNo where a.HNumber='{listCa[i].物料代码}'", "JIT_CallGoodsBillMain");
                        if (ds.Tables[0].Rows.Count > 0)
                        {
                            Hqty = double.Parse(ds.Tables[0].Rows[0]["已叫料数量"].ToString());
                            TuiHqty = double.Parse(ds.Tables[0].Rows[0]["已退料申请数量"].ToString());
                        }
                        if (listCa[i].叫料数量 > listCa[i].计划发料数量)
                        {
                            objJsonResult.code = "0";
@@ -197,7 +225,20 @@
                            return objJsonResult;
                        }
                        if (listCa[i].库存数量 == 0 && listCa[i].叫料数量 > 0)
                        if((listCa[i].叫料数量 + Hqty - TuiHqty)> listCa[i].计划发料数量)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "叫料总数量大于计划发料数量!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        ds = oCN.RunProcReturn("select * from h_v_JIT_WarehouseList where ä»“库ID=" + listCa[i].调出仓库id + "  and  ç‰©æ–™ç¼–码 = '" + listCa[i].物料代码 + "' and åº“存组织=" + listCa[i].HOutOrgID, "h_v_JIT_WarehouseList");
                        var HSCWHIDCount= double.Parse(ds.Tables[0].Rows[0]["调出仓库可用库存数量"].ToString());
                        if (HSCWHIDCount == 0 && listCa[i].叫料数量 > 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
@@ -206,7 +247,7 @@
                            return objJsonResult;
                        }
                        if (listCa[i].叫料数量 > listCa[i].库存数量)
                        if (listCa[i].叫料数量 > HSCWHIDCount)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
@@ -241,15 +282,6 @@
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //if (listCa[i].调出仓库可用库存数量 == 0)
                        //{
                        //    objJsonResult.code = "0";
                        //    objJsonResult.count = 0;
                        //    objJsonResult.Message = "调出仓库可用库存数量为0!";
                        //    objJsonResult.data = null;
                        //    return objJsonResult;
                        //}
                        j = 1;
@@ -401,7 +433,7 @@
            string msg2 = sArray[0].ToString();
            DBUtility.ClsPub.CurUserName = sArray[1].ToString();
            string HOrgID = sArray[2].ToString();
            bool flag = false;
            json flag =new json();
            try
            {
@@ -425,47 +457,17 @@
                {
                    if (listCa[i].退料数量 > 0)
                    {
                        if (listCa[i].退料数量 > listCa[i].已配送数量&& listCa[i].已配送数量>0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "退料数量大于已配送数量!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        ds = oCN.RunProcReturn("select isnull(sum(d.HQty),0) HQty from JIT_CallGoodsBackRequestBillSub c inner join JIT_CallGoodsBackBillSub d on c.HInterID = d.HSourceInterID and c.HEntryID = d.HSourceEntryID and c.HMaterID = d.HMaterID " +
                   $"where c.HSourceInterID={listCa[i].HSouceInterID} and c.HSourceEntryID ={listCa[i].HSourceEntryID} and c.HSourceBillNo = '{listCa[i].HSourceBillNo}' and c.HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");
                        if ((double.Parse(ds.Tables[0].Rows[0][0].ToString()==""?"0": ds.Tables[0].Rows[0][0].ToString()) +listCa[i].退料数量) > listCa[i].已叫料数量)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = $"已经退料数量:{double.Parse(ds.Tables[0].Rows[0][0].ToString())},可退料数量为:{(listCa[i].已叫料数量 - double.Parse(ds.Tables[0].Rows[0][0].ToString()))}!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (listCa[i].调入仓库id == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "请选择调入仓库!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (listCa[i].调出仓库id == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "请选择调出仓库!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        flag = AddICStockTuiBill(listCa[i], "666601", "不良品退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
                        flag = (json)AddICStockTuiBill(listCa[i], "666601", "不良品退料", HOrgID);
                        j = 1;
                        if (flag.code == "0")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = objJsonResult.Message;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                if (j == 0)
@@ -477,22 +479,11 @@
                    return objJsonResult;
                }
                if (flag)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "不良品退料成功!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "不良品退料失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "不良品退料成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
@@ -505,10 +496,62 @@
        }
        //新增
        public bool AddICStockTuiBill(CallGoodsBill listCa,string HBillType,string HBackType,string HOrgID, ref string sReturn)
        public object AddICStockTuiBill(CallGoodsBill listCa,string HBillType,string HBackType,string HOrgID)
        {
            try
            {
                if (listCa.退料数量 > listCa.已配送数量 && listCa.已配送数量 > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "退料数量大于已配送数量!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (listCa.调入仓库id == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择调入仓库!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (listCa.调出仓库id == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择调出仓库!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                var THqty = 0.0;
                ds = oCN.RunProcReturn($@"
                                    select sum(b.HQty) HQty,c.HNumber,b.HSourceBillNo
                                    from JIT_CallGoodsBackRequestBillMain a
                                    inner join JIT_CallGoodsBackRequestBillSub b on a.HInterID=b.HInterID
                                    left join Gy_Material c on b.HMaterID=c.HItemID
                                    where c.HNumber='{listCa.物料代码}' and b.HSourceBillNo='{listCa.HSourceBillNo}'
                                    group by c.HNumber,b.HSourceBillNo
                                  ", "JIT_CallGoodsBackRequestBillMain");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    THqty = double.Parse(ds.Tables[0].Rows[0]["HQty"].ToString());
                }
                if ((listCa.退料数量 + THqty) > listCa.已配送数量)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "累计退料数量大于已配送数量!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                Int64 lngBillKey = listCa.HSouceInterID == 0 ? 0 : listCa.HSouceInterID;
                Int64 lngBillKeyEntry = listCa.HSourceEntryID == 0 ? 0 : listCa.HSourceEntryID;
                double HQty = (double)(listCa.退料数量 == 0 ? 0 : listCa.退料数量);
@@ -534,13 +577,17 @@
                       $" '{HBillType}','{DateTime.Now}','{HBillNo}',{HOrgID},'{ DBUtility.ClsPub.CurUserName}','{DateTime.Now}','','',0,0,0,''," +
                       $" 0, 0, {listCa.HOutOrgID}, {HOrgID}, 0,'{HBackType}')");
                 
                sReturn = "新增单据成功!";
                oCN.Commit();
                return true;
                objJsonResult.code = "1";
                objJsonResult.Message = "新增单据成功!";
                return objJsonResult;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                objJsonResult.code = "0";
                objJsonResult.Message = e.Message; ;
                return objJsonResult;
                throw (e);
            }
        }
@@ -573,36 +620,23 @@
                List<CallGoodsBill> listCa = new List<CallGoodsBill>();
                //获取表格数据集合
                listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
                bool flag = false;
                json flag = new json();
                int j = 0;
                for (int i = 0; i < listCa.Count; i++)
                {
                    if (listCa[i].退料数量 > 0)
                    {
                        if (listCa[i].退料数量 > listCa[i].已配送数量 && listCa[i].已配送数量 > 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "退料数量大于已配送数量!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        ds = oCN.RunProcReturn("select sum(d.HQty) HQty from JIT_CallGoodsBackRequestBillSub c inner join JIT_CallGoodsBackBillSub d on c.HInterID = d.HSourceInterID and c.HEntryID = d.HSourceEntryID and c.HMaterID = d.HMaterID " +
                   $"where c.HSourceInterID={listCa[i].HSouceInterID} and c.HSourceEntryID ={listCa[i].HSourceEntryID} and c.HSourceBillNo = '{listCa[i].HSourceBillNo}' and c.HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");
                        if ((double.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString()) + listCa[i].退料数量) > listCa[i].已叫料数量)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = $"已经退料数量:{double.Parse(ds.Tables[0].Rows[0][0].ToString())},可退料数量为:{(listCa[i].已叫料数量 - double.Parse(ds.Tables[0].Rows[0][0].ToString()))}!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        flag = AddICStockTuiBill(listCa[i], "666602", " ä½™é‡é€€æ–™", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
                        flag =(json)AddICStockTuiBill(listCa[i], "666602", " ä½™é‡é€€æ–™", HOrgID);
                        j = 1;
                        if (flag.code == "0")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = objJsonResult.Message;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                if (j == 0)
@@ -614,23 +648,11 @@
                    return objJsonResult;
                }
                if (flag)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "余量退料成功!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "余量退料失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "余量退料成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
@@ -671,35 +693,22 @@
                //获取表格数据集合
                listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
                bool flag = false;
                json flag = new json();
                int j = 0;
                for (int i = 0; i < listCa.Count; i++)
                {
                    if (listCa[i].退料数量 > 0)
                    {
                        if (listCa[i].退料数量 > listCa[i].已配送数量 && listCa[i].已配送数量 > 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "退料数量大于已配送数量!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        ds = oCN.RunProcReturn("select sum(d.HQty) HQty from JIT_CallGoodsBackRequestBillSub c inner join JIT_CallGoodsBackBillSub d on c.HInterID = d.HSourceInterID and c.HEntryID = d.HSourceEntryID and c.HMaterID = d.HMaterID " +
                   $"where c.HSourceInterID={listCa[i].HSouceInterID} and c.HSourceEntryID ={listCa[i].HSourceEntryID} and c.HSourceBillNo = '{listCa[i].HSourceBillNo}' and c.HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");
                        if ((double.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString()) + listCa[i].退料数量) > listCa[i].已叫料数量)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = $"已经退料数量:{double.Parse(ds.Tables[0].Rows[0][0].ToString())},可退料数量为:{(listCa[i].已叫料数量 - double.Parse(ds.Tables[0].Rows[0][0].ToString()))}!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        flag = AddICStockTuiBill(listCa[i], "666603", "报废退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
                        flag =(json) AddICStockTuiBill(listCa[i], "666603", "报废退料", HOrgID);
                        j = 1;
                        if (flag.code == "0")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = objJsonResult.Message;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                if (j == 0)
@@ -711,22 +720,11 @@
                    return objJsonResult;
                }
                if (flag)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "报废退料成功!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "报废退料失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "报废退料成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
@@ -946,5 +944,68 @@
        }
        #endregion
        #region ç”Ÿäº§å«æ–™å¹³å°  ä»“库库存列表
        [Route("Sc_ComplementGoodBill/GetWarehouseList_JIT")]
        [HttpGet]
        public object GetWarehouseList_JIT(string sWhere)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_JIT_WarehouseList where 1=1 "+ sWhere, "h_v_JIT_WarehouseList");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region ç”Ÿäº§å«æ–™å¹³å°  æœªç”Ÿæˆæ‹£æ–™ç”³è¯·å•  æœªç”Ÿæˆé€€æ–™å•
        [Route("Sc_ComplementGoodBill/NotGeneratedMaterialList")]
        [HttpGet]
        public object NotGeneratedMaterialList(string sWhere, string user)
        {
            try
            {
                //查询叫料单 æœªç”Ÿæˆ æ‹£æ–™å• çš„æ¡æ•°
                //查询退料申请单  æœªç”Ÿæˆ é€€æ–™å•çš„ æ¡æ•°
                ds = oCN.RunProcReturn($@"select count(*) æœªç”Ÿæˆ    from JIT_CallGoodsBackRequestBillMain as a
                                        inner join JIT_CallGoodsBackRequestBillSub as b on a.HInterID=b.HInterID
                                         where  a.HISCheck =0   and a.HOrgID={sWhere}
                                        and a.HMaker = '{user}'
                                            union all
                                        select count(*) æœªç”Ÿæˆ  from JIT_CallGoodsBillMain a
                                        join JIT_CallGoodsBillSub b on a.HInterID=b.HInterID
                                         where b.HPSQty=0  and a.HOrgID={sWhere}
                                        and a.HMaker = '{user}'", "JIT_CallGoodsBackRequestBillMain");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs
@@ -236,12 +236,22 @@
                        var HICMOBillNo = list[i]["生产订单号"].ToString();
                        var HICMOEntrySEQ = list[i]["生产订单明细行号"].ToString();
                        var HSourceID = list[i]["HSourceID"].ToString();
                        var HYX = list[i]["优先级"].ToString();
                        if (HSourceID == "" || HSourceID == "0")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = $"第{i + 1}行生产资源不能为空!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        var str = 0;
                        if (!int.TryParse(HYX, out str))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = $"第{i + 1}行优先级:{HYX},请输入数字!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -258,7 +268,7 @@
                            return objJsonResult;
                        }
                        oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["单据号"].ToString()}'");
                        oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["单据号"].ToString()}'");
                    }
                    oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["日计划数量总量"].ToString()} where HInterID={(HInterID==0?int.Parse(list[i]["hmainid"].ToString()):HInterID)} and HBillNo='{(HBillNo==""?list[i]["单据号"].ToString(): HBillNo)}'");
@@ -514,6 +524,14 @@
            /// ä»“库编码
            /// </summary>
            public string FStockNumber { get; set; }
            /// <summary>
            /// æ‰¹å·
            /// </summary>
            public string HLOT { get; set; }
            /// <summary>
            /// id
            /// </summary>
            public string HInventoryFID { get; set; }
        }
        #endregion
@@ -677,6 +695,9 @@
            public string FStock { get; set; }
            //车间
            public string FWorkShop { get; set; }
            //批号
            public string HLOT { get; set; }
            public string HInventoryFID { get; set; }
        }
        #endregion
@@ -736,10 +757,11 @@
                //获取当前即时库存 åº“存数量+库存组织+物料+货主+仓库   
                ds = oCN.RunProcReturn(@" 
select distinct isnull(a.FBASEQTY,0) FBASEQTY,b.FNumber,a.FOwnerTypeId,a.FOwnerId,c.FNUMBER as FOwnerNumber,a.FSTOCKID,d.FNUMBER as FStockNumber from
select distinct isnull(a.FBASEQTY,0) FBASEQTY,b.FNumber,a.FOwnerTypeId,a.FOwnerId,c.FNUMBER as FOwnerNumber,a.FSTOCKID,d.FNUMBER as FStockNumber ,a.FLOT HLOT,a.FID HInventoryFID
from
(
select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from SC_WORKBILLSORTBILLMAIN a
join SC_WORKBILLSORTBILLSub b on a.HInterID = b.HInterID
select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from Sc_WorkBillSortBillMain a
join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID
join AIS20210811135644..T_PRD_PPBOM T1 on a.HICMOInterID_Sec = t1.FMoId and a.HICMOEntryID_Sec = t1.FMOENTRYID
LEFT JOIN  AIS20210811135644..T_PRD_PPBOMENTRY T2 on T1.FID = t2.FID
join  AIS20210811135644..T_BD_MATERIAL T3 on T2.FMATERIALID = T3.FMATERIALID
@@ -954,7 +976,9 @@
                                            FComPlete = jskcQty >= need ? "齐套" : "未齐套",
                                            FPlanDate = item.HMasterDate, // æ—¥è®¡åˆ’日期
                                            FStock = Inventory.FSTOCKID,//仓库
                                            FWorkShop = _item.HWorkShopID //车间
                                            FWorkShop = _item.HWorkShopID, //车间
                                            HLOT = Inventory.HLOT, //批号
                                            HInventoryFID = Inventory.HInventoryFID //id
                                        });
                                        //扣减总库存数量
                                        jskcQty = jskcQty >= fCompleteCount ? jskcQty - fCompleteCount : 0;
@@ -1033,6 +1057,8 @@
                insertDT.Columns.Add("FWORKSHOPID", typeof(long));
                insertDT.Columns.Add("FSTOCKID", typeof(long));
                insertDT.Columns.Add("FOCCUPYPICKEDCOUNT", typeof(decimal));
                insertDT.Columns.Add("HLOT", typeof(long));
                insertDT.Columns.Add("HInventoryFID", typeof(string));
                int jdtmmm = 1;
                ds = oCN.RunProcReturn("select max(HInterID)FID FROM  JIT_MOMaterReadysBill", "JIT_MOMaterReadysBill");
                int maxFid = int.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString());
@@ -1065,6 +1091,8 @@
                    dr["FWORKSHOPID"] = item.FWorkShop == null ? "0" : item.FWorkShop;
                    dr["FSTOCKID"] = item.FStock == null ? "0" : item.FStock;
                    dr["FOCCUPYPICKEDCOUNT"] = item.FOccupyPickedCount;
                    dr["HLOT"] = item.HLOT == null? "0" : item.HLOT;
                    dr["HInventoryFID"] = item.HInventoryFID == null ? "0" : item.HInventoryFID;
                    insertDT.Rows.Add(dr);
                    jdtmmm++;
                }
@@ -1080,12 +1108,14 @@
                            ", HICMOEntryID, HMaterID, HStockORGID, HStockQty, HLeftQty" +
                            ", HProdORGID, HUnitDosage, HSumPlanQty, HICMOBillNo, HOwnerID" +
                            ", HOwnerTypeID, HPlanDate, HComplete, HLackQty, HOccupyQty" +
                            ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY,HMainICMOBillNo)values" +
                            ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY,HMainICMOBillNo" +
                            ",HLOT,HInventoryFID)values" +
                             $"({item["FID"].ToString()}, 1, {item["FHMAINICMOINTERIDR"].ToString()}, {item["FHMAINICMOENTRYID"].ToString()}, {item["FHICMOINTERID"].ToString()}" +
                             $", {item["FHICMOENTRYID"].ToString()}, {item["FHMATERID"].ToString()}, {item["FHSTOCKORGID"].ToString()}, {item["FHSTOCKQTY"].ToString()}, {item["FHLEFTQTY"].ToString()}" +
                             $" , {item["FHPRDORGID"].ToString()}, {item["FUNITDOSAGE"].ToString()}, {item["FSUMPLANCOUNT"].ToString()}, '{item["FPRDBILLNO"].ToString()}', {item["FOWNERID"].ToString()}" +
                             $", '{item["FOWNERTYPEID"].ToString()}', '{item["FPLANDATE"].ToString()}','{item["FCOMPLETE"].ToString()}', {item["FLACKCOUNT"].ToString()}, {item["FOCCUPYCOUNT"].ToString()}" +
                             $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}')");
                             $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}'" +
                             $",{item["HLOT"].ToString()},'{item["HInventoryFID"].ToString()}')");
                }
                LogService.Write("批量插入到数据库用时:" + sw.Elapsed);
                //执行完成后 æ›´æ–°æ—¥è®¡åˆ’工单状态
WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_ICMOSortBillController.cs
@@ -78,5 +78,42 @@
            }
        }
        #endregion
        #region ç”Ÿäº§æ—¥è®¡åˆ’ è½¦é—´æ‰§è¡Œç¡®è®¤  æ’¤é”€è½¦é—´æ‰§è¡Œç¡®è®¤
        [Route("JIT_ICMOSortBill/JIT_ICMOSortBillWorkShopTure")]
        [HttpGet]
        public object JIT_ICMOSortBillWorkShopTure(string HSourceID, string HICMOInterID, DateTime HDate, int HStatus, string user)
        {
            try
            {
                ds = oCN.RunProcReturn($"select * from Sc_ICMOBillStatus_Tmp_Extend where HSourceID = {HSourceID} and HSourceInterID = {HICMOInterID} and HDate = '{HDate.ToString("yyyy-MM-dd HH:mm:ss.fff")}' ", "Sc_ICMOBillStatus_Tmp_Extend");
                if (ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "仓库未确认,不能进行车间确认!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.RunProc("exec h_p_Sc_SetICMOStatus_ReadyStart " + HSourceID.ToString() + "," + HICMOInterID.ToString() + ",'" + HDate.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'," + HStatus.ToString() + ",'" + user + "'");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/ListModels.cs
@@ -1794,6 +1794,42 @@
        }
        /// <summary>
        /// ç”¨æˆ·-用户关系信息表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.Gy_UserUser> getObjectByJson_Gy_UserUser(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.Gy_UserUser> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_UserUser>>(jsonString);
            return list;
        }
        /// <summary>
        /// ç”¨æˆ·ç‰©æ–™å…³ç³»ä¿¡æ¯è¡¨çš„json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.Gy_UserMater> getObjectByJson_Gy_UserMater(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.Gy_UserMater> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_UserMater>>(jsonString);
            return list;
        }
        /// <summary>
        /// ç”¨æˆ·å®¢æˆ·å…³ç³»ä¿¡æ¯è¡¨çš„json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.Gy_UserCustomer> getObjectByJson_Gy_UserCustomer(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.Gy_UserCustomer> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_UserCustomer>>(jsonString);
            return list;
        }
        /// <summary>
        /// ç”¨æˆ·ç»„织关系信息表的json
        /// </summary>
        /// <param name="jsonString"></param>
WebAPI/Models/Gy_UserCustomer.cs
New file
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
    public class Gy_UserCustomer
    {
        public int HCusID { get; set; }
        public string HCustomerNumber { get; set; }
        public string HCustomerName { get; set; }
    }
}
WebAPI/Models/Gy_UserMater.cs
New file
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
    public class Gy_UserMater
    {
        public int HMaterID { get; set; }
        public string HMaterNumber { get; set; }
        public string HMaterName { get; set; }
    }
}
WebAPI/Models/Gy_UserUser.cs
New file
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
    public class Gy_UserUser
    {
        public int HUserID2 { get; set; }
        public string HUserNumber2 { get; set; }
        public string HUserName2 { get; set; }
    }
}
WebAPI/Models/StationBill.cs
@@ -33,7 +33,7 @@
        public double HMoney { get; set; }
        public string HRemark { get; set; }
        public double HTaxRate { get; set; }
        public long HProcNo { get; set; }
        public string HProcNo { get; set; }
        public string HOrderProcNO { get; set; }
        public long HWWWorkOrderInterID { get; set; }
        public long HWWWorkOrderEntryID { get; set; }
WebAPI/WebAPI.csproj
@@ -560,6 +560,9 @@
    <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
    <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
    <Compile Include="Models\Employee.cs" />
    <Compile Include="Models\Gy_UserCustomer.cs" />
    <Compile Include="Models\Gy_UserMater.cs" />
    <Compile Include="Models\Gy_UserUser.cs" />
    <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
    <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
    <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />