InOutPut
/
Put_MES
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

提交

master
张松男 6 months ago
parent
e945ce30f6
commit
e347451ce3
14 changed files with 656 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      APPQ5/QMAPP.FJC.Entity/Bucket/RawMaterial.cs
  2. 13
      WebAPI/App_Start/SqlData.cs
  3. 8
      WebAPI/Controllers/LoginController.cs
  4. 83
      WebAPI/Controllers/MachineClassController.cs
  5. 99
      WebAPI/Controllers/MachineController.cs
  6. 107
      WebAPI/Controllers/PlanController.cs
  7. 71
      WebAPI/Controllers/WareController.cs
  8. 72
      WebAPI/Controllers/WareHouseController.cs
  9. 19
      WebAPI/Models/InsertMachineValue.cs
  10. 63
      WebAPI/Models/OrderPlan_PaoMo.cs
  11. 63
      WebAPI/Models/OrderPlan_ZhuSu.cs
  12. 47
      WebAPI/Models/ReceiveWare.cs
  13. 52
      WebAPI/Models/ReceiveWareHouse.cs
  14. 12
      WebAPI/WebAPI.csproj

11
APPQ5/QMAPP.FJC.Entity/Bucket/RawMaterial.cs
View File

@ -46,13 +46,20 @@ namespace QMAPP.MD.Entity.Bucket
public string BatchCode { get; set; } public string BatchCode { get; set; }
/// <summary> /// <summary>
/// 流水号 /// 参考号
/// </summary> /// </summary>
[Description("流水号")] [Description("参考号")]
[DBColumn(ColumnName = "SerialCode", DataType = DbType.String)] [DBColumn(ColumnName = "SerialCode", DataType = DbType.String)]
public string SerialCode { get; set; } public string SerialCode { get; set; }
public string MaterialCode { get; set; } public string MaterialCode { get; set; }
/// <summary>
/// 供应商编码
/// </summary>
[Description("供应商编码")]
[DBColumn(ColumnName = "SupplierCode", DataType = DbType.String)]
public string SupplierCode { get; set; }
/// <summary> /// <summary>
/// 是否可用 /// 是否可用
/// </summary> /// </summary>

13
WebAPI/App_Start/SqlData.cs
View File

@ -32,7 +32,7 @@ namespace WebAPI.App_Start
} }
/// <summary> /// <summary>
/// 插入电表数据 /// 插入泡沫点检数据
/// </summary> /// </summary>
/// <param name="productCode">产品编号</param> /// <param name="productCode">产品编号</param>
/// <returns></returns> /// <returns></returns>
@ -47,6 +47,17 @@ namespace WebAPI.App_Start
} }
/// <summary>
/// 插入泡沫点检数据
/// </summary>
/// <param name="productCode">产品编号</param>
/// <returns></returns>
public static void InsertWare(string sql)
{
var sqlScript = sql;
SqlHelper.ExecuteNonQuery(Config.maindbConnectionString, CommandType.Text, sqlScript);
}
} }
} }

8
WebAPI/Controllers/LoginController.cs
View File

