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-10-08 10:57:30 +08:00
parent 7152324b26
commit f5c0e0e41f
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,7 +320,7 @@ namespace Tnb.WarehouseMgr
instock!.sync_status = callBackRes == true ? WmsWareHouseConst.SYNC_STATUS__SYNCCOMPLETE : WmsWareHouseConst.SYNC_STATUS__SYNCFAILED; instock!.sync_status = callBackRes == true ? WmsWareHouseConst.SYNC_STATUS__SYNCCOMPLETE : WmsWareHouseConst.SYNC_STATUS__SYNCFAILED;
_ = await _db.Updateable(instock).UpdateColumns(it => it.sync_status).ExecuteCommandAsync(); _ = await _db.Updateable(instock).UpdateColumns(it => it.sync_status).ExecuteCommandAsync();
} }
List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).ToListAsync(); List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).OrderBy(x=>x.id).ToListAsync();
if (allInstockDetails.All(x => x.line_status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID)) if (allInstockDetails.All(x => x.line_status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID))
{ {
instock.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID; instock.status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID;

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

@@ -375,7 +375,7 @@ namespace Tnb.WarehouseMgr
} }
List<WmsPrdInstockCode> allInstockDetails = await _db.Queryable<WmsPrdInstockCode>().Where(it => it.prd_instockD_id == wmsPrdInstockD.id).ToListAsync(); List<WmsPrdInstockCode> allInstockDetails = await _db.Queryable<WmsPrdInstockCode>().Where(it => it.prd_instockD_id == wmsPrdInstockD.id).OrderBy(x=>x.id).ToListAsync();
List<String> materialIds = Arrays.AsList(instock.material_id); List<String> materialIds = Arrays.AsList(instock.material_id);
List<String> unitIds = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); List<String> unitIds = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();

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

@@ -122,7 +122,7 @@ namespace Tnb.WarehouseMgr
// 托盘对应入库单 // 托盘对应入库单
List<WmsInstockH> instock_mains = await _db.Queryable<WmsInstockH>().Where(x => x.source_id == wmsPurchaseD.bill_id).ToListAsync(); List<WmsInstockH> instock_mains = await _db.Queryable<WmsInstockH>().Where(x => x.source_id == wmsPurchaseD.bill_id).ToListAsync();
List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => instock_mains.Select(r => r.id).Contains(it.bill_id) && it.material_id == wmsPurchaseD.material_id && it.code_batch == wmsPurchaseD.code_batch).ToListAsync(); List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => instock_mains.Select(r => r.id).Contains(it.bill_id) && it.material_id == wmsPurchaseD.material_id && it.code_batch == wmsPurchaseD.code_batch).OrderBy(x=>x.id).ToListAsync();
List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>(); List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
List<string> carryIds = instock_mains.Select(x => x.carry_id).ToList(); List<string> carryIds = instock_mains.Select(x => x.carry_id).ToList();

4
WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs
View File

