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-10-15 14:31:18 +08:00
parent ca45839b2a c24946fad6
commit 4ef60c8c7c
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -2159,6 +2159,15 @@ namespace Tnb.ProductionMgr
// bool isCheckFlag = !basMaterial.category_id.Contains("ZZCP");
bool isCheckFlag = basMaterial.category_id.Contains("ZSJ");
//不是注塑的提报直接合格
if (!isCheckFlag)
{
await _db.Updateable<WmsCarryH>()
.SetColumns(x => x.is_check == EnumCheckConclusion.合格.ParseToInt().ToString())
.Where(x => x.id == wmsCarryH.id)
.ExecuteCommandAsync();
}
#region 质检模块
//质检模块

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

@@ -143,5 +143,10 @@ public partial class WmsOutsourceH : BaseEntity<string>
/// erp流水号
/// </summary>
public string? service_num { get; set; }
/// <summary>
/// 到货类型编码
/// </summary>
public string vtrantypecode { get; set; }
}

43
WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs
View File

@@ -233,6 +233,8 @@ namespace Tnb.WarehouseMgr
foreach (var item in purchaseDs)
{
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().Where(x=>x.code==item.matcode).FirstAsync();
item.matcode_id = basMaterial?.id ?? item.matcode_id;
WmsInstockD instockD = new WmsInstockD();
instockD.id = SnowflakeIdHelper.NextId();
instockD.bill_id = instock.id;
@@ -252,7 +254,7 @@ namespace Tnb.WarehouseMgr
await _db.Insertable(instockDs).ExecuteCommandAsync();
List<WmsOutsourceD> dList = await _db.Queryable<WmsOutsourceD>().Where(x => x.fk_wms_outsource_order_id == purchaseDs.First().fk_wms_outsource_order_id).OrderBy(x => x.id).ToListAsync();
List<WmsOutsourceD> dList = await _db.Queryable<WmsOutsourceD>().Where(x => x.fk_wms_outsource_order_id == wmsOutsourceH.id).OrderBy(x => x.id).ToListAsync();
List<WmsOutsourceOrderD> wmsOutsourceOrderDs = await _db.Queryable<WmsOutsourceOrderD>().Where(r => dList.Select(x => x.erp_outsource_order_d_pk).Contains(r.erp_line_pk)).OrderBy(x => x.id).ToListAsync();
foreach (var item in dList)
@@ -275,7 +277,7 @@ namespace Tnb.WarehouseMgr
List<String> materialIds = purchaseDs.Select(x => x.matcode_id).Distinct().ToList();
List<String> unitCodes = purchaseDs.Select(x => x.unit_id).Distinct().ToList();
List<String> unitCodes = purchaseDs.Select(x => x.unit).Distinct().ToList();
List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()
.LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)
.Where((x, y) => x.EnCode == DictConst.MeasurementUnit && (unitCodes.Contains(y.EnCode) || unitCodes.Contains(y.Id)))
@@ -311,7 +313,7 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("creator", erpCreateId);
erpRequestData.Add("dbilldate", wmsOutsourceH.create_time.ToString("yyyy-MM-dd HH:mm:ss"));
erpRequestData.Add("dmakedate", nowStr);
erpRequestData.Add("ntotalastnum", purchaseDs.Sum(x => x.bind_qty));
erpRequestData.Add("ntotalastnum", purchaseDs.Sum(x => x.outsource_arriveqty));
erpRequestData.Add("pk_arriveorder", null);
// erpRequestData.Add("pk_dept","1001A1100000001JFOPQ");
// erpRequestData.Add("pk_dept_v","0001A1100000000AOMIQ");
@@ -319,31 +321,32 @@ namespace Tnb.WarehouseMgr
erpRequestData.Add("pk_org", erpOrg.pk_org);
erpRequestData.Add("pk_org_v", erpOrg.pk_org_v);
erpRequestData.Add("pk_group", erpOrg.pk_group);
erpRequestData.Add("pk_pupsndoc", "");
erpRequestData.Add("csourceid", wmsOutsourceOrderH?.erp_pk ?? "");
erpRequestData.Add("pk_pupsndoc", null);
erpRequestData.Add("csourceid", wmsOutsourceOrderH?.erp_pk);
erpRequestData.Add("pk_purchaseorg", erpOrg.pk_org);
erpRequestData.Add("pk_purchaseorg_v", erpOrg.pk_org_v);
erpRequestData.Add("pk_supplier", erpExtendFields.Find(x => x.table_id == wmsOutsourceH.supplier_id)?.supplier_id ?? "");//先写死
erpRequestData.Add("pk_supplier_v", erpExtendFields.Find(x => x.table_id == wmsOutsourceH.supplier_id)?.supplier_vid ?? "");//先写死
erpRequestData.Add("pk_supplier", erpExtendFields.Find(x => x.table_id == wmsOutsourceH.supplier_id)?.supplier_id);//先写死
erpRequestData.Add("pk_supplier_v", erpExtendFields.Find(x => x.table_id == wmsOutsourceH.supplier_id)?.supplier_vid);//先写死
erpRequestData.Add("vbillcode", wmsOutsourceH.bill_code);
erpRequestData.Add("vmemo", wmsOutsourceH.remark);
erpRequestData.Add("vtrantypecode", "");
erpRequestData.Add("vtrantypecode", wmsOutsourceH.vtrantypecode);
erpRequestData.Add("isType", 1);
List<Dictionary<string, object>> erpRequestDataDetails = new List<Dictionary<string, object>>();
foreach (WmsOutsourceD item in dList)
{
erpRequestDataDetails.Add(new Dictionary<string, object>()
{
["castunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id || x.Id == item.unit_id)?.Id ?? ""))?.cunitid ?? "",
["cfirstbid"] = wmsOutsourceOrderH?.erp_pk ?? "",
["castunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id || x.Id == item.unit_id)?.Id ?? ""))?.cunitid,
["cfirstbid"] = wmsOutsourceOrderH?.erp_pk,
["cfirstid"] = item.erp_outsource_order_d_pk,
["cfirsttypecode"] = "",
["cfirsttypecode"] = null,
["crececountryid"] = "0001Z010000000079UJJ",
["crowno"] = item.erp_outsource_order_d_lineno,
["csendcountryid"] = "0001Z010000000079UJJ",
["csourcetypecode"] = "",
["csourcetypecode"] = null,
["ctaxcountryid"] = "0001Z010000000079UJJ",
["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,
["dbilldate"] = wmsOutsourceH.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
["dplanreceivedate"] = wmsOutsourceH.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
["dproducedate"] = wmsOutsourceH.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -351,16 +354,16 @@ namespace Tnb.WarehouseMgr
["fproductclass"] = 1,
// ["naccumchecknum"] = 0,
// ["nastnum"] = item.purchase_arriveqty,
["nnum"] = item.bind_qty,
["nnum"] = item.outsource_arriveqty,
// ["nplanastnum"] = 0,
["nplannum"] = item.outsource_arriveqty,
["nplannum"] = item.outsource_quantity,
["pk_apfinanceorg"] = erpOrg.corpoid,
["pk_apfinanceorg_v"] = erpOrg.corpvid,
["pk_arriveorder"] = null,
["pk_arriveorder_b"] = null,
["pk_group"] = erpOrg.pk_group,
["pk_material"] = erpExtendFields.Find(x => x.table_id == item.matcode_id)?.cmaterialoid ?? "",
["pk_order"] = wmsOutsourceOrderH?.erp_pk ?? "",
["pk_material"] = erpExtendFields.Find(x => x.table_id == item.matcode_id)?.cmaterialoid,
["pk_order"] = wmsOutsourceOrderH?.erp_pk,
["pk_order_b"] = item.erp_outsource_order_d_pk,
["pk_org"] = erpOrg.pk_org,
["pk_org_v"] = erpOrg.pk_org_v,
@@ -371,15 +374,15 @@ namespace Tnb.WarehouseMgr
["pk_receivestore"] = item.erp_wh_type,
["pk_reqstoorg"] = erpOrg.pk_org,
["pk_reqstoorg_v"] = erpOrg.pk_org_v,
["pk_srcmaterial"] = erpExtendFields.Find(x => x.table_id == item.matcode_id)?.cmaterialoid ?? "",
["pk_srcmaterial"] = erpExtendFields.Find(x => x.table_id == item.matcode_id)?.cmaterialoid,
["vbatchcode"] = item.code_batch,
["Vfree1"] = item.code_batch,
["mes_detail_id"] = item.id,
// ["bpresent"] = item.gift == 1,
["csourceid"] = wmsOutsourceOrderH?.erp_pk ?? "",
["csourceid"] = wmsOutsourceOrderH?.erp_pk,
["vsourcecode"] = wmsOutsourceOrderH.erp_bill_code,
["csourcebid"] = item.erp_outsource_order_d_pk,
["IsType"] = 0,
["isType"] = 1,
["csourcetypecode"] = null,
["vsourcerowno"] = null,
["vsourcetrantype"] = null,