捡货方法再次修改,取消捡货后回传MES
入库时有出库的库存不再改变状态 交易记录新增容器和单号等信息
This commit is contained in:
1 parent
a64e3a36f4
commit
c286bf55d7
3 files changed
+55
-34
No files matched your search
@@ -100,15 +100,16 @@ public class ShipOutController : BaseController
|
||||
return JsonMore(null, 500, "未找到该出库单!");
|
||||
}
|
||||
|
||||
var header = _unitWork.Find<ShipmentHeader>(x => x.ID.Equals(shipment.ShipmentHeaderId))
|
||||
.Include(x => x.ShipmentDetails)
|
||||
.FirstOrDefault();
|
||||
var detail = header.ShipmentDetails.First(x => x.ID == shipment.ID);
|
||||
detail.Status = ShipStatusEnum.拣货完成;
|
||||
detail.UpdateTime = DateTime.Now;
|
||||
detail.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS";
|
||||
shipment.Status = ShipStatusEnum.拣货完成;
|
||||
shipment.UpdateTime = DateTime.Now;
|
||||
shipment.UpdateBy = Wtm.LoginUserInfo?.ITCode??"WMS";
|
||||
_unitWork.Update(shipment);
|
||||
|
||||
if (!header.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.拣货完成))
|
||||
var header = _unitWork.Find<ShipmentHeader>(x => x.ID.Equals(shipment.ShipmentHeaderId))
|
||||
.FirstOrDefault();
|
||||
var details = _unitWork.Find<ShipmentDetail>(x => x.ShipmentHeaderId == shipment.ShipmentHeaderId)
|
||||
.ToList();
|
||||
if (details.All(x => x.Status == ShipStatusEnum.拣货完成))
|
||||
{
|
||||
header.FirstStatus = ShipStatusEnum.拣货完成;
|
||||
}
|
||||
@@ -124,6 +125,7 @@ public class ShipOutController : BaseController
|
||||
if (inv != null)
|
||||
{
|
||||
//回传MES
|
||||
/*
|
||||
var qr = _unitWork.FindSingle<MaterialQr>(x => x.UniqueCode.Equals(inv.UniqueCode))?.QRCode;
|
||||
|
||||
var bizData = new InStore
|
||||
@@ -158,8 +160,9 @@ public class ShipOutController : BaseController
|
||||
};
|
||||
var client = new ServiceReference1.portTypeClient();
|
||||
var result = client.bizOperationV1Async(request).Result;
|
||||
//var result = new bizOperationV1Response();
|
||||
//result.Status = "Y";
|
||||
*/
|
||||
var result = new bizOperationV1Response();
|
||||
result.Status = "Y";
|
||||
if (result.Status == "Y")
|
||||
{
|
||||
// 删除库存,扣账,记录库存交易 todo,根据站台查询是否还有未拣货的物料,如果没有就清空站台占用
|
||||
@@ -179,6 +182,9 @@ public class ShipOutController : BaseController
|
||||
CompanyCode = inv.CompanyCode,
|
||||
LocationCode = inv.LocationCode,
|
||||
SupplierCode = inv.SupplierCode,
|
||||
BillCode = header.Code,
|
||||
BillDetailId = shipment.ID,
|
||||
ContainerCode = inv.ContainerCode,
|
||||
Qty = inv.Qty,
|
||||
CreateTime = DateTime.Now
|
||||
};
|
||||
@@ -208,14 +214,14 @@ public class ShipOutController : BaseController
|
||||
}
|
||||
}
|
||||
|
||||
Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "success");
|
||||
// Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "success");
|
||||
tran.Commit();
|
||||
return JsonMore(null);
|
||||
}
|
||||
else
|
||||
{
|
||||
tran.Rollback();
|
||||
Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "error");
|
||||
// Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "error");
|
||||
return JsonMore(null, 500, $"回传MES失败,失败原因{result.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user