@ -15,6 +15,12 @@ namespace WebAPI.Controllers
{ {
public class LoginController : ApiController public class LoginController : ApiController
{ {
/// <summary>
/// 判断用户名密码
/// </summary>
/// <param name="UserName"></param>
/// <param name="PassWord"></param>
/// <returns></returns>
public Response<LoginInfo> Get(string UserName,string PassWord) public Response<LoginInfo> Get(string UserName,string PassWord)
{ {
var result = new Response<LoginInfo>(); var result = new Response<LoginInfo>();
@ -36,7 +42,7 @@ namespace WebAPI.Controllers
else else
{ {
result.Code = 201; result.Code = 201;
result.Message = "用户信息不存在"; result.Message = "用户信息不存在或密码错误";
} }
return result; return result;

83
WebAPI/Controllers/MachineClassController.cs
View File

@ -10,8 +10,16 @@ using Newtonsoft.Json.Converters;
namespace WebAPI.Controllers namespace WebAPI.Controllers
{ {
/// <summary>
/// 泡沫、注塑点检
/// </summary>
public class MachineClassController : ApiController public class MachineClassController : ApiController
{ {
/// <summary>
/// 获取点检项
/// </summary>
/// <param name="MachineCode"></param>
/// <returns></returns>
public Response<List<MachineClass>> Get(string MachineCode) public Response<List<MachineClass>> Get(string MachineCode)
{ {
var result = new Response<List<MachineClass>>(); var result = new Response<List<MachineClass>>();
@ -108,7 +116,10 @@ namespace WebAPI.Controllers
return result; return result;
} }
/// <summary>
/// 点检录入
/// </summary>
/// <returns></returns>
public async Task<IHttpActionResult> Insert() public async Task<IHttpActionResult> Insert()
{ {
var request = await this.Request.Content.ReadAsStringAsync(); var request = await this.Request.Content.ReadAsStringAsync();
@ -177,7 +188,75 @@ namespace WebAPI.Controllers
SqlData.InsertMachine(t); SqlData.InsertMachine(t);
} }
return Ok(); var Response = new Response();
return Ok(Response);
}
/// <summary>
/// 获取注塑点检项
/// </summary>
/// <param name="MachineCode"></param>
/// <returns></returns>
[HttpGet]
public Response<List<MachineClass>> GZhuSuItem(string Machine)
{
var result = new Response<List<MachineClass>>();
var sqlScript = $"select a.* from T_MD_PutMachineClass as a where a.MachineCode = '{Machine}' ORDER BY a.SerialNumber ";
DataSet dataSet = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlScript);
var sqlValue = $"select * from T_MD_PutMachine where MachineCode ='{Machine}' ";
DataSet dataSetValue = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlValue);
var list_PutMachine = new List<PutMachine>();
foreach (DataRow R in dataSetValue.Tables[0].Rows)
{
var t = new PutMachine();
t.PID = R["PID"].ToString();
t.MachineCode = R["MachineCode"].ToString();
t.MachinePID = R["MachinePID"].ToString();
t.Limit = R["Limit"].ToString();
t.Floor = R["Floor"].ToString();
t.Name = R["Name"].ToString();
t.SerialNumber = Convert.ToInt32(R["SerialNumber"].ToString());
list_PutMachine.Add(t);
}
var list_MachineClass = new List<MachineClass>();
if (dataSet.Tables[0].Rows.Count > 0)
{
foreach (DataRow R in dataSet.Tables[0].Rows)
{
var t = new MachineClass();
t.PID = R["PID"].ToString();
t.MachineCode = R["MachineCode"].ToString();
t.Name = R["Name"].ToString();
t.Position = R["Position"].ToString();
t.Content = R["Content"].ToString();
t.Methond = R["Methond"].ToString();
t.Type = R["Type"].ToString();
t.SerialNumber = R["SerialNumber"].ToString();
var m = list_PutMachine.Where(p => p.MachinePID == t.PID).OrderBy(o => o.SerialNumber).ToList();
t.putMachine = m;
t.SelectName = "51";
t.SelectValue = "51";
list_MachineClass.Add(t);
}
result.Result = list_MachineClass;
}
else
{
result.Code = 201;
result.Message = "设备信息不存在";
}
return result;
} }
} }
} }

99
WebAPI/Controllers/MachineController.cs
View File

@ -0,0 +1,99 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Web.Http;
using WebAPI.App_Start;
using WebAPI.Models;
using Newtonsoft.Json.Converters;
namespace WebAPI.Controllers
{
/// <summary>
/// 泡沫、注塑点检
/// </summary>
public class MachineController : ApiController
{
/// <summary>
/// 点检录入
/// </summary>
/// <returns></returns>
public async Task<IHttpActionResult> InsertZhusu()
{
var request = await this.Request.Content.ReadAsStringAsync();
var requeststr = request.Replace("\r", "").Replace("\n", "");
var resObj = JsonHelper.Instance.JsonToObj<ReceiveMachine>(requeststr);
var group = "";//班次
switch (resObj.groupValue)
{
case "1":
group = "三班";
break;
case "2":
group = "白班";
break;
case "3":
group = "二班";
break;
}
var item = resObj.dataList[resObj.dataList.Count - 1];
for (var i = 0; i < resObj.dataList.Count - 1; i++)
{
var t = new MachineValue();
t.UserName = resObj.id;
t.MachineCode = resObj.dataList[i].PID;
t.Name = resObj.dataList[i].Content;
t.Type = resObj.dataList[i].Type;
t.Group = group;
t.UserName = resObj.id;
if (resObj.dataList[i].Type == "3")
{
t.MValue = resObj.dataList[i].putMachine[0].SelectName;
t.PValue = resObj.dataList[i].putMachine[1].SelectName;
}
else
{
if (resObj.dataList[i].Type == "1")
{
switch (resObj.dataList[i].SelectValue)
{
case "1":
t.MValue = "状态良好";
break;
case "2":
t.MValue = "正在处理";
break;
case "3":
t.MValue = "状态不好或损毁";
break;
case "4":
t.MValue = "停机状态";
break;
}
}
else
{
t.MValue = resObj.dataList[i].SelectValue;
}
}
var sqlScript = $"INSERT INTO [dbo].[T_MD_PutMachineValueZhusu] ([PID], [MachineCode], [Name], [Type], [MValue], [Group], [UserName], [CreateData], [Remark1], [Remark2], [Remark3], [PValue]) VALUES (" +
$"N'{Guid.NewGuid()}', N'{t.MachineCode}', N'{t.Name}', N'{t.Type}', N'{t.MValue}', N'{t.Group}', N'{t.UserName}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fffffff")}', NULL, NULL, NULL, N'{t.PValue}');";
SqlData.InsertWare(sqlScript);
}
var Response = new Response();
return Ok(Response);
}
}
}

