parent: 802fc04c | 补丁 | 提交 | ignore whitespace
cjs
2 天以前 648f4270f4f56c5ca284dbcfa650de05e46a7052 
11111
6个文件已修改
1个文件已删除
186 ■■■■■ 已修改文件
.gitignore 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/84e1ac29-6f81-4f45-9cdf-cbea30cc0011.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.json 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/Program.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .gitignore


@@ -186,3 +186,6 @@


FakesAssemblies/


/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/2e22cad6-d84f-4a27-8fd8-c544ce0375e7.vsidx


/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/c75d4ab3-ca3a-4d8e-ae92-c4dae90cd7d8.vsidx


/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/731226a4-d6f9-4f1d-aafd-f1fd46c0d468.vsidx


/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/84e1ac29-6f81-4f45-9cdf-cbea30cc0011.vsidx


/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/8df12e28-334c-46b4-b937-b31a72338452.vsidx




 HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/84e1ac29-6f81-4f45-9cdf-cbea30cc0011.vsidx

Binary files differ



 HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.json


@@ -3,8 +3,28 @@


  "WorkspaceRootPath": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\",


  "Documents": [


    {


      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",


      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:api\\debugcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"


      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",


      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"


    },


    {


      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",


      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"


    },


    {


      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",


      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"


    },


    {


      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",


      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"


    },


    {


      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",


      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"


    },


    {


      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",


      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"


    }


  ],


  "DocumentGroupContainers": [


@@ -14,8 +34,73 @@


      "DocumentGroups": [


        {


          "DockedWidth": 200,


          "SelectedChildIndex": 7,


          "SelectedChildIndex": 0,


          "Children": [


            {


              "$type": "Document",


              "DocumentIndex": 0,


              "Title": "Monitor.cs",


              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\Monitor.cs",


              "RelativeDocumentMoniker": "core\\Monitor.cs",


              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\Monitor.cs",


              "RelativeToolTip": "core\\Monitor.cs",


              "ViewState": "AgIAABsBAAAAAAAAAAAMwDcBAAAZAAAAAAAAAA==",


              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",


              "WhenOpened": "2025-07-16T01:23:47.452Z",


              "EditorCaption": ""


            },


            {


              "$type": "Document",


              "DocumentIndex": 2,


              "Title": "TaskProcess.cs",


              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\process\\TaskProcess.cs",


              "RelativeDocumentMoniker": "process\\TaskProcess.cs",


              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\process\\TaskProcess.cs",


              "RelativeToolTip": "process\\TaskProcess.cs",


              "ViewState": "AgIAAAMFAAAAAAAAAAD4vxkFAABqAAAAAAAAAA==",


              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",


              "WhenOpened": "2025-07-16T01:13:36.938Z",


              "EditorCaption": ""


            },


            {


              "$type": "Document",


              "DocumentIndex": 4,


              "Title": "WCSCore.cs",


              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\WCSCore.cs",


              "RelativeDocumentMoniker": "core\\WCSCore.cs",


              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\WCSCore.cs",


              "RelativeToolTip": "core\\WCSCore.cs",


              "ViewState": "AgIAADcAAAAAAAAAAAAnwFoAAAAuAAAAAAAAAA==",


              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",


              "WhenOpened": "2025-07-16T01:13:14.237Z",


              "EditorCaption": ""


            },


            {


              "$type": "Document",


              "DocumentIndex": 5,


              "Title": "WCSHelper.cs",


              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\WCSHelper.cs",


              "RelativeDocumentMoniker": "wms\\WCSHelper.cs",


              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\WCSHelper.cs",


              "RelativeToolTip": "wms\\WCSHelper.cs",


              "ViewState": "AgIAAJAAAAAAAAAAAAD4v5QAAAARAAAAAAAAAA==",


              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",


              "WhenOpened": "2025-07-16T01:12:47.622Z",


              "EditorCaption": ""


            },


            {


              "$type": "Document",


              "DocumentIndex": 1,


              "Title": "Program.cs",


              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\Program.cs",


              "RelativeDocumentMoniker": "Program.cs",


              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\Program.cs",


              "RelativeToolTip": "Program.cs",


              "ViewState": "AgIAAE0AAAAAAAAAAAAiwGcAAAAyAAAAAAAAAA==",


              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",


              "WhenOpened": "2025-07-16T01:12:19.238Z",


              "EditorCaption": ""


            },


            {


              "$type": "Bookmark",


              "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"


@@ -41,20 +126,16 @@


              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"


            },


            {


              "$type": "Bookmark",


              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"


            },


            {


              "$type": "Document",


              "DocumentIndex": 0,


              "Title": "DebugController.cs",


              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\api\\DebugController.cs",


              "RelativeDocumentMoniker": "api\\DebugController.cs",


              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\api\\DebugController.cs",


              "RelativeToolTip": "api\\DebugController.cs",


              "ViewState": "AgIAADwAAAAAAAAAAAAqwEYAAAAjAAAAAAAAAA==",


              "DocumentIndex": 3,


              "Title": "AgvController.cs",


              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\api\\AgvController.cs",


              "RelativeDocumentMoniker": "api\\AgvController.cs",


              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\api\\AgvController.cs",


              "RelativeToolTip": "api\\AgvController.cs",


              "ViewState": "AgIAAAAAAAAAAAAAAADwvxMAAAAZAAAAAAAAAA==",


              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",


              "WhenOpened": "2025-07-14T00:35:46.956Z",


              "WhenOpened": "2025-07-16T00:55:29.909Z",


              "EditorCaption": ""


            }


          ]




 HH.WCS.Mobox3.NongFuLinZhi/Program.cs


@@ -100,7 +100,7 @@


                tasks.Add(GetTask(Monitor.BottleBlankTransportation)); //接驳位入库


                tasks.Add(GetTask(Monitor.PPFDFullIn)); //瓶坯翻斗机非即产满框区补满托


                tasks.Add(GetTask(Monitor.PGFDFullIn)); //瓶盖翻斗机非即产满框区补满托


                tasks.Add(GetTask(Monitor.PGFDFullInJC)); //瓶盖翻斗机即产满框区补满托 空托区域补空托


                tasks.Add(GetTask(Monitor.PPFDFullInJC)); //瓶坯翻斗机即产满框区补满托 空托区域补空托


                tasks.Add(GetTask(Monitor.PPFDFullInEmpty)); //瓶坯注塑机非即产空框区补空托


                tasks.Add(GetTask(Monitor.PGXBZZY)); //瓶盖小包装盖转运






 HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs


@@ -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)


                    {




 HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs


@@ -1477,7 +1477,7 @@


                                        LogHelper.Info($"出库算法04:当前货位绑定的托盘码为：{cntrInfo.S_CNTR_CODE}");


                                        string endItemCode = "";


                                        var itemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == cntrInfo.S_CNTR_CODE).First();


                                        if (itemInfo != null && itemInfo.S_ITEM_CODE == itemCode)


                                        if (itemInfo != null)


                                        {


                                            endItemCode = itemInfo.S_ITEM_CODE;


                                        }


@@ -1946,24 +1946,7 @@


                    {


                        var cir = new LocCntrRel { S_LOC_CODE = loc, S_CNTR_CODE = cntrCode, S_SRC = deviceName };


                        if (db.Insertable<LocCntrRel>(cir).ExecuteCommand() > 0) LogHelper.Info($"货位容器表绑定成功，货位号：{loc}，托盘号：{cntrCode}");


                        var Con = db.Queryable<Container>().Where(a => a.S_CODE == cntrCode).First();


                        if(Con == null)


                        {


                            int detallCount = 0;


                            if (!string.IsNullOrEmpty(itemCode))


                            {


                                detallCount = 1;


                            }


                            if(db.Insertable<Container>(new Container


                            {


                                S_CODE = cntrCode,


                                N_TYPE = 1,


                                N_DETAIL_COUNT = detallCount


                            }).ExecuteCommand() > 0)


                            {


                                LogHelper.Info($"容器表绑定成功，托盘号：{cntrCode}");


                            }


                        }


                        


                        if (!string.IsNullOrEmpty(itemCode))


                        {


                            BindCntrItem(cntrCode, itemCode, batchNo, itemlayer, itemName);


@@ -1990,6 +1973,26 @@


            try


            {


                db.BeginTran();




                var Con = db.Queryable<Container>().Where(a => a.S_CODE == trayCode).First();


                if (Con == null)


                {


                    int detallCount = 1;


                    if (db.Insertable<Container>(new Container


                    {


                        S_CODE = trayCode,


                        N_TYPE = 1,


                        N_DETAIL_COUNT = detallCount


                    }).ExecuteCommand() > 0)


                    {


                        LogHelper.Info($"容器表绑定成功，托盘号：{trayCode}");


                    }


                }


                else


                {


                    Con.N_DETAIL_COUNT = 1;


                    db.Updateable(Con).UpdateColumns(a => new { a.N_DETAIL_COUNT }).ExecuteCommand();


                }


                //db.Updateable(cntr).UpdateColumns(it => new { it.S_DEST }).ExecuteCommand();


                //1.将原有容器物料信息删除


                //db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == cntr.S_CNTR_CODE.Trim()).ExecuteCommand();


@@ -2548,23 +2551,8 @@


            var op = WMSHelper.GetWmsTask(TN_Task.S_OP_CODE);


            if (op != null)


            {


                if (op.N_B_STATE == 0)


                {


                    //等待直接修改状态为取消


                    op.N_B_STATE = 3;


                }


                else if (op.N_B_STATE == 1)


                {


                    if (WCSHelper.CheckActionRecordExist(TN_Task.S_CODE, 4))


                    {


                        op.N_B_STATE = 2;


                    }


                    else


                    {


                        op.N_B_STATE = 3;


                    }


                }


                


                op.N_B_STATE = 2;


                WMSHelper.UpdateTaskState(op);


            }


            NDCApi.CancelOrder(TN_Task.S_CODE.Trim());




 HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs


@@ -153,6 +153,13 @@


                task.N_B_STATE = 5;


                task.S_B_STATE = WCSTask.GetStateStr(task.N_B_STATE);


                db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();




                var op = WMSHelper.GetWmsTask(task.S_OP_CODE);


                if (op != null)


                {


                    op.N_B_STATE = 2;


                    WMSHelper.UpdateTaskState(op);


                }


            }


        }


        internal static bool CreateTask(WCSTask TN_Task) {