过滤掉不需要掉erp接口的自制单据

ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskIssueListOutput.cs

@@ -9,7 +9,11 @@ namespace Tnb.ProductionMgr.Entities.Dto
         public string eqp_id { get; set; }
         public string mo_task_status { get; set; }
         public decimal? plan_qty { get; set; }
-        public decimal? rqty { get; set; }
+        /// <summary>
+        /// 已报工数量
+        /// </summary>
+        public decimal? reported_work_qty { get; set; } = 0;
+        public decimal? scrap_qty { get; set; }
         public decimal? scheduled_qty { get; set; }
         public string create_time { get; set; }
         public string workstation_id { get; set; }

ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs

@@ -130,7 +130,8 @@ namespace Tnb.ProductionMgr
                     dayshiftafter_worker_id = a.dayshiftafter_worker_id,
                     nightshift_worker_id = a.nightshift_worker_id,
                     nightshiftafter_worker_id = a.nightshiftafter_worker_id,
-                    rqty = a.scrap_qty
+                    reported_work_qty = a.reported_work_qty,
+                    scrap_qty = a.scrap_qty
                 }).OrderByDescending(a => a.create_time).ToPagedListAsync(input.currentPage, input.pageSize);
 
             List<string> userIdList = result.list.Select(x => x.dayshift_worker_id).Distinct().ToList();

WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs

@@ -3224,6 +3224,13 @@ namespace Tnb.WarehouseMgr
                 return;
             }
             WmsMaterialTransfer wmsMaterialTransfer = await db.Queryable<WmsMaterialTransfer>().SingleAsync(x => x.id == dt.source_id);
+            
+            //自制的不调erp接口
+            if (string.IsNullOrEmpty(wmsMaterialTransfer.erp_bill_code))
+            {
+                return;
+            }
+            
             List<WmsMaterialTransferD> wmsMaterialTransferDs = await db.Queryable<WmsMaterialTransferD>().Where(x => x.bill_id == dt.source_id).ToListAsync();
             List<String> materialIds = wmsMaterialTransferDs.Select(x => x.material_id).Distinct().ToList();
             List<String> unitCodes = wmsMaterialTransferDs.Select(x => x.unit_id).Distinct().ToList();

WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs

@@ -357,6 +357,12 @@ namespace Tnb.WarehouseMgr
                                 // 出库数量wmsMaterialSignD.sign_qty
                             }
                             
+                            //自制的不调erp接口
+                            if (string.IsNullOrEmpty(wmsTransferOrderH.erp_pk))
+                            {
+                                break;
+                            }
+                            
                             List<String> materialIds = wmsMaterialSignDs.Select(x => x.material_id).Distinct().ToList();
                             List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync();
                             
@@ -469,6 +475,13 @@ namespace Tnb.WarehouseMgr
                             WmsMaterialTransferD wmsMaterialTransferd = await _db.Queryable<WmsMaterialTransferD>().Where(r => r.id == wmsDistaskH.source_id).FirstAsync();
                             WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable<WmsMaterialTransfer>().Where(r => r.id == wmsMaterialTransferd.bill_id).FirstAsync();
 
+                            //自制的不调erp接口
+                            if (string.IsNullOrEmpty(wmsMaterialTransfer.erp_bill_code))
+                            {
+                                break;
+                            }
+                            
+                            
                             List<WmsMaterialTransferD> dList = await _db.Queryable<WmsMaterialTransferD>().Where(x => x.bill_id == wmsMaterialTransferd.bill_id).OrderBy(x => x.id).ToListAsync();
                             DictionaryDataEntity unitData = await _db.Queryable<DictionaryTypeEntity>()
                                 .LeftJoin<DictionaryDataEntity>((x, y) => x.Id == y.DictionaryTypeId)

WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs

