Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/InterfaceDocking/GetLGInfoEntity.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+
+namespace Mesnac.Action.ChemicalWeighing.InterfaceDocking
+{
+    public class GetLGInfoEntity
+    {
+        public GetLGInfoEntity()
+        {
+            reqTime= DateTime.Now.ToString("yyyy-MM-dd");
+            
+        }
+
+        public string factory { get; set; } = "999";
+        public string reqTime { get; set; }
+
+    }
+
+    public class GetLGResJson
+    {
+        public int code { get; set; }
+        public string msg { get; set;  }
+
+        public List<GetLGRes> data { get; set; }
+
+    }
+    
+
+    public class GetLGRes
+    {
+        /// <summary>
+        /// 工单id
+        /// </summary>
+         public string workorderId { get; set; }
+        /// <summary>
+        /// 料罐编码
+        /// </summary>
+         public string bucketCode { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+         public string materialCode { get; set; }
+        /// <summary>
+        /// 物料
+        /// </summary>
+         public string materialName { get; set; }
+        /// <summary> 
+        /// 班次id 5白班 2夜班
+        /// </summary>
+         public string shiftId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+         public string workorderCode { get; set; }
+        
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/InterfaceDocking/HttpResponse.cs

@@ -23,6 +23,13 @@ namespace Mesnac.Action.ChemicalWeighing.InterfaceDocking
             string  stry = new LGusedEntity(deCode, used).JsonTo();
             return Post("http://192.168.202.34:8080/mes/wcsInterface/saveLGusedLog", stry);
         }
+
+
+        public string GetLGInfo()
+        {
+            string  stry = new GetLGInfoEntity().JsonTo();
+            return Post("http://192.168.202.34:30000/prod-api/open/openInterface/getLGInfo", stry);
+        }
         
 
 

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj

@@ -277,6 +277,7 @@
     <Compile Include="InterfaceDocking\DockingEntity\MaterialPlanSyncEntity.cs" />
     <Compile Include="InterfaceDocking\DockingEntity\TankDeviceStateSyncEntity.cs" />
     <Compile Include="InterfaceDocking\DockingEntity\TankIsDischargedSyncEntity.cs" />
+    <Compile Include="InterfaceDocking\GetLGInfoEntity.cs" />
     <Compile Include="InterfaceDocking\HttpHelper.cs" />
     <Compile Include="InterfaceDocking\HttpResponse.cs" />
     <Compile Include="InterfaceDocking\LGusedEntity.cs" />