111

cjs

2025-06-19 ad678d0d42f126e5c0d0e2f22f373d9727fb37a5

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

@@ -5,13 +5,15 @@
using HH.WCS.Mobox3.NFLZ.util;
using HH.WCS.Mobox3.NFLZ.wms;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Xml.Linq;
using static HH.WCS.Mobox3.NFLZ.api.OtherModel;
using static HH.WCS.Mobox3.NFLZ.dispatch.NDC;
using static HH.WCS.Mobox3.NFLZ.dispatch.NDCApi;
using static HH.WCS.Mobox3.NFLZ.wms.WMSHelper.AddChangeModel;

namespace HH.WCS.Mobox3.NFLZ.process
@@ -1131,21 +1133,43 @@
                    Console.WriteLine($"[SendTask]:TaskNo={mst.S_CODE.Trim()},start={Extend1},end={Extend2}");
                    LogHelper.Info($"[SendTask]:TaskNo={mst.S_CODE.Trim()},start={Extend1},end={Extend2}");
                    bool action = true;
                    var dic = new Dictionary<string, string>();
                    //var dic1 = new Dictionary<string, string>();
                    //dic.Add("Pri", mst.N_PRIORITY.ToString());
                    //dic.Add("No", mst.S_CODE.Trim());
                    dic.Add("From", Extend1);
                    dic.Add("To", Extend2);
                    dic.Add("Func", Extend3);
                    dic.Add("Data", Extend4);

                    //var dic = new Dictionary<string, string>();
                    ////var dic1 = new Dictionary<string, string>();
                    ////dic.Add("Pri", mst.N_PRIORITY.ToString());
                    ////dic.Add("No", mst.S_CODE.Trim());
                    //dic.Add("From", Extend1);
                    //dic.Add("To", Extend2);
                    //dic.Add("Func", Extend3);
                    //dic.Add("Data", Extend4);
                    //
                    //if (ConveryTaskList.Contains(taskType) || taskType.Contains("移库"))
                    //{
                    //    dic.Add("ItemHeight", Extend5);
                    //    dic.Add("CntrType", Extend6);
                    //    dic.Add("FromCol", Extend7);
                    //    dic.Add("ToCol", Extend8);
                    //    if (taskType.Contains("移库") || taskType.Contains("成品下线") || taskType.Contains("零头下线"))
                    //    {
                    //        LogHelper.Info($"移库：Extend5:{Extend5},Extend6:{Extend6},Extend7:{Extend7},Extend8:{Extend8},");
                    //        if (Extend5 == "" || Extend6 == "" || Extend7 == "" || Extend8 == "")
                    //        {
                    //            action = false;
                    //        }
                    //    }
                    //}
                    var dic = new List<param>
                    {
                        new param() { name = "From", value = Extend1 },
                        new param() { name = "To", value = Extend2 },
                        new param() { name = "Func", value = Extend3 },
                        new param() { name = "Data", value = Extend4 }
                    };
                    if (ConveryTaskList.Contains(taskType) || taskType.Contains("移库"))
                    {
                        dic.Add("ItemHeight", Extend5);
                        dic.Add("CntrType", Extend6);
                        dic.Add("FromCol", Extend7);
                        dic.Add("ToCol", Extend8);
                        dic.Add(new param(){name = "ItemHeight", value = Extend5});
                        dic.Add(new param(){name = "CntrType", value = Extend6});
                        dic.Add(new param(){name = "FromCol", value = Extend7});
                        dic.Add(new param(){name = "ToCol", value = Extend8});
                        if (taskType.Contains("移库") || taskType.Contains("成品下线") || taskType.Contains("零头下线"))
                        {
                            LogHelper.Info($"移库：Extend5:{Extend5},Extend6:{Extend6},Extend7:{Extend7},Extend8:{Extend8},");
@@ -1155,13 +1179,13 @@
                            }
                        }
                    }

                    if (action)
                    {
                        var res = new AGVResult();
                        res = NDC.AddNewOrderNew(TsNo,mst.N_PRIORITY,mst.S_CODE, dic);
                        var res = new AgvApiResult();
                        //res = NDC.AddNewOrderNew(TsNo,mst.N_PRIORITY,mst.S_CODE, dic);
                        res = NDCApi.AddOrderNew(TsNo, mst.N_PRIORITY, mst.S_CODE,dic);

                        if (res != null && (res.Res.ErrCode == 0 || res.Res.ErrCode == 50009))
                        if (res != null && (res.err_code == 0 || res.err_code == 50009))
                        {
                            mst.N_B_STATE = 1;
                            WCSHelper.UpdateStatus(mst, "已推送");
@@ -1506,7 +1530,7 @@
                }
                if (result == null)
                {
                    result = TaskProcess.BCPInOrOut(db, true, "瓶胚即产满框缓存区", itemCode);
                    result = TaskProcess.BCPInOrOut(db, true, "瓶胚即产满框缓存", itemCode);
                }
                if(result == null)
                {