添加客户管理

修改入库页面
修改 库存 物料 工序等页面
This commit is contained in:
zhougf committed 2025-07-25 04:35:31 +08:00
1 parent 2435176f77
commit c2b039ea47
41 files changed
+977 -160

No files matched your search

@@ -93,21 +93,41 @@ namespace HHWMS.Web.Controllers
var materials = _unitWork.Find<Material>(x =>
x.MaterialCode.Contains(keyword) ||
x.MaterialName.Contains(keyword))
x.MaterialType.Contains(keyword))
.Take(10)
.Select(x => new {
MaterialCode = x.MaterialCode,
MaterialName = x.MaterialName,
MaterialSpec = x.MaterialSpec,
MaterialUnit = x.MaterialUnit
x.MaterialCode,
x.MaterialName,
x.MaterialSpec,
x.MaterialUnit,
x.MaterialType
})
.ToList();
return JsonMore( materials );
}
[HttpGet]
public ActionResult SearchCompanies(string keyword)
{
if (string.IsNullOrWhiteSpace(keyword))
{
return Json(new { Code = 200, Data = new object[] { } });
}
// 假设公司信息在Company表,字段CompanyCode、CompanyName
var companies = DC.Set<Customer>()
.Where(x => x.Code.Contains(keyword) || x.Name.Contains(keyword))
.Select(x => new {
CompanyCode = x.Code,
CompanyName = x.Name
})
.Take(10)
.ToList();
return Json(new { Code = 200, Data = companies });
}
[HttpPost]
public ActionResult AddInventory(string containerCode, string materialCode, string company, decimal qty)
public ActionResult AddInventory(string containerCode, string materialCode, string company, string sourceCode, decimal qty)
{
try
{
@@ -150,6 +170,8 @@ namespace HHWMS.Web.Controllers
MaterialSpec = material.MaterialSpec,
MaterialUnit = material.MaterialUnit,
CompanyCode = company,
SourceCode = sourceCode,
SupplierCode = material.SupplierCode,
Qty = qty,
TaskStatus = InventoryTaskStatusEnum.Locked,
CreateTime = DateTime.Now
@@ -165,6 +187,9 @@ namespace HHWMS.Web.Controllers
MaterialName = material.MaterialName,
MaterialUnit = material.MaterialUnit,
ContainerCode = containerCode,
CompanyCode = inventory.CompanyCode,
SourceCode = inventory.SourceCode,
SupplierCode = inventory.SupplierCode,
Qty = qty,
CreateTime = DateTime.Now,
CreateBy = "WMS",
@@ -225,7 +250,7 @@ namespace HHWMS.Web.Controllers
TaskType = TaskTypeEnum.入库,
RoadWay = 2,
ContainerCode = containerCode,
FromLocation = "",
FromLocation = "Enter_0000",
ToLocation = "",
Status = TaskStatusEnum.待下发,
CreateTime = DateTime.Now,
@@ -238,12 +263,12 @@ namespace HHWMS.Web.Controllers
TaskNo = task.TaskNo,
PalletNo = task.ContainerCode,
FromLocation = task.FromLocation,
ToLocation = task.ToLocation
ToLocation = "WareCell"
};
_unitWork.Add(task);
_unitWork.Update(container);
/*try
// _unitWork.Add(task);
//
// _unitWork.Update(container);
try
{
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCSCP", "TaskAssign", HttpMethodEnum.POST, postData)
.Result?.Data;
@@ -267,7 +292,7 @@ namespace HHWMS.Web.Controllers
{
task.ErrorMsg = ex.Message;
return JsonMore(null, 500, "任务下发失败!");
}*/
}
return JsonMore(null);
}
@@ -298,6 +323,9 @@ namespace HHWMS.Web.Controllers
MaterialName = inventory.MaterialName,
MaterialUnit = inventory.MaterialUnit,
ContainerCode = inventory.ContainerCode,
CompanyCode = inventory.CompanyCode,
SourceCode = inventory.SourceCode,
SupplierCode = inventory.SupplierCode,
Qty = inventory.Qty,
CreateTime = DateTime.Now,
CreateBy = "WMS",
@@ -343,6 +371,9 @@ namespace HHWMS.Web.Controllers
MaterialName = inventory.MaterialName,
MaterialUnit = inventory.MaterialUnit,
ContainerCode = inventory.ContainerCode,
CompanyCode = inventory.CompanyCode,
SourceCode = inventory.SourceCode,
SupplierCode = inventory.SupplierCode,
Qty = inventory.Qty,
CreateTime = DateTime.Now,
CreateBy = "WMS",
@@ -359,6 +390,9 @@ namespace HHWMS.Web.Controllers
MaterialName = inventory.MaterialName,
MaterialUnit = inventory.MaterialUnit,
ContainerCode = inventory.ContainerCode,
CompanyCode = inventory.CompanyCode,
SourceCode = inventory.SourceCode,
SupplierCode = inventory.SupplierCode,
Qty = qty,
CreateTime = DateTime.Now,
CreateBy = "WMS",
@@ -419,7 +453,7 @@ namespace HHWMS.Web.Controllers
TaskType = TaskTypeEnum.入库,
RoadWay = 2,
ContainerCode = containerCode,
FromLocation = "",
FromLocation = "Enter_0000",
ToLocation = "",
Status = TaskStatusEnum.待下发,
CreateTime = DateTime.Now,