1

pulg

9 天以前 8f0f149d607a7246fa25e81340602ce5e47398fe

 HH.WCS.QingXiNongfu/api/ApiHelper.cs

@@ -3,21 +3,12 @@
using HH.WCS.QingXigongchang.util;
using HH.WCS.QingXigongchang.wms;
using Newtonsoft.Json;
using NLog.Fluent;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Linq;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.ConstrainedExecution;
using System.Security.Cryptography;
using System.Threading;
using System.Threading.Tasks;
using System.Web.Http;
using System.Web.Security;
using static HH.WCS.QingXigongchang.api.ApiModel;
using static HH.WCS.QingXigongchang.dispatch.NDC;

namespace HH.WCS.QingXigongchang.api
{
@@ -789,20 +780,20 @@
                        }
                    }
                }
                if (!string.IsNullOrEmpty(item.Trim()))
                    if (!"J,F".Contains(SQL_UsingNow) || String.IsNullOrEmpty(SQL_UsingNow))
                    {
                        if (locd.S_AREA_CODE.StartsWith("PP"))
                        {
                            SQL_UsingNow = "F";
                        }
                        else if (locd.S_AREA_CODE.Contains("JCJY"))
                        {
                            SQL_UsingNow = "J";
                        }
                        else
                            return SimpleResult.Error("指明 即产和非即产的参数 JF 没有明确" + SQL_UsingNow);
                    }
                //if (!string.IsNullOrEmpty(item.Trim()))
                //    if (!"J,F".Contains(SQL_UsingNow) || String.IsNullOrEmpty(SQL_UsingNow))
                //    {
                //        if (locd.S_AREA_CODE.StartsWith("PP"))
                //        {
                //            SQL_UsingNow = "F";
                //        }
                //        else if (locd.S_AREA_CODE.Contains("JCJY"))
                //        {
                //            SQL_UsingNow = "J";
                //        }
                //        else
                //            return SimpleResult.Error("指明 即产和非即产的参数 JF 没有明确" + SQL_UsingNow);
                //    }

                result.resultCode = 0;
                //LocationHelper.BindingLoc(loc.Trim(), "1".Split(',').ToList());
@@ -820,8 +811,6 @@
                {
                    return SimpleResult.Error(loc + " 货位 arco  a,r,c,o 指定不明");
                }

                {
                    var row = _locs.FindAll(x => x.S_AREA_CODE == locd.S_AREA_CODE && x.N_ROW == locd.N_ROW && x.S_LOCK_STATE != "无" && x.S_LOCK_STATE != "报废");
                    //var rowloc = row.Find(x => x.S_LOCK_STATE != "无");
                    if (row.Any())
@@ -890,7 +879,7 @@
                            return true;
                        });
                    }
                }

            }
        lable_end:
            return result;