diff --git a/APPQ5/QMAPP.FJC.Entity/Bucket/RawMaterial.cs b/APPQ5/QMAPP.FJC.Entity/Bucket/RawMaterial.cs
index 8374349..0a36138 100644
--- a/APPQ5/QMAPP.FJC.Entity/Bucket/RawMaterial.cs
+++ b/APPQ5/QMAPP.FJC.Entity/Bucket/RawMaterial.cs
@@ -46,13 +46,20 @@ namespace QMAPP.MD.Entity.Bucket
public string BatchCode { get; set; }
///
- /// 流水号
+ /// 参考号
///
- [Description("流水号")]
+ [Description("参考号")]
[DBColumn(ColumnName = "SerialCode", DataType = DbType.String)]
public string SerialCode { get; set; }
public string MaterialCode { get; set; }
+ ///
+ /// 供应商编码
+ ///
+ [Description("供应商编码")]
+ [DBColumn(ColumnName = "SupplierCode", DataType = DbType.String)]
+ public string SupplierCode { get; set; }
+
///
/// 是否可用
///
diff --git a/WebAPI/App_Start/SqlData.cs b/WebAPI/App_Start/SqlData.cs
index f8c2820..99c17b4 100644
--- a/WebAPI/App_Start/SqlData.cs
+++ b/WebAPI/App_Start/SqlData.cs
@@ -32,7 +32,7 @@ namespace WebAPI.App_Start
}
///
- /// 插入电表数据
+ /// 插入泡沫点检数据
///
/// 产品编号
///
@@ -47,6 +47,17 @@ namespace WebAPI.App_Start
}
+ ///
+ /// 插入泡沫点检数据
+ ///
+ /// 产品编号
+ ///
+ public static void InsertWare(string sql)
+ {
+ var sqlScript = sql;
+
+ SqlHelper.ExecuteNonQuery(Config.maindbConnectionString, CommandType.Text, sqlScript);
+ }
}
}
diff --git a/WebAPI/Controllers/LoginController.cs b/WebAPI/Controllers/LoginController.cs
index 0d3c86b..857f526 100644
--- a/WebAPI/Controllers/LoginController.cs
+++ b/WebAPI/Controllers/LoginController.cs
@@ -15,6 +15,12 @@ namespace WebAPI.Controllers
{
public class LoginController : ApiController
{
+ ///
+ /// 判断用户名密码
+ ///
+ ///
+ ///
+ ///
public Response Get(string UserName,string PassWord)
{
var result = new Response();
@@ -36,7 +42,7 @@ namespace WebAPI.Controllers
else
{
result.Code = 201;
- result.Message = "用户信息不存在";
+ result.Message = "用户信息不存在或密码错误";
}
return result;
diff --git a/WebAPI/Controllers/MachineClassController.cs b/WebAPI/Controllers/MachineClassController.cs
index 0eb5e9b..c2d4a4b 100644
--- a/WebAPI/Controllers/MachineClassController.cs
+++ b/WebAPI/Controllers/MachineClassController.cs
@@ -10,8 +10,16 @@ using Newtonsoft.Json.Converters;
namespace WebAPI.Controllers
{
+ ///
+ /// 泡沫、注塑点检
+ ///
public class MachineClassController : ApiController
{
+ ///
+ /// 获取点检项
+ ///
+ ///
+ ///
public Response> Get(string MachineCode)
{
var result = new Response>();
@@ -108,7 +116,10 @@ namespace WebAPI.Controllers
return result;
}
-
+ ///
+ /// 点检录入
+ ///
+ ///
public async Task Insert()
{
var request = await this.Request.Content.ReadAsStringAsync();
@@ -176,8 +187,76 @@ namespace WebAPI.Controllers
SqlData.InsertMachine(t);
}
+
+ var Response = new Response();
+
+ return Ok(Response);
+ }
+
+ ///
+ /// 获取注塑点检项
+ ///
+ ///
+ ///
+ [HttpGet]
+ public Response> GZhuSuItem(string Machine)
+ {
+ var result = new Response>();
+
+ 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);
- return Ok();
+ var list_PutMachine = new List();
+ 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();
+ 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;
}
+
}
}
diff --git a/WebAPI/Controllers/MachineController.cs b/WebAPI/Controllers/MachineController.cs
new file mode 100644
index 0000000..fe39c0a
--- /dev/null
+++ b/WebAPI/Controllers/MachineController.cs
@@ -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
+{
+ ///
+ /// 泡沫、注塑点检
+ ///
+ public class MachineController : ApiController
+ {
+ ///
+ /// 点检录入
+ ///
+ ///
+ public async Task InsertZhusu()
+ {
+ var request = await this.Request.Content.ReadAsStringAsync();
+
+ var requeststr = request.Replace("\r", "").Replace("\n", "");
+
+ var resObj = JsonHelper.Instance.JsonToObj(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);
+ }
+ }
+}
diff --git a/WebAPI/Controllers/PlanController.cs b/WebAPI/Controllers/PlanController.cs
index 3f2e5f3..cf60401 100644
--- a/WebAPI/Controllers/PlanController.cs
+++ b/WebAPI/Controllers/PlanController.cs
@@ -15,23 +15,45 @@ namespace WebAPI.Controllers
{
public class PlanController : ApiController
{
- public Response GetPaoMoList(string UserName, string PassWord)
+ public Response> GetList(string Type)
{
- var result = new Response();
-
- LoginInfo login = new LoginInfo();
- login.LoginUserID = UserName;
-
- login.PassWord = QMFrameWork.Common.Encrypt.DESEncrypt.Encrypt(PassWord);
+ var result = new Response>();
+
+ List List_plan = new List();
+ //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 = "";
- 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'";
+ if (Type == "paomo")
+ {
+ sqlScript = $"select top 10 * from T_PP_ORDERPLAN_PAOMO order by PLAN_DATE desc";
+ }
+ else if(Type == "zhusu")
+ 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)
{
- login.UserName = dataSet.Tables[0].Rows[0]["USERNAME"].ToString();
- result.Result = login;
+ foreach (DataRow row in dataSet.Tables[0].Rows)
+ {
+ 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
{
@@ -43,33 +65,48 @@ namespace WebAPI.Controllers
}
- public Response Get(string UserName,string PassWord)
- {
- var result = new Response();
+ //public Response> GetZhuSuList(string data)
+ //{
+ // var result = new Response>();
+
+ // List List_plan = new List();
- LoginInfo login = new LoginInfo();
- login.LoginUserID = UserName;
+ // //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";
- login.PassWord = QMFrameWork.Common.Encrypt.DESEncrypt.Encrypt(PassWord);
+ // DataSet dataSet = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlScript);
- var sqlScript = $"select * from T_QM_USER where LOGINUSERID ='{UserName}' and PASSWORD = '{login.PassWord}'";
+ // 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();
- DataSet dataSet = SqlHelper.ExecuteDataset(Config.maindbConnectionString, CommandType.Text, sqlScript);
+ // List_plan.Add(OrderPlan);
+ // }
+
+ // result.Result = List_plan;
+ // }
+ // else
+ // {
+ // result.Code = 201;
+ // result.Message = "用户信息不存在";
+ // }
+
+ // return result;
+ //}
- if (dataSet.Tables[0].Rows.Count > 0)
- {
- login.UserName = dataSet.Tables[0].Rows[0]["USERNAME"].ToString();
- result.Result = login;
- }
- else
- {
- result.Code = 201;
- result.Message = "用户信息不存在";
- }
-
- return result;
- }
-
}
}
diff --git a/WebAPI/Controllers/WareController.cs b/WebAPI/Controllers/WareController.cs
new file mode 100644
index 0000000..ae87ef9
--- /dev/null
+++ b/WebAPI/Controllers/WareController.cs
@@ -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
+{
+ ///
+ /// 注塑投料
+ ///
+ public class WareController : ApiController
+ {
+ ///
+ /// 泡沫投料种类
+ ///
+ ///
+ ///
+ ///
+ [HttpGet]
+ public Response> GetTypeList()
+ {
+ var result = new Response>();
+ var dic_list = new List();
+
+ 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;
+ }
+
+ ///
+ /// 泡沫投料 插入
+ ///
+ ///
+ //{"planNumber":"DP20230109004","materialName":"NBT催化剂3","materialCode":"C45050101","materialQty":"10","id":"admin","createTime":"2024-04-07 11:11:21"} 原料投入泡沫提交的参数这样可以吗
+ public async Task Insert()
+ {
+ var request = await this.Request.Content.ReadAsStringAsync();
+
+ var requeststr = request.Replace("\r", "").Replace("\n", "");
+
+ var resObj = JsonHelper.Instance.JsonToObj(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);
+ }
+ }
+}
diff --git a/WebAPI/Controllers/WareHouseController.cs b/WebAPI/Controllers/WareHouseController.cs
new file mode 100644
index 0000000..8423cec
--- /dev/null
+++ b/WebAPI/Controllers/WareHouseController.cs
@@ -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
+{
+ ///
+ /// 注塑投料
+ ///
+ 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 Insert()
+ {
+ var request = await this.Request.Content.ReadAsStringAsync();
+
+ var requeststr = request.Replace("\r", "").Replace("\n", "");
+
+ var resObj = JsonHelper.Instance.JsonToObj(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);
+ }
+ }
+}
diff --git a/WebAPI/Models/InsertMachineValue.cs b/WebAPI/Models/InsertMachineValue.cs
deleted file mode 100644
index 574df81..0000000
--- a/WebAPI/Models/InsertMachineValue.cs
+++ /dev/null
@@ -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; }
-
-
-
-
-
-
-
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Models/OrderPlan_PaoMo.cs b/WebAPI/Models/OrderPlan_PaoMo.cs
new file mode 100644
index 0000000..5525f1f
--- /dev/null
+++ b/WebAPI/Models/OrderPlan_PaoMo.cs
@@ -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; }
+
+ ///
+ /// 计划号
+ ///
+ public string PLAN_NO { get; set; }
+
+ ///
+ /// 计划顺序号
+ ///
+ public string PLAN_SEQ { get; set; }
+
+ ///
+ /// 计划状态
+ ///
+ public string PLAN_STATE { get; set; }
+
+ ///
+ /// 零件号
+ ///
+ public string MATERIAL_CODE { get; set; }
+
+ ///
+ /// 绑定BOM
+ ///
+ public string PBOM_CODE { get; set; }
+
+ ///
+ /// 绑定工艺路线
+ ///
+ public string ROUTE_CODE { get; set; }
+
+ ///
+ /// 计划数量
+ ///
+ public string QTY { get; set; }
+
+ ///
+ /// 完成数
+ ///
+ public string COMPLETE_QTY { get; set; }
+
+ ///
+ /// 计划日期
+ ///
+ public string PLAN_DATE { get; set; }
+
+ ///
+ /// 计划班次
+ ///
+ public string SHIFT_CODE { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/OrderPlan_ZhuSu.cs b/WebAPI/Models/OrderPlan_ZhuSu.cs
new file mode 100644
index 0000000..68042e0
--- /dev/null
+++ b/WebAPI/Models/OrderPlan_ZhuSu.cs
@@ -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; }
+
+ ///
+ /// 计划号
+ ///
+ public string PLAN_NO { get; set; }
+
+ ///
+ /// 计划顺序号
+ ///
+ public string PLAN_SEQ { get; set; }
+
+ ///
+ /// 计划状态
+ ///
+ public string PLAN_STATE { get; set; }
+
+ ///
+ /// 零件号
+ ///
+ public string MATERIAL_CODE { get; set; }
+
+ ///
+ /// 绑定BOM
+ ///
+ public string PBOM_CODE { get; set; }
+
+ ///
+ /// 绑定工艺路线
+ ///
+ public string ROUTE_CODE { get; set; }
+
+ ///
+ /// 计划数量
+ ///
+ public string QTY { get; set; }
+
+ ///
+ /// 完成数
+ ///
+ public string COMPLETE_QTY { get; set; }
+
+ ///
+ /// 计划日期
+ ///
+ public string PLAN_DATE { get; set; }
+
+ ///
+ /// 计划班次
+ ///
+ public string SHIFT_CODE { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ReceiveWare.cs b/WebAPI/Models/ReceiveWare.cs
new file mode 100644
index 0000000..e066730
--- /dev/null
+++ b/WebAPI/Models/ReceiveWare.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ ///
+ /// 泡沫投料
+ ///
+ public class ReceiveWare
+ {
+ ///
+ /// 计划号
+ ///
+ public string planNumber { get; set; }
+
+ ///
+ /// 原料名称
+ ///
+ public string materialName { get; set; }
+
+ ///
+ /// 原料名称
+ ///
+ public string materialCode { get; set; }
+
+ ///
+ /// 投料数量
+ ///
+ public string materialQty { get; set; }
+
+ ///
+ /// 投料人
+ ///
+ public string id { get; set; }
+
+ public string createTime { get; set; }
+ }
+
+ public class TypeList
+ {
+ public string Code { get; set; }
+
+ public string Name { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ReceiveWareHouse.cs b/WebAPI/Models/ReceiveWareHouse.cs
new file mode 100644
index 0000000..a6ff1e1
--- /dev/null
+++ b/WebAPI/Models/ReceiveWareHouse.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ReceiveWareHouse
+ {
+ ///
+ /// 料筒号
+ ///
+ public string bucketCode { get; set; }
+
+ ///
+ /// 批次号
+ ///
+ public string batchCode { get; set; }
+
+ ///
+ /// 投料人
+ ///
+ public string id { get; set; }
+
+ public string createTime { get; set; }
+
+ ///
+ /// 零件号
+ ///
+ public string itemCode { get; set; }
+
+ ///
+ /// 计划号
+ ///
+ public string planNumber { get; set; }
+
+ ///
+ /// 参考号
+ ///
+ public string referenceCode { get; set; }
+
+ ///
+ /// 供应商编码
+ ///
+ public string supplierCode { get; set; }
+
+ ///
+ /// 投料值
+ ///
+ public string weight { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index dec9a3c..d0ad2ba 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -165,12 +165,17 @@
+
+
+
+
+
+
-
@@ -179,6 +184,7 @@
+
@@ -267,6 +273,10 @@
+
+ {17123CDD-0BA7-496F-8E4E-FCBABE0463CA}
+ QMAPP.FJC.Entity
+
{dcabed0d-a8fc-47ed-bfb1-aaaead0a9b01}
QMAPP.BLL