wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

盘点对接以及现场问题处理

Browse Source
This commit is contained in:
马健
2024-09-18 18:40:29 +08:00
parent b4e7dceffb
commit d835c96f2f
12 changed files with 85 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/PurchaseOrderInput.cs
View File

@@ -90,5 +90,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
/// 是否赠品
/// </summary>
public int? gift { get; set; }
/// <summary>
/// 供应商(辅助属性)
/// </summary>
public string auxprop_gys { get; set; }
}
}

10
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs
View File

@@ -120,4 +120,14 @@ public partial class WmsCarryCode : BaseEntity<string>, IWmsCarryEntity
/// 箱号
/// </summary>
public string? container_no { get; set; }
/// <summary>
/// 辅助属性(供应商)
/// </summary>
public string? auxprop_gys { get; set; }
/// <summary>
/// 辅助属性(小批号)
/// </summary>
public string? auxprop_xph { get; set; }
}

10
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockD.cs
View File

@@ -134,4 +134,14 @@ public partial class WmsPackInstockD : BaseEntity<string>
/// </summary>
public string? lineno { get; set; }
/// <summary>
/// 供应商(辅助属性)
/// </summary>
public string? auxprop_gys { get; set; }
/// <summary>
/// 小批号(辅助属性)
/// </summary>
public string? auxprop_xph { get; set; }
}

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPrdInstockD.cs
View File

@@ -63,4 +63,9 @@ public partial class WmsPrdInstockD : BaseEntity<string>
/// 入库仓库
/// </summary>
public string? rkwarehouse_id { get; set; }
/// <summary>
/// 汇报记录id
/// </summary>
public string? prd_report_id { get; set; }
}

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPrdInstockH.cs
View File

@@ -89,9 +89,4 @@ public partial class WmsPrdInstockH : BaseEntity<string>
/// </summary>
public string? type { get; set; }
/// <summary>
/// 汇报记录id
/// </summary>
public string? prd_report_id { get; set; }
}

13
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseD.cs
View File

@@ -144,5 +144,16 @@ public partial class WmsPurchaseD : BaseEntity<string>
public string erp_purchase_order_d_pk { get; set; }
public string erp_purchase_order_d_lineno { get; set; }
/// <summary>
/// 辅助属性(小批号)
/// </summary>
public string? auxprop_xph { get; set; }
/// <summary>
/// 供应商(辅助属性)
/// </summary>
public string? auxprop_gys { get; set; }
}

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseOrderD.cs
View File

@@ -134,4 +134,9 @@ public partial class WmsPurchaseOrderD : BaseEntity<string>
/// </summary>
public int? gift { get; set; }
/// <summary>
/// 供应商(辅助属性)
/// </summary>
public string? auxprop_gys { get; set; }
}

2
WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
View File

@@ -438,7 +438,7 @@ namespace Tnb.WarehouseMgr
wmsPurchaseOrderD.matcode_id = material.id;
wmsPurchaseOrderD.matspecification = material.material_specification;
}
wmsPurchaseOrderD.auxprop_gys = detail.auxprop_gys;
wmsPurchaseOrderDs.Add(wmsPurchaseOrderD);
}