107
WebAPI/Controllers/PlanController.cs
View File

@ -15,51 +15,45 @@ namespace WebAPI.Controllers
{ {
public class PlanController : ApiController public class PlanController : ApiController
{ {
public Response<LoginInfo> GetPaoMoList(string UserName, string PassWord) public Response<List<OrderPlan_PaoMo>> GetList(string Type)
{ {
var result = new Response<LoginInfo>(); var result = new Response<List<OrderPlan_PaoMo>>();
LoginInfo login = new LoginInfo(); List<OrderPlan_PaoMo> List_plan = new List<OrderPlan_PaoMo>();
login.LoginUserID = UserName; //var time = Convert.ToDateTime(data);
//var sqlScript = $"select * from T_PP_ORDERPLAN_PAOMO where PLAN_DATE >='{time.AddDays(-2).ToString("yyyy-MM-dd")} 00:00:00' and PLAN_DATE <= '{time.ToString("yyyy-MM-dd")} 23:49:59'";
var sqlScript = "";
login.PassWord = QMFrameWork.Common.Encrypt.DESEncrypt.Encrypt(PassWord); if (Type == "paomo")
var sqlScript = $"select * from T_PP_ORDERPLAN_PAOMO where PLAN_DATE >='{DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd")} 00:00:00' and PLAN_DATE <= '{DateTime.Now.ToString("yyyy-MM-dd")} 00:00:00'";
DataSet dataSet = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlScript);
if (dataSet.Tables[0].Rows.Count > 0)
{ {
login.UserName = dataSet.Tables[0].Rows[0]["USERNAME"].ToString(); sqlScript = $"select top 10 * from T_PP_ORDERPLAN_PAOMO order by PLAN_DATE desc";
result.Result = login;
}
else
{
result.Code = 201;
result.Message = "用户信息不存在";
} }
else if(Type == "zhusu")
return result; sqlScript = $"select top 10 * from T_PP_ORDERPLAN_ZHUSU order by PLAN_DATE desc";
}
public Response<LoginInfo> Get(string UserName,string PassWord)
{
var result = new Response<LoginInfo>();
LoginInfo login = new LoginInfo();
login.LoginUserID = UserName;
login.PassWord = QMFrameWork.Common.Encrypt.DESEncrypt.Encrypt(PassWord);
var sqlScript = $"select * from T_QM_USER where LOGINUSERID ='{UserName}' and PASSWORD = '{login.PassWord}'";
DataSet dataSet = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlScript); DataSet dataSet = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlScript);
if (dataSet.Tables[0].Rows.Count > 0) if (dataSet.Tables[0].Rows.Count > 0)
{ {
login.UserName = dataSet.Tables[0].Rows[0]["USERNAME"].ToString(); foreach (DataRow row in dataSet.Tables[0].Rows)
result.Result = login; {
OrderPlan_PaoMo OrderPlan = new OrderPlan_PaoMo();
OrderPlan.PID = row["PID"].ToString();
OrderPlan.PLAN_NO = row["PLAN_NO"].ToString();
OrderPlan.PLAN_SEQ = row["PLAN_SEQ"].ToString();
OrderPlan.PLAN_STATE = row["PLAN_STATE"].ToString();
OrderPlan.MATERIAL_CODE = row["MATERIAL_CODE"].ToString();
OrderPlan.PBOM_CODE = row["PBOM_CODE"].ToString();
OrderPlan.ROUTE_CODE = row["ROUTE_CODE"].ToString();
OrderPlan.QTY = row["QTY"].ToString();
OrderPlan.COMPLETE_QTY = row["COMPLETE_QTY"].ToString();
OrderPlan.PLAN_DATE = row["PLAN_DATE"].ToString();
OrderPlan.SHIFT_CODE = row["SHIFT_CODE"].ToString();
List_plan.Add(OrderPlan);
}
result.Result = List_plan;
} }
else else
{ {
@ -71,5 +65,48 @@ namespace WebAPI.Controllers
} }
//public Response<List<OrderPlan_ZhuSu>> GetZhuSuList(string data)
//{
// var result = new Response<List<OrderPlan_ZhuSu>>();
// List<OrderPlan_ZhuSu> List_plan = new List<OrderPlan_ZhuSu>();
// //var sqlScript = $"select * from T_PP_ORDERPLAN_ZHUSU where PLAN_DATE >='{DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd")} 00:00:00' and PLAN_DATE <= '{DateTime.Now.ToString("yyyy-MM-dd")} 00:00:00'";
// var sqlScript = $"select top 10 * from T_PP_ORDERPLAN_ZHUSU order by PLAN_DATE desc";
// DataSet dataSet = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlScript);
// if (dataSet.Tables[0].Rows.Count > 0)
// {
// foreach (DataRow row in dataSet.Tables[0].Rows)
// {
// OrderPlan_ZhuSu OrderPlan = new OrderPlan_ZhuSu();
// OrderPlan.PID = row["PID"].ToString();
// OrderPlan.PLAN_NO = row["PLAN_NO"].ToString();
// OrderPlan.PLAN_SEQ = row["PLAN_SEQ"].ToString();
// OrderPlan.PLAN_STATE = row["PLAN_STATE"].ToString();
// OrderPlan.MATERIAL_CODE = row["MATERIAL_CODE"].ToString();
// OrderPlan.PBOM_CODE = row["PBOM_CODE"].ToString();
// OrderPlan.ROUTE_CODE = row["ROUTE_CODE"].ToString();
// OrderPlan.QTY = row["QTY"].ToString();
// OrderPlan.COMPLETE_QTY = row["COMPLETE_QTY"].ToString();
// OrderPlan.PLAN_DATE = row["PLAN_DATE"].ToString();
// OrderPlan.SHIFT_CODE = row["SHIFT_CODE"].ToString();
// List_plan.Add(OrderPlan);
// }
// result.Result = List_plan;
// }
// else
// {
// result.Code = 201;
// result.Message = "用户信息不存在";
// }
// return result;
//}
} }
} }