@@ -87,6 +87,7 @@ namespace Tnb.WarehouseMgr
WmsRawmatOutstockD wmsRawmatOutstockD = await _db.Queryable<WmsRawmatOutstockD>().SingleAsync(x=>x.id==input.source_id); WmsRawmatOutstockD wmsRawmatOutstockD = await _db.Queryable<WmsRawmatOutstockD>().SingleAsync(x=>x.id==input.source_id);
WmsRawmatOutstockH wmsRawmatOutstockH = await _db.Queryable<WmsRawmatOutstockH>().SingleAsync(x=>x.id==wmsRawmatOutstockD.bill_id); WmsRawmatOutstockH wmsRawmatOutstockH = await _db.Queryable<WmsRawmatOutstockH>().SingleAsync(x=>x.id==wmsRawmatOutstockD.bill_id);
List<WmsRawmatOutstockD> wmsRawmatOutstockDs = await _db.Queryable<WmsRawmatOutstockD>().Where(x=>x.bill_id==wmsRawmatOutstockH.id).OrderBy(x=>x.id).ToListAsync();
List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>() List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>()
.Where(r => r.carry_id == input.wmsDistaskH.carry_id) .Where(r => r.carry_id == input.wmsDistaskH.carry_id)
.Where(r => r.material_id == wmsRawmatOutstockD.material_id && r.code_batch == wmsRawmatOutstockD.batchno) .Where(r => r.material_id == wmsRawmatOutstockD.material_id && r.code_batch == wmsRawmatOutstockD.batchno)
@@ -160,6 +161,7 @@ namespace Tnb.WarehouseMgr
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>(); List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
foreach(var item in wmsCarryCodes) foreach(var item in wmsCarryCodes)
{ {
int lineno = (wmsRawmatOutstockDs.FindIndex(x => x.id == wmsRawmatOutstockD.id) + 1) * 10;
// 出库数量wmsMaterialSignD.sign_qty // 出库数量wmsMaterialSignD.sign_qty
erpRequestDataDetails.Add(new Dictionary<string, object>() erpRequestDataDetails.Add(new Dictionary<string, object>()
{ {
@@ -169,7 +171,7 @@ namespace Tnb.WarehouseMgr
["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "", ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "",
["corpoid"] = erpOrg.corpoid, ["corpoid"] = erpOrg.corpoid,
["corpvid"] = erpOrg.corpvid, ["corpvid"] = erpOrg.corpvid,
["crowno"] = wmsRawmatOutstockD.lineno, ["crowno"] = wmsRawmatOutstockD.lineno ?? lineno.ToString(),
["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id || x.Id==item.unit_id)?.Id ?? ""))?.cunitid ?? "", ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id || x.Id==item.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cvendorid"] = erpExtendFields.Find((x=>x.table_id==item.auxprop_gys))?.supplier_id, ["cvendorid"] = erpExtendFields.Find((x=>x.table_id==item.auxprop_gys))?.supplier_id,
["cvendorvid"] = erpExtendFields.Find((x=>x.table_id==item.auxprop_gys))?.supplier_vid, ["cvendorvid"] = erpExtendFields.Find((x=>x.table_id==item.auxprop_gys))?.supplier_vid,

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

@@ -91,7 +91,7 @@ namespace Tnb.WarehouseMgr
.Where(it => it.id == input.wmsDistaskH.source_id).ExecuteCommandHasChangeAsync(); .Where(it => it.id == input.wmsDistaskH.source_id).ExecuteCommandHasChangeAsync();
WmsInstockH instock = await _db.Queryable<WmsInstockH>().SingleAsync(x => x.id == input.requireId); WmsInstockH instock = await _db.Queryable<WmsInstockH>().SingleAsync(x => x.id == input.requireId);
List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).ToListAsync(); List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => it.bill_id == input.requireId).OrderBy(x=>x.id).ToListAsync();
string rawmatTransferinstockHId = wmsRawmatTransferinstockD?.bill_id ?? ""; string rawmatTransferinstockHId = wmsRawmatTransferinstockD?.bill_id ?? "";

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

@@ -113,7 +113,7 @@ namespace Tnb.WarehouseMgr
} }
WmsSterilizationInstockH wmsRawmatTransferoutstockH = await _db.Queryable<WmsSterilizationInstockH>().SingleAsync(x=>x.id==input.requireId); WmsSterilizationInstockH wmsRawmatTransferoutstockH = await _db.Queryable<WmsSterilizationInstockH>().SingleAsync(x=>x.id==input.requireId);
List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>().Where(r => r.carry_id == input.wmsDistaskH.carry_id).ToListAsync(); List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>().Where(r => r.carry_id == input.wmsDistaskH.carry_id).OrderBy(x=>x.id).ToListAsync();
decimal qty = wmsCarryCodes.Sum(r => r.codeqty); decimal qty = wmsCarryCodes.Sum(r => r.codeqty);