3F/Code Management/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.binBinary files differ
3F/Code Management/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.binBinary files differ
3F/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2Binary files differ
3F/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2Binary files differ
3F/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suoBinary files differ
3F/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/fileList.binBinary files differ
3F/Code Management/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.binBinary files differ
3F/Code Management/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.binBinary files differ
3F/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2Binary files differ
3F/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2Binary files differ
3F/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suoBinary files differ
3F/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.binBinary files differ
3F/ÏîÄ¿×ÊÁÏ/ÏîĿͼֽ/Ç°¶ÎÏßÌåµãλͼ/3Â¥×¢Òº WCSÓëÏßÌå½»»¥µãλ.xlsxBinary files differ
3F/ÏîÄ¿×ÊÁÏ/ÏîĿͼֽ/Ç°¶ÎÏßÌåµãλͼ/¶þ·âºÍ³Â»¯ÈýÂ¥.xlsxBinary files differ
3F/ÏîÄ¿×ÊÁÏ/ÏîĿͼֽ/Ç°¶ÎÏßÌåµãλͼ/»¯³É¾²ÖÃ.xlsxBinary files differ
3F/ÏîÄ¿×ÊÁÏ/ÏîĿͼֽ/ºó¶ÎÏßÌåµãλͼ/09ÈýÂ¥ÊäË͹âµçλÖÃͼ1108(1).dwl
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,3 @@ çå¡å·´å¡ DESKTOP-9EVT5GR 2025-02-26ææä¸ 13:53:27 3F/ÏîÄ¿×ÊÁÏ/ÏîĿͼֽ/ºó¶ÎÏßÌåµãλͼ/09ÈýÂ¥ÊäË͹âµçλÖÃͼ1108(1).dwl2
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,6 @@ <?xml version="1.0" encoding="UTF-8"> <whprops> <username>çå¡å·´å¡</username> <machinename>DESKTOP-9EVT5GR</machinename> <fullname></fullname> <datetime>2025-02-26ææä¸ 13:53:27</datetime></whprops> 3F/ÏîÄ¿×ÊÁÏ/ÏîĿͼֽ/ºó¶ÎÏßÌåµãλͼ/ÈýÂ¥9#½»»¥Æ«ÒÆÁ¿µØÖ·20241027.xlsBinary files differ
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/WIDESEAWCS_Server.csproj.CopyComplete
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_BZ/CommonConveyorLine_BZJob.cs
@@ -219,7 +219,7 @@ conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, task.NextAddress, station.stationChildCode); _taskRepository.DeleteData(task); if (needBarcode.inLineNum-- <= 0) needBarcode.inLineNum = 0; if (--needBarcode.inLineNum <= 0) needBarcode.inLineNum = 0; _needBarcodeRepository.UpdateData(needBarcode); } else //å¦æ ä»»å¡ åå¤å®ä¸ºä»NGå£ä¸æ è°åMOMæ¥å£ å¤æè¿ååæ° æ å¼å¸¸åéå ¥å è£ ï¼æå¼å¸¸åéåNGå£ Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -194,6 +194,7 @@ (var loc, var tas) = UpdateStockAndTaskStatus(stock, task); var taskHty = task.Adapt<Dt_Task_Hty>(); taskHty.FinishTime = DateTime.Now; taskHty.OperateType = (int)OperateTypeEnum.èªå¨å®æ; DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>(); stockInfo_Hty.ModifyDate = DateTime.Now; @@ -2033,7 +2034,7 @@ private Dt_Task_Hty CreateHistoricalTask(Dt_Task task, bool isHand = false) { // æ´æ°ä»»å¡ç¶æ task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt(); task.TaskState = task.TaskType > 199 ? (int)TaskInStatusEnum.InFinish : (int)TaskOutStatusEnum.OutFinish; task.CurrentAddress = task.NextAddress; // å建åå²ä»»å¡ @@ -2046,7 +2047,7 @@ { taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System"; } taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt(); taskHty.TaskState = task.TaskType > 199 ? (int)TaskInStatusEnum.InFinish : (int)TaskOutStatusEnum.OutFinish; return taskHty; }
@@ -974,8 +974,13 @@ WebResponseContent content = new WebResponseContent(); try { Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position && x.stationType == 12 && x.stationArea == "Call"); //LogFactory.GetLog("常温3åºåºè³å è£ ").Info(true, $"常温3åºåºè³å è£ ä¼ å ¥åæ°ï¼" + JsonConvert.SerializeObject(json, Formatting.Indented)); Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position && x.stationType == 12 && x.stationArea == "Call"); if(station == null) { throw new Exception($"æªæ¾å°å è£ ç«å°ä¿¡æ¯ï¼è¯·æ£æ¥ä¼ å ¥åæ°{json.Position}"); } //LogFactory.GetLog("常温3åºåºè³å è£ ").Info(true, $"常温3åºåºè³å è£ ä¼ å ¥åæ°ï¼" + JsonConvert.SerializeObject(json, Formatting.Indented)); var stockInfo = _stockInfoRepository.Db.Queryable<DtStockInfo>() .Where(x => x.ProductionLine == station.productLine) .Includes(x => x.LocationInfo) // é¢å è½½LocationInfo @@ -985,7 +990,7 @@ .First(); // è·å第ä¸ä¸ªå ç´ //DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(X => X.IsFull && X.AreaCode == "CWSC3" && X.ProductionLine == station.productLine); if (stockInfo == null) throw new Exception("åºå æ 满足æ¡ä»¶çåºåå¯åºåº"); if (stockInfo == null) throw new Exception($"åºå {station.productLine}æ 满足æ¡ä»¶çåºåå¯åºåº"); DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.AreaId == 5 && x.LocationCode == stockInfo.LocationCode);
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,3 @@ çå¡å·´å¡ DESKTOP-9EVT5GR 2025-02-22ææå 16:30:56 ÏîÄ¿×ÊÁÏ/ÏîĿͼֽ/µçо3¥ͼֽÓëµçÆø±àºÅ¶ÔÕÕ£¨08ÏîÄ¿µçо3Â¥´Ó×¢Òº¿ªÊ¼£©/08ÈýÂ¥ÊäËͲ¼¾Öµãλͼ1107(4).dwl2
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,6 @@ <?xml version="1.0" encoding="UTF-8"> <whprops> <username>çå¡å·´å¡</username> <machinename>DESKTOP-9EVT5GR</machinename> <fullname></fullname> <datetime>2025-02-22ææå 16:30:56</datetime></whprops> ÏîÄ¿×ÊÁÏ/ÏîĿͼֽ/µçо3¥ͼֽÓëµçÆø±àºÅ¶ÔÕÕ£¨08ÏîÄ¿µçо3Â¥´Ó×¢Òº¿ªÊ¼£©/µçо3F²¼¾Öͼ0805.dwl
@@ -1,3 +1,3 @@ çå¡å·´å¡ DESKTOP-9EVT5GR 2025-02-19ææä¸ 13:26:04 2025-02-26ææä¸ 14:00:34 ÏîÄ¿×ÊÁÏ/ÏîĿͼֽ/µçо3¥ͼֽÓëµçÆø±àºÅ¶ÔÕÕ£¨08ÏîÄ¿µçо3Â¥´Ó×¢Òº¿ªÊ¼£©/µçо3F²¼¾Öͼ0805.dwl2
@@ -3,4 +3,4 @@ <username>çå¡å·´å¡</username> <machinename>DESKTOP-9EVT5GR</machinename> <fullname></fullname> <datetime>2025-02-19ææä¸ 13:26:04</datetime></whprops> <datetime>2025-02-26ææä¸ 14:00:34</datetime></whprops>