71
WebAPI/Controllers/WareController.cs
View File

@ -0,0 +1,71 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Web.Http;
using WebAPI.App_Start;
using WebAPI.Models;
using Newtonsoft.Json.Converters;
using QMAPP.MD.Entity.Bucket;
namespace WebAPI.Controllers
{
/// <summary>
/// 注塑投料
/// </summary>
public class WareController : ApiController
{
/// <summary>
/// 泡沫投料种类
/// </summary>
/// <param name="BucketCode"></param>
/// <param name="RawMaterial"></param>
/// <returns></returns>
[HttpGet]
public Response<List<TypeList>> GetTypeList()
{
var result = new Response<List<TypeList>>();
var dic_list = new List<TypeList>();
var sqlScript = $"select * from T_MD_BucketMaterialClassPaomo where IsCheck = '0' ";
DataSet dataSet = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlScript);
if (dataSet.Tables[0].Rows.Count >= 0)
{
foreach (DataRow row in dataSet.Tables[0].Rows)
{
var dic = new TypeList();
dic.Code = row["RawMaterial"].ToString();
dic.Name = row["MaterialName"].ToString();
dic_list.Add(dic);
}
}
result.Result = dic_list;
return result;
}
/// <summary>
/// 泡沫投料 插入
/// </summary>
/// <returns></returns>
//{"planNumber":"DP20230109004","materialName":"NBT催化剂3","materialCode":"C45050101","materialQty":"10","id":"admin","createTime":"2024-04-07 11:11:21"} 原料投入泡沫提交的参数这样可以吗
public async Task<IHttpActionResult> Insert()
{
var request = await this.Request.Content.ReadAsStringAsync();
var requeststr = request.Replace("\r", "").Replace("\n", "");
var resObj = JsonHelper.Instance.JsonToObj<ReceiveWare>(requeststr);
var sql = $"INSERT INTO [dbo].[T_MD_RawMaterialPaomo] ([PID], [planNumber], [materialName], [materialCode], [materialQty], [UserName], [CreateTime], [Remark1], [Remark2], [Remark3]) VALUES" +
$" (N'{Guid.NewGuid()}', N'{resObj.planNumber}', N'{resObj.materialName}', N'{resObj.materialCode}', N'{resObj.materialQty}', N'{resObj.id}', '{DateTime.Now}', NULL, NULL, NULL);";
SqlData.InsertWare(sql);
var Response = new Response();
return Ok(Response);
}
}
}

