优化

hudong

4 天以前 3a3c5f5711a57439f34e772313fcbb18ba7885bc

 api/WmsSpaHelper.cs

@@ -2121,7 +2121,7 @@
        }
        private static readonly ObjectCache Cache = MemoryCache.Default;
        private const string CachePrefix = "ClickProtection_";
        private const int CacheDurationInSeconds = 2;
        private const int CacheDurationInSeconds = 5;

        public static bool IsClickAllowed(string parameter)
        {
@@ -2316,10 +2316,10 @@
       

            var result = new SimpleResult();
            if (!IsClickAllowed(model.cntr_code))
            if (!IsClickAllowed("1"))
            {
                // 提示用户5秒内已点击过
                result.resultMsg = "您已点击过，请2秒后再试。";
                result.resultMsg = "您已点击过，请5秒后再试。";
                result.resultCode = 1;
                return result;
            }
@@ -2365,7 +2365,7 @@

                    }
                    LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
                    var gzra = db.Queryable<TN_GZ_SZ>().Where(a => a.N_ENABLE == 1).First();
                    var gzra = db.Queryable<TN_GZ_SZ>().Where(a => a.C_ENABLE == "Y").First();
                    var GZRQ = DateTime.Now.ToString("yyyyMMdd");
                    if (gzra != null)
                    {
@@ -2525,10 +2525,10 @@
        {

            var result = new SimpleResult();
            if (!IsClickAllowed(model.cntr_code))
            if (!IsClickAllowed("1"))
            {
                // 提示用户5秒内已点击过
                result.resultMsg = "您已点击过，请2秒后再试。";
                result.resultMsg = "您已点击过，请5秒后再试。";
                result.resultCode = 1;
                return result;
            }
@@ -2574,16 +2574,17 @@

                    }
                    LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
                    var gzra = db.Queryable<TN_GZ_SZ>().Where(a => a.N_ENABLE == 1).First();
                    var gzra = db.Queryable<TN_GZ_SZ>().Where(a => a.C_ENABLE == "Y").First();
                    var GZRQ = DateTime.Now.ToString("yyyyMMdd");
                    if (gzra != null)
                    {
                        GZRQ = gzra.S_GZRQ.ToString("yyyyMMdd");
                    }
                    #region 注释sap 因效率过慢 人工回到
                    //根据不同出库类型 回调sap
                    if (po.S_OUT_TYPE == "冲销出库")
                    {
                        result = await CXAddOutboundOrder(GZRQ,db, model.MaterList, model.arrival_no, model.cntr_code, start);
                        result = await CXAddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
                    }
                    else
                    if (po.S_OUT_TYPE == "出库")//普通出库
@@ -2593,12 +2594,16 @@
                    }
                    else if (po.S_OUT_TYPE == "计划外发料出库")
                    {
                        result = await jhwtlAddOutboundOrder(GZRQ,db, model.MaterList, model.arrival_no, model.cntr_code, start);
                        result = await jhwtlAddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
                    }
                    else if (po.S_OUT_TYPE == "成本中心出库")
                    {
                        result = await CBAddOutboundOrder(GZRQ,db, model.MaterList, model.arrival_no, model.cntr_code, start);
                        result = await CBAddOutboundOrder(GZRQ, db, model.MaterList, model.arrival_no, model.cntr_code, start);
                    }
                    #endregion



                    //if (result.resultCode == 1)
                    //{
                    //    return result;
@@ -2915,7 +2920,7 @@
                        };
                        if (WMSHelper.CreateWmsTask(wmsTask))
                        {
                            LocationHelper.LockLoc(startloc.S_CODE, 1);
                            LocationHelper.LockLoc(startloc.S_CODE, 2);
                            result.resultMsg = $"创建作业成功，作业号{wmsTask.S_CODE}";
                        }
                //}
@@ -4984,12 +4989,15 @@

                  

                    var gzra = db.Queryable<TN_GZ_SZ>().Where(a => a.N_ENABLE == 1).First();
                    var gzra = db.Queryable<TN_GZ_SZ>().Where(a => a.C_ENABLE == "Y").First();
                    var GZRQ = DateTime.Now.ToString("yyyyMMdd");
                    if (gzra!=null)
                    if (gzra != null)
                    {
                        GZRQ= gzra.S_GZRQ.ToString("yyyyMMdd");
                        GZRQ = gzra.S_GZRQ.ToString("yyyyMMdd");
                    }
                    #region MyRegion


                    if (po.S_IN_TYPE == "内采入库")
                    {
                        List<NcRkDto.ITEM> listitem = new List<NcRkDto.ITEM>();
@@ -5028,10 +5036,10 @@
                            tN_Inbound_Details.Add(item);

                        }
                        string combinedIds= string.Join(",", po.Details.Select(x => x.N_ROW_NO));
                        string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
                        var KEY = WCSHelper.Generate13DigitIds();
                        var s_key=   db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO&&a.N_ROW_NO == combinedIds).First();
                        if (s_key!=null)
                        var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).First();
                        if (s_key != null)
                        {
                            KEY = s_key.S_KEY;
                        }