@@ -1085,6 +1085,12 @@ namespace Tnb.WarehouseMgr
                     || wmsMaterialTransfer.type == WmsWareHouseConst.MATERIALTRANSFER_CROSSLAYER_CODE 
                     || wmsMaterialTransfer.type == WmsWareHouseConst.MATERIALTRANSFER_WXDBOUTWAREHOUSE_CODE)
                 {
+                    //自制的不调erp接口
+                    if (string.IsNullOrEmpty(wmsMaterialTransfer.erp_bill_code))
+                    {
+                        return;
+                    }
+                    
                     Logger.LogInformation("【WmsMaterialTransferService ModifyAsync】同步其它入库单到erp...");
 
                     List<WmsMaterialTransferD> dList = await _db.Queryable<WmsMaterialTransferD>().Where(x => x.bill_id == wmsMaterialTransferd.bill_id).OrderBy(x => x.id).ToListAsync();
@@ -1191,6 +1197,13 @@ namespace Tnb.WarehouseMgr
                     // 原材料仓出库在签收后回传其它出库
                     if (wmsMaterialTransfer.warehouse_outstock != WmsWareHouseConst.WAREHOUSE_YCL_ID)
                     {
+                        
+                        //自制的不调erp接口
+                        if (string.IsNullOrEmpty(wmsMaterialTransfer.erp_bill_code))
+                        {
+                            return;
+                        }
+                        
                         Logger.LogInformation("【WmsMaterialTransferService ModifyAsync】同步其它出库单到erp...");
 
                         List<WmsMaterialTransferD> dList = await _db.Queryable<WmsMaterialTransferD>().Where(x => x.bill_id == wmsMaterialTransferd.bill_id).OrderBy(x => x.id).ToListAsync();

WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs

@@ -204,6 +204,9 @@ namespace Tnb.WarehouseMgr
                     //todo 先取采购订单第一条
                     //WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable<WmsPurchaseOrderD>().FirstAsync(x=>x.fk_wms_purchase_order_id==purchase.erp_bill_code);
                     
+                    //自制的不调erp接口
+                    if (!string.IsNullOrEmpty(wmsPurchaseOrderH.erp_bill_code))
+                    {
                         List<string> ids = new List<string>();
                         // ids.Add(_userManager.UserId);
                         // ids.Add(WmsWareHouseConst.AdministratorUserId);
@@ -325,6 +328,9 @@ namespace Tnb.WarehouseMgr
                             await _thirdApiRecordService.Send(new List<ThirdWebapiRecord> { thirdWebapiRecord }, "自动", _db);
                         }
                     }
+                    
+                    
+                }
                 //通知Mes接口 
                 //_ = SyncMesData(instock.id, instockDs.Select(x => x.material_id).ToList(), EnumTriggerEvent.入厂检按物料编号);
                 await _db.Ado.CommitTranAsync();

WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs

@@ -97,6 +97,12 @@ namespace Tnb.WarehouseMgr
             string rawmatTransferinstockHId = wmsRawmatTransferinstockD?.bill_id ?? "";
             WmsRawmatTransferinstockH wmsRawmatTransferinstockH = await _db.Queryable<WmsRawmatTransferinstockH>().SingleAsync(x => x.id == rawmatTransferinstockHId);
 
+            //自制的不调erp接口
+            if (string.IsNullOrEmpty(wmsRawmatTransferinstockH.erp_pk))
+            {
+                return;
+            }
+            
             List<String> materialIds = allInstockDetails.Select(x => x.material_id).Distinct().ToList();
             List<String> unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList();
             List<DictionaryDataEntity> unitDatas = await _db.Queryable<DictionaryTypeEntity>()

WarehouseMgr/Tnb.WarehouseMgr/WmsTransferInstockService.cs

@@ -81,6 +81,12 @@ namespace Tnb.WarehouseMgr
             string TransferInstockHId = wmsTransferInstockD?.bill_id ?? "";
             WmsTransferInstockH wmsTransferInstockH = await _db.Queryable<WmsTransferInstockH>().SingleAsync(x => x.id == TransferInstockHId);
 
+            //自制的不调erp接口
+            if (string.IsNullOrEmpty(wmsTransferInstockH.erp_pk))
+            {
+                return;
+            }
+            
             List<WmsTransferInstockD> allInstockDetails = await _db.Queryable<WmsTransferInstockD>().Where(it => it.bill_id == TransferInstockHId).ToListAsync();
 
             List<String> materialIds = allInstockDetails.Select(x => x.material_id).Distinct().ToList();