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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-09-04 11:40:18 +08:00
parent 29a88e8349 26311fa6a7
commit 9d3572b84a
12 changed files with 431 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,15 +69,34 @@ namespace Tnb.WarehouseMgr
BasLocation endLocation = await _db.Queryable<BasLocation>().Where(r => r.id == input.wmsDistaskH.endlocation_id).FirstAsync();
string outWhid = "";
string outDeptid = "";
string outDeptvid = "";
string inDeptid = "";
string inDeptvid = "";
string tranTypeid = "";
string tranTypecode = "";
// 生产入库(灭菌完成) 仓库传 1001A1100000001MA8KP
if (endLocation.wh_id == WmsWareHouseConst.WAREHOUSE_MJC_ID)
{
outWhid = WmsWareHouseConst.bipwarehouseid_bz;
outDeptid = WmsWareHouseConst.sichangqushengchanbu_id;
outDeptvid = WmsWareHouseConst.sichangqushengchanbu_vid;
inDeptid = WmsWareHouseConst.sichangqucangku_id;
inDeptvid = WmsWareHouseConst.sichangqucangku_vid;
tranTypeid = "1001A110000000077KMR";
tranTypecode = "4K-Cxx-06";
}
// 生产入库(成品) 仓库传 1001A1100000001MA8ME
else if (endLocation.wh_id == WmsWareHouseConst.WAREHOUSE_CP_ID)
{
outWhid = WmsWareHouseConst.bipwarehouseid_mj;
outDeptid = WmsWareHouseConst.sichangqucangku_id;
outDeptvid = WmsWareHouseConst.sichangqucangku_vid;
inDeptid = WmsWareHouseConst.sichangqucangku_id;
inDeptvid = WmsWareHouseConst.sichangqucangku_vid;
tranTypeid = "1001A11000000006YKHG";
tranTypecode = "4K-Cxx-01";
bool isOk = await _db.Updateable<WmsSterilizationInstockH>().SetColumns(it => new WmsSterilizationInstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID })
.Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
if (!isOk)
@@ -107,7 +126,7 @@ namespace Tnb.WarehouseMgr
tableIds.AddRange(unitDatas.Select(x => x.Id).ToList());
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => tableIds.Contains(x.table_id)).ToListAsync();
string userId = wmsRawmatTransferoutstockH.create_id;
string userId = wmsRawmatTransferoutstockH.create_id ?? WmsWareHouseConst.AdministratorUserId;
string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? "";
ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId));
string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -118,14 +137,13 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("billmaker", erpCreateId);
erpRequestData.Add("corpoid", erpOrg.corpoid);
erpRequestData.Add("corpvid", erpOrg.corpvid);
erpRequestData.Add("cdptid","1001A1100000001JFOPQ");//部门先写死
erpRequestData.Add("cdptvid","0001A1100000000AOMIQ");//部门先写死
erpRequestData.Add("cotherdptid","1001A1100000001JFOPQ");//部门先写死
erpRequestData.Add("cotherdptvid","0001A1100000000AOMIQ");//部门先写死
erpRequestData.Add("cdptid",outDeptid);//部门先写死
erpRequestData.Add("cdptvid",outDeptvid);//部门先写死
erpRequestData.Add("cotherdptid",inDeptid);//部门先写死
erpRequestData.Add("cotherdptvid",inDeptvid);//部门先写死
erpRequestData.Add("creationtime", nowStr);
erpRequestData.Add("creator", erpCreateId);
erpRequestData.Add("ctrantypeid", "0001H11000000000D32A");//先写死
erpRequestData.Add("cwarehouseid", "outWhid");//先写死
erpRequestData.Add("cwarehouseid", outWhid);//先写死
erpRequestData.Add("dbilldate", wmsRawmatTransferoutstockH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"));
erpRequestData.Add("dmakedate", nowStr);
erpRequestData.Add("dshldarrivedate", nowStr);
@@ -137,7 +155,8 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("pk_org_v", erpOrg.pk_org_v);
erpRequestData.Add("pk_group", erpOrg.pk_group);
erpRequestData.Add("vbillcode", wmsRawmatTransferoutstockH.bill_code);
erpRequestData.Add("vtrantypecode", "4Y-01");//先写死
erpRequestData.Add("ctrantypeid", tranTypeid);//先写死
erpRequestData.Add("vtrantypecode", tranTypecode);//先写死
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
foreach(var item in wmsCarryCodes)