27
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -301,6 +301,15 @@ namespace Tnb.WarehouseMgr
.Where((a, b) => b.is_type == ((int)EnumLocationType.存储库位).ToString())
.WhereIF(!string.IsNullOrEmpty(input.Region_id), (a, b) => b.region_id == input.Region_id)
.Select((a, b) => b.passage).ToListAsync();
string sss = db.Queryable<WmsPretaskH>()
.InnerJoin<BasLocation>((a, b) =>
(a.status != WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID && a.status != WmsWareHouseConst.PRETASK_BILL_STATUS_CANCEL_ID)
&& (b.id == a.startlocation_id || b.id == a.endlocation_id))
.Where((a, b) => b.wh_id == input.warehouse_id)
.Where((a, b) => b.is_type == ((int)EnumLocationType.存储库位).ToString())
.WhereIF(!string.IsNullOrEmpty(input.Region_id), (a, b) => b.region_id == input.Region_id).ToSqlString();
}
Expression<Func<BasLocation, bool>> whereExp = Expressionable.Create<BasLocation>()
@@ -1090,6 +1099,15 @@ namespace Tnb.WarehouseMgr
getdic.Add("ZS-A12-2", new string[] { "hxjA", "A14AGV允许入满箱", "true" });
getdic.Add("ZS-D01-2", new string[] { "hxjA", "A1AGV允许入满箱", "true" });
getdic.Add("ZS-D02-2", new string[] { "hxjA", "A2AGV允许入满箱", "true" });
getdic.Add("ZS-D03-2", new string[] { "hxjA", "A3AGV允许入满箱", "true" });
getdic.Add("ZS-D04-2", new string[] { "hxjA", "A4AGV允许入满箱", "true" });
getdic.Add("ZS-D05-2", new string[] { "hxjA", "A5AGV允许入满箱", "true" });
getdic.Add("ZS-D06-2", new string[] { "hxjA", "A6AGV允许入满箱", "true" });
getdic.Add("ZS-D07-2", new string[] { "hxjA", "A7AGV允许入满箱", "true" });
getdic.Add("ZS-D08-2", new string[] { "hxjA", "A8AGV允许入满箱", "true" });
putdic.Add("SSX-021-007", new string[] { "东面提升机输送线", "出库输送线7入箱完毕", "true" });
putdic.Add("SSX-011-006", new string[] { "YTCS", "EmptyIn_CS06Done", "true" });
@@ -1224,6 +1242,15 @@ namespace Tnb.WarehouseMgr
getdic.Add("ZS-A11-2", new string[] { "hxjA", "A13AGV允许入满箱", "true" });
getdic.Add("ZS-A12-2", new string[] { "hxjA", "A14AGV允许入满箱", "true" });
getdic.Add("ZS-D01-2", new string[] { "hxjA", "A1AGV允许入满箱", "false" });
getdic.Add("ZS-D02-2", new string[] { "hxjA", "A2AGV允许入满箱", "false" });
getdic.Add("ZS-D03-2", new string[] { "hxjA", "A3AGV允许入满箱", "false" });
getdic.Add("ZS-D04-2", new string[] { "hxjA", "A4AGV允许入满箱", "false" });
getdic.Add("ZS-D05-2", new string[] { "hxjA", "A5AGV允许入满箱", "false" });
getdic.Add("ZS-D06-2", new string[] { "hxjA", "A6AGV允许入满箱", "false" });
getdic.Add("ZS-D07-2", new string[] { "hxjA", "A7AGV允许入满箱", "false" });
getdic.Add("ZS-D08-2", new string[] { "hxjA", "A8AGV允许入满箱", "false" });
putdic.Add("SSX-021-007", new string[] { "东面提升机输送线", "出库输送线7入箱完毕", "true" });

6
WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs
View File

@@ -86,7 +86,6 @@ namespace Tnb.WarehouseMgr
wmsPrdInstockH.create_time = DateTime.Now;
wmsPrdInstockH.prd_bill_code = input.prd_bill_code;
wmsPrdInstockH.bill_code = bill_code;
wmsPrdInstockH.prd_report_id = input.prd_report_id;
wmsPrdInstockH.material_id = input.material_id;
wmsPrdInstockH.material_code = input.material_code;
wmsPrdInstockH.material_name = input.material_name;
@@ -153,8 +152,9 @@ namespace Tnb.WarehouseMgr
prd_instock_id = prd_instock_code_id,
status = WmsWareHouseConst.TASK_BILL_STATUS_YXD_ID,
scwarehouse_id = scwarehouse_id,
rkwarehouse_id = rkwarehouse_id
};
rkwarehouse_id = rkwarehouse_id,
prd_report_id = input.prd_report_id
};
WmsPrdInstockDs.Add(wmsPrdInstockD);
foreach (WmsPrdInstockCodeInput prdInstockCodeInput in input.prdInstockCodes)

2
WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
View File

@@ -97,7 +97,7 @@ namespace Tnb.WarehouseMgr
}
#endregion
List<WmsOutinStockDetail> wmsOutinStockDetails = await _db.Queryable<WmsOutinStockDetail>()
.Where(x => x.source_detail_id == wmsPurchaseD.id && x.source_type == WmsWareHouseConst.BIZTYPE_WMSINSTOCK_ID)
.ToListAsync();

6
WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
View File

@@ -136,6 +136,7 @@ namespace Tnb.WarehouseMgr
await _db.Insertable(instockDs).ExecuteCommandAsync();
var purchase = await _db.Queryable<WmsPurchaseH>().FirstAsync(it => it.id == purchaseDs.First().bill_id);
if (string.IsNullOrEmpty(purchase.supplier_id))
{
BasSupplier basSupplier = await _db.Queryable<BasSupplier>().Where(x=>x.supplier_code==purchase.supplier_code).FirstAsync();
@@ -149,6 +150,11 @@ namespace Tnb.WarehouseMgr
purchase.supplier_id = basSupplier.id;
}
}
//purchase.supplier_code
List<WmsPurchaseD> dList = await _db.Queryable<WmsPurchaseD>().Where(x=>x.bill_id==purchaseDs.First().bill_id).OrderBy(x=>x.id).ToListAsync();
List<String> materialIds = purchaseDs.Select(x=>x.material_id).Distinct().ToList();
List<String> unitCodes = purchaseDs.Select(x => x.unit_id).Distinct().ToList();