迁移至svn

zhao

2021-07-19 8347f2fbddbd25369359dcb2da1233ac48a19fdc

迁移至svn

 HH.WMS.BLL/Pda/ZCBLL.cs

@@ -245,6 +245,12 @@
            List<OperateResult> ors = new List<OperateResult>();
            if (transportReqs.Any())
            {
                var xbqBitStr = JsonHelper.GetValue("xbqBit");
                if (string.IsNullOrEmpty(xbqBitStr))
                    throw new Exception("未找到配置：xbqBit");

                var xbqBits = JsonConvert.DeserializeObject<List<XBQBitDto>>(xbqBitStr);

                foreach (var req in transportReqs)
                {
                    string startBit = req.Location_From;
@@ -286,7 +292,20 @@
                        }
                        else if (section == TaskSectionConstants.BCP_KTCK)
                        {
                            // 出库
                            direction = Constants.Out;
                            // 入库任务的起点是满托位，查找其相邻的空托位
                            var ktBit = xbqBits.FirstOrDefault(bit => bit.mtBit == inModel.startBit);
                            if (ktBit == null)
                            {
                                Log.Error("查找线边区空托点失败", "，空托点=null，入库任务的线边区满托点：" + inModel.startBit);
                                ors.Add(OperateResult.Error("查找线边区空托点失败" + "，空托点=null，入库任务的线边区满托点：" + inModel.startBit, req));
                                continue;
                            }
                            // 修改出库任务的终点为空托位
                            outModel.endBit = ktBit.ktBit;
                            outModel.startBit = "";
                            outModel.remark += "，半成品空托出库";
                        }
                        else if (section == TaskSectionConstants.BCP_MTRK)
                        {
@@ -334,6 +353,12 @@
                                {
                                    Log.Info("入作业区开始，传参：", JsonConvert.SerializeObject(inWorkAreaEntitys));
                                    externalRes = BLLCreator.Create<WmsApiBaseBLL>().InWorkArea(inWorkAreaEntitys);
                                    if (!externalRes.success)
                                    {
                                        Log.Error("入作业区失败，传参：", JsonConvert.SerializeObject(inWorkAreaEntitys) + externalRes.errMsg);
                                        ors.Add(OperateResult.Error("入作业区失败：" + externalRes.errMsg, req));
                                        continue;
                                    }
                                    taskNo = inModel.taskNo;
                                }
                                catch (Exception ex)
@@ -353,6 +378,12 @@
                                {
                                    Log.Info("出作业区开始，传参：", JsonConvert.SerializeObject(outWorkAreaEntitys));
                                    externalRes = BLLCreator.Create<WmsApiBaseBLL>().OutWorkArea(outWorkAreaEntitys);
                                    if (!externalRes.success)
                                    {
                                        Log.Error("出作业区失败，传参：", JsonConvert.SerializeObject(outWorkAreaEntitys) + externalRes.errMsg);
                                        ors.Add(OperateResult.Error("出作业区失败：" + externalRes.errMsg, req));
                                        continue;
                                    }
                                    taskNo = outModel.taskNo;
                                }
                                catch (Exception ex)

 HH.WMS.Entitys/Dto/ConnectBitDto.cs

@@ -6,11 +6,9 @@

namespace HH.WMS.Entitys.Dto
{
    public class ConnectBitDto
    public class XBQBitDto
    {
        public string tunnel { get; set; }
        public string bit { get; set; }
        public string readybit { get; set; }
        public string tasktype { get; set; }
        public string mtBit { get; set; }
        public string ktBit { get; set; }
    }
}

 HH.WMS.Entitys/Dto/XBQBitDto.cs

New file
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace HH.WMS.Entitys.Dto
{
    public class ConnectBitDto
    {
        public string tunnel { get; set; }
        public string bit { get; set; }
        public string readybit { get; set; }
        public string tasktype { get; set; }
    }
}

 HH.WMS.Entitys/HH.WMS.Entitys.csproj

@@ -66,6 +66,7 @@
    <Compile Include="Algorithm\TN_AB_B_ITEM_PRICEEntity.cs" />
    <Compile Include="Algorithm\TN_AB_B_LOCATION_LINKEntity.cs" />
    <Compile Include="Algorithm\TN_AB_STOCKEntity.cs" />
    <Compile Include="Dto\XBQBitDto.cs" />
    <Compile Include="Dto\ZCTransferDto.cs" />
    <Compile Include="Entitys\Mes\TN_MES_TASK.cs" />
    <Compile Include="External\ChangeWayResult.cs" />

 HH.WMS.WebApi/Config.json

@@ -28,5 +28,15 @@
      "bit": "接驳位货位",
      "tasktype": "空托入库"
    }
  ],
  "xbqBit": [
    {
      "mtBit": "XBQM01",
      "ktBit": "XBQK01"
    },
    {
      "mtBit": "XBQM02",
      "ktBit": "XBQK02"
    }
  ]
}

 HH.WMS.WebApi/Web.config

@@ -9,10 +9,10 @@
    <add name="wmsConnection" connectionString="Data Source=192.168.1.199;Initial Catalog=ZC_WMS;User ID=sa;Password=test?123" providerName="System.Data.SqlClient"/>
    <!--<add name="middleConnection" connectionString="Data Source=192.168.1.199;Initial Catalog=GL_ZJK;User ID=sa;Password=test?123" providerName="System.Data.SqlClient"/>-->
    <add name="DataType" connectionString="MSSQL"/>
    <add name="MIP" connectionString="192.168.1.198"/>
    <add name="MIP" connectionString="192.168.1.100"/>
    <add name="MPORT" connectionString="27017"/>
    <add name="MDB" connectionString="gl_mtl"/>
    <add name="MUSER" connectionString="gl"/>
    <add name="MDB" connectionString="zc_mtl"/>
    <add name="MUSER" connectionString="ZC"/>
    <add name="MPWD" connectionString="123456"/>
  </connectionStrings>
  <appSettings>
@@ -26,7 +26,7 @@
    <add key="KdEAppKey" />
    <add key="KdEReqURL" />
    <add key="AppName" value="海潮中策" />
    <add key="AutobomApi" value="192.168.1.199:8362" />
    <add key="AutobomApi" value="192.168.1.199:8113" />
    <add key="REDIS" value="123456@192.168.1.199:6379" />
    <add key="REDIS_DB" value="1" />
    <add key="UI_ROOT_PATH" value="E:\1.测试项目\31.贵轮\2.WMS\AutoWMS_UI" />