72
WebAPI/Controllers/WareHouseController.cs
View File

@ -0,0 +1,72 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Web.Http;
using WebAPI.App_Start;
using WebAPI.Models;
using Newtonsoft.Json.Converters;
using QMAPP.MD.Entity.Bucket;
namespace WebAPI.Controllers
{
/// <summary>
/// 注塑投料
/// </summary>
public class WareHouseController : ApiController
{
//T_MD_RawMaterial 投料信息
//T_MD_BUCKETINFO 料筒信息
//T_MD_BucketMaterial 料筒绑定
//T_MD_BucketMaterialClass 零件号绑定
[HttpGet]
public Response IsPass(string BucketCode, string RawMaterial)
{
var result = new Response();
var sqlScript = $"select * from T_MD_BucketMaterial where BucketCode = '{BucketCode}' and RawMaterial = '{RawMaterial}' and IsCheck = '0' ";
DataSet dataSet = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlScript);
if (dataSet.Tables[0].Rows.Count <= 0)
{
result.Code = 201;
result.Message = "料筒与原料不符！";
}
return result;
}
// {"batchCode": "20240407",
// "bucketCode": "1500T-9",
// "createTime": "2024-04-07 14:43:47",
// "id": 1,
// "itemCode": "I01022501",
// "planNumber": "DP20230109004",
// "referenceCode": "123",
// "supplierCode": "001",
// "weight": "10"
//}
public async Task<IHttpActionResult> Insert()
{
var request = await this.Request.Content.ReadAsStringAsync();
var requeststr = request.Replace("\r", "").Replace("\n", "");
var resObj = JsonHelper.Instance.JsonToObj<ReceiveWareHouse>(requeststr);
var sql = $"INSERT INTO[dbo].[T_MD_RawMaterial] ([PID], [BucketCode], [PartCode], [BatchCode], [SerialCode], [IsCheck], [CREATEUSER], [CREATEDATE], [planNumber], [supplierCode], [weight]) VALUES" +
$" ('{Guid.NewGuid()}', '{resObj.bucketCode}', '{resObj.itemCode}', '{resObj.batchCode}', '{resObj.referenceCode}', '0', '{resObj.id}', '{DateTime.Now}', '{resObj.planNumber}', '{resObj.supplierCode}', '{resObj.weight}');";
SqlData.InsertWare(sql);
var Response = new Response();
return Ok(Response);
}
}
}

