From d0f6bfb4595d0c58d0b0d3335b3e06c7e488997f Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 14 Oct 2024 17:13:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=B3=A8=E5=A1=91?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E6=8A=A5=E8=BD=BD=E5=85=B7=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=90=88=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index f8075c97..81a5d52a 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -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() + .SetColumns(x => x.is_check == EnumCheckConclusion.合格.ParseToInt().ToString()) + .Where(x => x.id == wmsCarryH.id) + .ExecuteCommandAsync(); + } + #region 质检模块 //质检模块 From c3fd84452375789e1806afb6287cbf7817b07a04 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 14 Oct 2024 17:48:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsOutsourceService.cs | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs index d54a9647..4cee4990 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs @@ -233,6 +233,8 @@ namespace Tnb.WarehouseMgr foreach (var item in purchaseDs) { + BasMaterial basMaterial = await _db.Queryable().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 dList = await _db.Queryable().Where(x => x.fk_wms_outsource_order_id == purchaseDs.First().fk_wms_outsource_order_id).OrderBy(x => x.id).ToListAsync(); + List dList = await _db.Queryable().Where(x => x.fk_wms_outsource_order_id == wmsOutsourceH.id).OrderBy(x => x.id).ToListAsync(); List wmsOutsourceOrderDs = await _db.Queryable().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 materialIds = purchaseDs.Select(x => x.matcode_id).Distinct().ToList(); - List unitCodes = purchaseDs.Select(x => x.unit_id).Distinct().ToList(); + List unitCodes = purchaseDs.Select(x => x.unit).Distinct().ToList(); List unitDatas = await _db.Queryable() .LeftJoin((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", null); + erpRequestData.Add("isType", 1); List> erpRequestDataDetails = new List>(); foreach (WmsOutsourceD item in dList) { erpRequestDataDetails.Add(new Dictionary() { - ["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, From c24946fad6d9627cd96dfb178b985c3c1aa51040 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Tue, 15 Oct 2024 13:42:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceH.cs | 5 +++++ WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceH.cs index fa5b6b18..50fc1c01 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceH.cs @@ -143,5 +143,10 @@ public partial class WmsOutsourceH : BaseEntity /// erp流水号 /// public string? service_num { get; set; } + + /// + /// 到货类型编码 + /// + public string vtrantypecode { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs index 4cee4990..5d43d664 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs @@ -329,7 +329,7 @@ namespace Tnb.WarehouseMgr 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", null); + erpRequestData.Add("vtrantypecode", wmsOutsourceH.vtrantypecode); erpRequestData.Add("isType", 1); List> erpRequestDataDetails = new List>();