Merge branch 'master' of http://119.3.29.177:3000/Luy/NWeiWMS

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

@@ -1075,7 +1075,7 @@ namespace ICSSoft.DataProject
                     }
                     if (TransType != TransTypeEnum.ContainerBind.GetDescription() && TransType != TransTypeEnum.ContainerUnBind.GetDescription())
                     {
-                        throw new Exception(language.GetNameByCode("WMSAPIInfo199"));//"操作类型错误！"
+                        throw new Exception(language.GetNameByCode("WMSAPIInfo210"));//"操作类型错误！"
                     }
                     string chksql = @"select ID,ContainerCode from ICSContainer
                                       where ContainerCode='{0}' AND WorkPoint='{1}'";
@@ -1083,7 +1083,7 @@ namespace ICSSoft.DataProject
                     DataTable chkdt = DBHelper.SQlReturnData(chksql, cmd);
                     if (chkdt.Rows.Count == 0)
                     {
-                        msg = string.Format(language.GetNameByCode("WMSAPIInfo195"), JsonData.ContainerCode);//"容器不存在！"
+                        msg = string.Format(language.GetNameByCode("WMSAPIInfo211"), JsonData.ContainerCode);//"容器不存在！"
                     }
                     else
                     {
@@ -1099,7 +1099,7 @@ namespace ICSSoft.DataProject
                         chkdt = DBHelper.SQlReturnData(chksql, cmd);
                         if (chkdt.Rows.Count != 0)
                         {
-                            msg = string.Format(language.GetNameByCode("WMSAPIInfo196"), JsonData.ContainerCode);//"容器已入库！"
+                            msg = string.Format(language.GetNameByCode("WMSAPIInfo212"), JsonData.ContainerCode);//"容器已入库！"
                         }
                     }
                     else
@@ -1110,7 +1110,7 @@ namespace ICSSoft.DataProject
                         chkdt = DBHelper.SQlReturnData(chksql, cmd);
                         if (chkdt.Rows.Count == 0)
                         {
-                            msg = string.Format(language.GetNameByCode("WMSAPIInfo200"), JsonData.ContainerCode);//"容器未绑定条码！"
+                            msg = string.Format(language.GetNameByCode("WMSAPIInfo213"), JsonData.ContainerCode);//"容器未绑定条码！"
                         }
                         else
                         {

ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSSoft.Entity.csproj

@@ -53,6 +53,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AGVStartTaskModel.cs" />
     <Compile Include="BarCodeModel.cs" />
     <Compile Include="ControlMode.cs" />
     <Compile Include="DownItemModel.cs" />
@@ -67,7 +68,7 @@
     <Compile Include="LanguageModel.cs" />
     <Compile Include="LOTMergeCreateIModel.cs" />
     <Compile Include="LotNoMode.cs" />
-    <Compile Include="LOTStockSAPModel.cs" />
+    <Compile Include="LOTStockDownHGModel.cs" />
     <Compile Include="AGVPodBindModel.cs" />
     <Compile Include="LOTStockUpHGModel.cs" />
     <Compile Include="LOTStockUpCreateIModel.cs" />