@@ -5061,7 +5069,7 @@
                        var json = JsonConvert.SerializeObject(roots.ROOT);
                        string xml = JsonConvert.DeserializeXmlNode(json, "ROOT").OuterXml;

                       

                        LogHelper.Info($"内采收货xml数据{xml}");

                        #region MyRegion
@@ -5086,9 +5094,6 @@
                        // 将 XmlDocument 转换为 JSON 字符串
                        //JObject jsonObject = JsonConvert.DeserializeObject<JObject>(JsonConvert.SerializeXmlNode(xmlDoc));
                        #endregion





                        #region sap回调
@@ -5125,7 +5130,7 @@
                            {
                                db.Updateable(tN_Inbound_Details).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                            }
                          await  AddCenter(db, po.Details);
                            await AddCenter(db, po.Details);

                            List<MaterialVoucher> materials = new List<MaterialVoucher>();
                            foreach (var item in model.Wlist)
@@ -5203,12 +5208,12 @@

                            }
                        };
                    

                        //回参物料信息
                        List<JHWBackDto.ITEM> iTEMs = new List<JHWBackDto.ITEM>();
                        foreach (var item in po.Details)
                        {
                           // var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.S_ITEM_CODE).FirstOrDefault();
                            // var podetail = po.Details.Where(s => s.S_ITEM_CODE == item.S_ITEM_CODE).FirstOrDefault();
                            JHWBackDto.ITEM ckbitem = new JHWBackDto.ITEM();
                            ckbitem.WLBH = item.S_ITEM_CODE;
                            ckbitem.GC = po.S_FACTORY;
@@ -5298,7 +5303,7 @@
                            {
                                db.Updateable(tN_Inbound_Details).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                            }
                          await  AddCenter(db, po.Details);
                            await AddCenter(db, po.Details);
                            List<MaterialVoucher> materials = new List<MaterialVoucher>();
                            foreach (var item in model.Wlist)
                            {
@@ -5466,7 +5471,7 @@
                            {
                                db.Updateable(tN_Inbound_Details).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                            }
                          await  AddCenter(db, po.Details);
                            await AddCenter(db, po.Details);
                            ;
                            List<MaterialVoucher> materials = new List<MaterialVoucher>();
                            foreach (var item in model.Wlist)
@@ -5632,10 +5637,10 @@


                            }
                            if (tN_Inbound_Detailcx.Count()>0)
                            if (tN_Inbound_Detailcx.Count() > 0)
                            {
                                db.Updateable(tN_Inbound_Detailcx).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                              await  AddCenter(db, tN_Inbound_Detailcx);
                                await AddCenter(db, tN_Inbound_Detailcx);
                            }
                            if (materiallist.Count() > 0)
                            {
@@ -5673,8 +5678,8 @@
                        //}
                        //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
                    }

                    var newpodetai= db.Queryable<TN_Inbound_Detail>().Where(a => a.S_IO_NO == model.S_NO).ToList();
                    #endregion
                    var newpodetai = db.Queryable<TN_Inbound_Detail>().Where(a => a.S_IO_NO == model.S_NO).ToList();
                    int cout = newpodetai.Where(s => s.N_B_STATE != 1).Count();
                    if (cout==0)
                    {
@@ -5722,11 +5727,16 @@
                    List<OutboundRecord> records = new List<OutboundRecord>();
                    foreach (var item in po)
                    {
                        
                        var pz = pzs.Where(s => s.S_WLBM == item.S_ITEM_CODE && s.S_WLH == item.N_BS_ROW_NO).ToList().FirstOrDefault();

                        var S_TYPE = "回库";
                        if (pz!=null)
                        {
                            S_TYPE = pz.S_TYPE;
                        }
                        OutboundRecord outboundRecord = new OutboundRecord();
                        outboundRecord.S_NO = item.S_BS_NO;
                        outboundRecord.S_TYPE = pz?.S_TYPE;
                        outboundRecord.S_TYPE = S_TYPE;
                        outboundRecord.S_WLPZBH = pz?.S_WLBM;
                        outboundRecord.S_WLPZND = pz?.S_WLPZND;
                        outboundRecord.S_WLBM = item.S_ITEM_CODE;