现场问题修改

This commit is contained in:
zgf committed 2024-02-02 09:14:46 +08:00
1 parent faa3f5a9d3
commit 9872a308f7
6 files changed
+43 -16

No files matched your search

+3 -1
View File
@@ -96,7 +96,9 @@ namespace HHWMS.Web
{ {
var taskno = response.TaskId.Split("-")[0]; var taskno = response.TaskId.Split("-")[0];
//wcs 任务反馈 //wcs 任务反馈
var task = _unitwork.Find<TaskHeader>(x => x.TaskNo.Equals(taskno) && x.Status != TaskStatusEnum.完成).Include(x => x.TaskDetails).FirstOrDefault(); var task = _unitwork.Find<TaskHeader>(x => x.TaskNo.Equals(taskno)
&& x.Status != TaskStatusEnum.完成)
.Include(x => x.TaskDetails).FirstOrDefault();
if (task != null) if (task != null)
{ {
@@ -328,7 +328,7 @@
rows.splice(index, 1); rows.splice(index, 1);
}, },
handleEdit(index, row) { handleEdit(index, row) {
console.log(index, row, this.bindingData); // console.log(index, row, this.bindingData);
if (row.qty < row.bindQty) { if (row.qty < row.bindQty) {
this.$message({ this.$message({
message: "数量不能大于剩余绑定数量!" + row.qty, message: "数量不能大于剩余绑定数量!" + row.qty,
@@ -54,7 +54,8 @@ public class ShipOutController : BaseController
// 判断箱号是否合理 // 判断箱号是否合理
if (box != null) if (box != null)
{ {
var inv = _unitWork.Find<Inventory>(x => x.LocationCode.Equals(code)); var inv = _unitWork.Find<Inventory>(x => x.LocationCode.Equals(code)
&& x.TaskStatus == InventoryTaskStatus.任务中);
return JsonMore(inv); return JsonMore(inv);
} }
@@ -102,19 +103,23 @@ public class ShipOutController : BaseController
shipment.Status = ShipStatusEnum.拣货完成; shipment.Status = ShipStatusEnum.拣货完成;
shipment.UpdateTime = DateTime.Now; shipment.UpdateTime = DateTime.Now;
shipment.UpdateBy = Wtm.LoginUserInfo.ITCode; shipment.UpdateBy = Wtm.LoginUserInfo.ITCode;
_unitWork.Update(shipment);
var header = _unitWork.Find<ShipmentHeader>(x => x.ID.Equals(shipment.ShipmentHeaderId))
.Include(x => x.ShipmentDetails)
.FirstOrDefault();
if (!shipment.ShipmentHeader.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.拣货完成)) if (!header.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.拣货完成))
{ {
shipment.ShipmentHeader.FirstStatus = ShipStatusEnum.拣货完成; header.FirstStatus = ShipStatusEnum.拣货完成;
} }
else else
{ {
shipment.ShipmentHeader.FirstStatus = ShipStatusEnum.拣货中; header.FirstStatus = ShipStatusEnum.拣货中;
} }
shipment.UpdateBy = Wtm.LoginUserInfo.ITCode; header.UpdateTime = DateTime.Now;
shipment.UpdateTime = DateTime.Now; header.UpdateBy = Wtm.LoginUserInfo.ITCode;
_unitWork.Update(shipment); _unitWork.Update(header);
var inv = _unitWork.FindSingle<Inventory>(x => x.UniqueCode.Equals(uniqueCode) && x.LocationCode == station); var inv = _unitWork.FindSingle<Inventory>(x => x.UniqueCode.Equals(uniqueCode) && x.LocationCode == station);
if (inv != null) if (inv != null)
@@ -253,7 +258,8 @@ public class ShipOutController : BaseController
return JsonMore(null, 500, $"{boxCode}站台没有料箱,无法入库!"); return JsonMore(null, 500, $"{boxCode}站台没有料箱,无法入库!");
} }
//判断是否拣货完成 //判断是否拣货完成
if (_unitWork.IsExit<Inventory>(x => x.LocationCode.Equals(station.Code))) if (_unitWork.IsExit<Inventory>(x => x.LocationCode.Equals(station.Code)
&& x.TaskStatus == InventoryTaskStatus.任务中))
{ {
return JsonMore(null, 500, $"站台{boxCode}存在未拣货物料,无法回库!"); return JsonMore(null, 500, $"站台{boxCode}存在未拣货物料,无法回库!");
} }
@@ -208,10 +208,19 @@
&& _this.form.code.startsWith("C")) { && _this.form.code.startsWith("C")) {
_this.showBack = true; _this.showBack = true;
} }
_this.$refs['form'].resetFields(); if (_this.form.code == "uniqueCode") {
_this.form.code = "";
}
// 清空下面表单 不清空code
_this.form.uniqueCode = "";
_this.form.materialCode = "";
_this.form.materialSpec = "";
_this.form.batch = "";
_this.form.qty = "";
// _this.$refs['form'].resetFields();
} else { } else {
_this.$message({ _this.$message({
message: "提交失败!", message: "提交失败!"+json.Msg,
type: "warning", type: "warning",
duration: "10000", duration: "10000",
}); });
@@ -238,6 +247,14 @@
}); });
return; return;
} }
if (_this.invTable.length > 0) {
_this.$message({
message: "存在未拣货库存,不能创建回库任务!",
type: "error",
duration: "1000",
});
return;
}
this.$confirm('确定执行回库动作?', '提示', { this.$confirm('确定执行回库动作?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@@ -119,7 +119,7 @@ namespace HHWMS.Web
{ {
task.ErrorMsg += $"任务下发失败:{ex.Message}"; task.ErrorMsg += $"任务下发失败:{ex.Message}";
} }
if (task.TaskDetails.Count(x => x.Status == TaskStatusEnum.待下发) == 0 && (task.TaskType == TaskTypeEnum.盘料入库 || task.TaskType == TaskTypeEnum.盘料出库)) if (task.TaskDetails.Count(x => x.Status <= TaskStatusEnum.待下发) == 0 && (task.TaskType == TaskTypeEnum.盘料入库 || task.TaskType == TaskTypeEnum.盘料出库))
{ {
task.Status = TaskStatusEnum.已下发; task.Status = TaskStatusEnum.已下发;
} }
@@ -173,8 +173,10 @@ namespace HHWMS.Web
var gLoc = _unitwork.Find<Location>(x => x.ContainerCode == item.Key var gLoc = _unitwork.Find<Location>(x => x.ContainerCode == item.Key
&& x.Row == location.Row && x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault(); && x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault();
var cTask = _unitwork.Find<TaskHeader>(x => x.ContainerCode == item.Key var cTask = _unitwork.Find<TaskHeader>(x =>
&& x.TaskType == TaskTypeEnum.盘料盒出库).FirstOrDefault(); x.ContainerCode.Equals(item.Key)
&& x.TaskType == TaskTypeEnum.盘料盒出库
).FirstOrDefault();
//查找料塔工位 T //查找料塔工位 T
var tLoc = _unitwork.Find<Location>(x => x.Row == row var tLoc = _unitwork.Find<Location>(x => x.Row == row
&& x.Type.Equals(LocationTypeEnum.料塔)) && x.Type.Equals(LocationTypeEnum.料塔))
@@ -289,7 +291,7 @@ namespace HHWMS.Web
_unitwork.Update(tLoc); _unitwork.Update(tLoc);
_unitwork.Update(containerTask); _unitwork.Update(containerTask);
} }
else if (tLoc != null) else
{ {
task.ZoneCode = ZoneCodeEnum.盘料库; task.ZoneCode = ZoneCodeEnum.盘料库;
task.TaskNo = _unitwork.GetSerialNumber("pout", 4); task.TaskNo = _unitwork.GetSerialNumber("pout", 4);