diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsRecordController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsRecordController.cs
index cd80987f..ba5fa57e 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsRecordController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsRecordController.cs
@@ -31,7 +31,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpGet("list")]
- [ActionPermissionFilter(Permission = "business:wmgoodsrecord:list")]
+ [AllowAnonymous]
public IActionResult QueryWmGoodsRecord([FromQuery] WmGoodsRecordQueryDto parm)
{
var response = _WmGoodsRecordService.GetList(parm);
@@ -44,7 +44,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpGet("{Id}")]
- [ActionPermissionFilter(Permission = "business:wmgoodsrecord:query")]
+ [AllowAnonymous]
public IActionResult GetWmGoodsRecord(string Id)
{
var response = _WmGoodsRecordService.GetInfo(Id);
@@ -58,7 +58,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpPost]
- [ActionPermissionFilter(Permission = "business:wmgoodsrecord:add")]
+ [AllowAnonymous]
[Log(Title = "成品库数据变动表", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmGoodsRecord([FromBody] WmGoodsRecordDto parm)
{
@@ -74,7 +74,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpPut]
- [ActionPermissionFilter(Permission = "business:wmgoodsrecord:edit")]
+ [AllowAnonymous]
[Log(Title = "成品库数据变动表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmGoodsRecord([FromBody] WmGoodsRecordDto parm)
{
@@ -89,7 +89,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpDelete("{ids}")]
- [ActionPermissionFilter(Permission = "business:wmgoodsrecord:delete")]
+ [AllowAnonymous]
[Log(Title = "成品库数据变动表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmGoodsRecord(string ids)
{
diff --git a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
index 3afe3471..72d78f7c 100644
--- a/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
+++ b/ZR.Service/mes/wms/WMentryWarehousing_productService.cs
@@ -133,6 +133,7 @@ namespace ZR.Service.mes.wms
FkInventoryId = SnowFlakeSingle.Instance.NextId().ToString(),
Code = "IntoProductwarehouse",
Partnumber = partnumbers.FirstOrDefault() ?? "无零件号",
+ ChangeType = 1,
ChangePackage = totalPackage,
ChangeQuantity = totalPartnumber,
Remark = $"货物入库\n仓库号:{location}\n零件号:{string.Join(',', partnumbers)}\n总箱数:{totalPackage}",
@@ -177,7 +178,7 @@ namespace ZR.Service.mes.wms
{
materialCode = item.Partnumber,
location = item.LocationCode,
- Qty = item.GoodsNumLogic.ToString(),
+ Qty = item.GoodsNumAction.ToString(),
LotNo = dateString,
createTime = DateTime.Now,
userID = createName,
diff --git a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
index c41ab70f..fbccb345 100644
--- a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
+++ b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs
@@ -1,8 +1,8 @@
-using Infrastructure.Attribute;
-using SqlSugar;
using System;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
+using Infrastructure.Attribute;
+using SqlSugar;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Service.mes.wms.IService;
@@ -140,7 +140,25 @@ namespace ZR.Service.mes.wms
.IgnoreColumns(ignoreAllNullColumns: true)
.ExecuteCommand();
}
+ // 插入操作日志
+ var record = new WmGoodsRecord
+ {
+ // 日志属性初始化(同原逻辑)
+ Id = SnowFlakeSingle.Instance.NextId().ToString(),
+ FkInventoryId = SnowFlakeSingle.Instance.NextId().ToString(),
+ Code = "AddWmGoodsOutProduction",
+ Partnumber = model.Partnumber ?? "无零件号",
+ ChangeType = 2,
+ ChangePackage = 1,
+ ChangeQuantity = model.GoodsNumLogic - model.GoodsNumAction,
+ Remark = $"网页单次货物出库\n仓库号:{model.LocationCode}\n零件号:{model.Partnumber}\n总箱数:{1}",
+ CreatedBy = model.CreatedBy,
+ CreatedTime = DateTime.Now
+ // 其他属性省略
+ };
+ if (Context.Insertable(record).ExecuteCommand() == 0)
+ throw new Exception("操作记录插入失败");
// 出库信息转发U8
//1.构建信息
@@ -185,7 +203,7 @@ namespace ZR.Service.mes.wms
customerCode = _customerCode,
materialCode = item.Partnumber,
location = item.LocationCode,
- Qty = item.GoodsNumLogic.ToString(),
+ Qty = item.GoodsNumAction.ToString(),
// 批次号
LotNo = dateString,
createTime = DateTime.Now,
@@ -428,7 +446,7 @@ namespace ZR.Service.mes.wms
customerCode = _customerCode,
materialCode = item.Partnumber,
location = item.LocationCode,
- Qty = item.GoodsNumLogic.ToString(),
+ Qty = item.GoodsNumAction.ToString(),
// 批次号
LotNo = dateString,
createTime = DateTime.Now,
diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs
index 101da753..1e2f55c1 100644
--- a/ZR.Service/mes/wms/WmOutOrderService.cs
+++ b/ZR.Service/mes/wms/WmOutOrderService.cs
@@ -652,14 +652,14 @@ namespace ZR.Service.mes.wms
{
Id = SnowFlakeSingle.Instance.NextId().ToString(),
FkInventoryId = SnowFlakeSingle.Instance.NextId().ToString(),
- Code = "DoMaterialOut出库",
+ Code = "DoMaterialOut",
Partnumber = partNumbers.FirstOrDefault() ?? "无零件号",
ChangeType = 2,
ChangePackage = totalPackage,
ChangeQuantity = totalPartCount,
ActionTime = DateTime.Now,
Status = 1,
- Remark = $"出库单号:{shipmentNum}\n客户:{customerCode}\n零件号:{string.Join(',', partNumbers)}\n处理:插入{finalInsertCount}条,删除{finalDeleteCount}条",
+ Remark = $"货物出库,出库单号:{shipmentNum}\n客户:{customerCode}\n零件号:{string.Join(',', partNumbers)}\n处理:插入{finalInsertCount}条,删除{finalDeleteCount}条",
CreatedBy = createBy,
CreatedTime = DateTime.Now
};
@@ -1411,7 +1411,7 @@ namespace ZR.Service.mes.wms
{
Id = SnowFlakeSingle.Instance.NextId().ToString(),
FkInventoryId = SnowFlakeSingle.Instance.NextId().ToString(),
- Code = "PDA出库",
+ Code = "PdaOutboundByOutOrderPlan",
Partnumber = partnumbers.FirstOrDefault() ?? "无零件号",
BlankNum = "",
ChangeType = 2,
@@ -1488,7 +1488,7 @@ namespace ZR.Service.mes.wms
customerCode = _customerCode,
materialCode = item.Partnumber,
location = item.LocationCode,
- Qty = item.GoodsNumLogic.ToString(),
+ Qty = item.GoodsNumAction.ToString(),
LotNo = dateString,
createTime = DateTime.Now,
userID = parm.Operator,