19
WebAPI/Models/InsertMachineValue.cs
View File

@ -1,19 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
public class InsertMachineValue
{
public string MachineCode { get; set; }
}
}

63
WebAPI/Models/OrderPlan_PaoMo.cs
View File

@ -0,0 +1,63 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
public class OrderPlan_PaoMo
{
public string PID { get; set; }
/// <summary>
/// 计划号
/// </summary>
public string PLAN_NO { get; set; }
/// <summary>
/// 计划顺序号
/// </summary>
public string PLAN_SEQ { get; set; }
/// <summary>
/// 计划状态
/// </summary>
public string PLAN_STATE { get; set; }
/// <summary>
/// 零件号
/// </summary>
public string MATERIAL_CODE { get; set; }
/// <summary>
/// 绑定BOM
/// </summary>
public string PBOM_CODE { get; set; }
/// <summary>
/// 绑定工艺路线
/// </summary>
public string ROUTE_CODE { get; set; }
/// <summary>
/// 计划数量
/// </summary>
public string QTY { get; set; }
/// <summary>
/// 完成数
/// </summary>
public string COMPLETE_QTY { get; set; }
/// <summary>
/// 计划日期
/// </summary>
public string PLAN_DATE { get; set; }
/// <summary>
/// 计划班次
/// </summary>
public string SHIFT_CODE { get; set; }
}
}

63
WebAPI/Models/OrderPlan_ZhuSu.cs
View File

@ -0,0 +1,63 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
public class OrderPlan_ZhuSu
{
public string PID { get; set; }
/// <summary>
/// 计划号
/// </summary>
public string PLAN_NO { get; set; }
/// <summary>
/// 计划顺序号
/// </summary>
public string PLAN_SEQ { get; set; }
/// <summary>
/// 计划状态
/// </summary>
public string PLAN_STATE { get; set; }
/// <summary>
/// 零件号
/// </summary>
public string MATERIAL_CODE { get; set; }
/// <summary>
/// 绑定BOM
/// </summary>
public string PBOM_CODE { get; set; }
/// <summary>
/// 绑定工艺路线
/// </summary>
public string ROUTE_CODE { get; set; }
/// <summary>
/// 计划数量
/// </summary>
public string QTY { get; set; }
/// <summary>
/// 完成数
/// </summary>
public string COMPLETE_QTY { get; set; }
/// <summary>
/// 计划日期
/// </summary>
public string PLAN_DATE { get; set; }
/// <summary>
/// 计划班次
/// </summary>
public string SHIFT_CODE { get; set; }
}
}

47
WebAPI/Models/ReceiveWare.cs
View File

@ -0,0 +1,47 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
/// <summary>
/// 泡沫投料
/// </summary>
public class ReceiveWare
{
/// <summary>
/// 计划号
/// </summary>
public string planNumber { get; set; }
/// <summary>
/// 原料名称
/// </summary>
public string materialName { get; set; }
/// <summary>
/// 原料名称
/// </summary>
public string materialCode { get; set; }
/// <summary>
/// 投料数量
/// </summary>
public string materialQty { get; set; }
/// <summary>
/// 投料人
/// </summary>
public string id { get; set; }
public string createTime { get; set; }
}
public class TypeList
{
public string Code { get; set; }
public string Name { get; set; }
}
}

