From 06747ef981873358950982e7a53c6d221ef93ac3 Mon Sep 17 00:00:00 2001 From: cjs <2216046164@qq.com> Date: 星期四, 17 七月 2025 17:19:24 +0800 Subject: [PATCH] 11 --- HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs b/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs index db1ab3f..0310ee8 100644 --- a/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs +++ b/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs @@ -127,7 +127,7 @@ if(locInfo != null) { //鐢熸垚浠诲姟 - Location location = TaskProcess.BCPInOrOut(db, false, "鐡跺澂搴撳尯", a.S_ItemCode); + Location location = TaskProcess.BCPInOrOutTwo(db, "鐡跺澂搴撳尯", a.S_ItemCode); if(location != null) { string cntrCode = getCntrCode(db,location); @@ -371,15 +371,16 @@ } - internal static void PGFDFullInJC() + internal static void PPFDFullInJC() { var db = new SqlHelper<object>().GetInstance(); - var workInfo = db.Queryable<LinZhiBCPWorkOrder>().Where(a => a.S_PLineNo == "鍐滃か鏋楄姖-鐡跺澂鏈� && a.S_UsingNow == "Y" && a.S_WorkState == "鎵ц涓�).First(); + var workInfo = db.Queryable<LinZhiBCPWorkOrder>().Where(a => a.S_PLineNo.Contains("鐡跺澂缈绘枟鏈�) && a.S_UsingNow == "Y" && a.S_WorkState == "鎵ц涓�).First(); if(workInfo != null) { var areaInfo = Settings.areaInfos.Where(a => a.areaName == "鐡跺澂鍗充骇婊℃" && a.enable == 1).FirstOrDefault(); if(areaInfo != null) { + //濡傛灉搴撳尯鏄┖鐨勶紝骞朵笖娌℃湁鏈夐攣鐨勫氨琛ュ厖绌烘墭 var locInfo = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaInfo.areaCode && a.N_CURRENT_NUM == 0 && a.S_LOCK_STATE == "鏃�).First(); if (locInfo != null) { -- Gitblit v1.9.1