52
WebAPI/Models/ReceiveWareHouse.cs
View File

@ -0,0 +1,52 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
public class ReceiveWareHouse
{
/// <summary>
/// 料筒号
/// </summary>
public string bucketCode { get; set; }
/// <summary>
/// 批次号
/// </summary>
public string batchCode { get; set; }
/// <summary>
/// 投料人
/// </summary>
public string id { get; set; }
public string createTime { get; set; }
/// <summary>
/// 零件号
/// </summary>
public string itemCode { get; set; }
/// <summary>
/// 计划号
/// </summary>
public string planNumber { get; set; }
/// <summary>
/// 参考号
/// </summary>
public string referenceCode { get; set; }
/// <summary>
/// 供应商编码
/// </summary>
public string supplierCode { get; set; }
/// <summary>
/// 投料值
/// </summary>
public string weight { get; set; }
}
}

12
WebAPI/WebAPI.csproj
View File

@ -165,12 +165,17 @@
<Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" /> <Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" /> <Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
<Compile Include="Controllers\HomeController.cs" /> <Compile Include="Controllers\HomeController.cs" />
<Compile Include="Controllers\MachineController.cs" />
<Compile Include="Controllers\WareController.cs" />
<Compile Include="Controllers\WareHouseController.cs" />
<Compile Include="Controllers\PlanController.cs" /> <Compile Include="Controllers\PlanController.cs" />
<Compile Include="Controllers\MachineClassController.cs" /> <Compile Include="Controllers\MachineClassController.cs" />
<Compile Include="Controllers\LoginController.cs" /> <Compile Include="Controllers\LoginController.cs" />
<Compile Include="Models\JsonHelper.cs" /> <Compile Include="Models\JsonHelper.cs" />
<Compile Include="Models\OrderPlan_ZhuSu.cs" />
<Compile Include="Models\OrderPlan_PaoMo.cs" />
<Compile Include="Models\ReceiveWare.cs" />
<Compile Include="Models\ReceiveMachine.cs" /> <Compile Include="Models\ReceiveMachine.cs" />
<Compile Include="Models\InsertMachineValue.cs" />
<Compile Include="Models\MachineValue.cs" /> <Compile Include="Models\MachineValue.cs" />
<Compile Include="Controllers\ValuesController.cs" /> <Compile Include="Controllers\ValuesController.cs" />
<Compile Include="Global.asax.cs"> <Compile Include="Global.asax.cs">
@ -179,6 +184,7 @@
<Compile Include="Models\MachineClass.cs" /> <Compile Include="Models\MachineClass.cs" />
<Compile Include="Models\Plan.cs" /> <Compile Include="Models\Plan.cs" />
<Compile Include="Models\PutMachine.cs" /> <Compile Include="Models\PutMachine.cs" />
<Compile Include="Models\ReceiveWareHouse.cs" />
<Compile Include="Models\Response.cs" /> <Compile Include="Models\Response.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
@ -267,6 +273,10 @@
<Content Include="Scripts\jquery-3.3.1.min.map" /> <Content Include="Scripts\jquery-3.3.1.min.map" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\APPQ5\QMAPP.FJC.Entity\QMAPP.FJC.Entity.csproj">
<Project>{17123CDD-0BA7-496F-8E4E-FCBABE0463CA}</Project>
<Name>QMAPP.FJC.Entity</Name>
</ProjectReference>
<ProjectReference Include="..\APP\QMAPP.BLL\QMAPP.BLL.csproj"> <ProjectReference Include="..\APP\QMAPP.BLL\QMAPP.BLL.csproj">
<Project>{dcabed0d-a8fc-47ed-bfb1-aaaead0a9b01}</Project> <Project>{dcabed0d-a8fc-47ed-bfb1-aaaead0a9b01}</Project>
<Name>QMAPP.BLL</Name> <Name>QMAPP.BLL</Name>

Write Preview
Loading…
Cancel
Save