Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json

ZR.Service/mes/wms/IService/IWmCheckLogService.cs

@@ -0,0 +1,24 @@
+using System;
+using ZR.Model;
+
+using System.Collections.Generic;
+using ZR.Model.MES.wms;
+using ZR.Model.MES.wms.Dto;
+
+namespace ZR.Service.Business.IBusinessService
+{
+    /// <summary>
+    /// 盘点记录service接口
+    /// </summary>
+    public interface IWmCheckLogService : IBaseService<WmCheckLog>
+    {
+        PagedInfo<WmCheckLogDto> GetList(WmCheckLogQueryDto parm);
+
+        WmCheckLog GetInfo(int Id);
+
+        WmCheckLog AddWmCheckLog(WmCheckLog parm);
+
+        int UpdateWmCheckLog(WmCheckLog parm);
+
+    }
+}

ZR.Service/mes/wms/IService/IWmGoodsNowProductionService.cs

@@ -0,0 +1,25 @@
+using System;
+using ZR.Model;
+using ZR.Model.Dto;
+
+using System.Collections.Generic;
+using ZR.Model.MES.wms;
+using ZR.Model.MES.wms.Dto;
+
+namespace ZR.Service.mes.wms.IService
+{
+    /// <summary>
+    /// 成品库当前货物表service接口
+    /// </summary>
+    public interface IWmGoodsNowProductionService : IBaseService<WmGoodsNowProduction>
+    {
+        PagedInfo<WmGoodsNowProductionDto> GetList(WmGoodsNowProductionQueryDto parm);
+
+        WmGoodsNowProduction GetInfo(string Id);
+
+        WmGoodsNowProduction AddWmGoodsNowProduction(WmGoodsNowProduction parm);
+
+        int UpdateWmGoodsNowProduction(WmGoodsNowProduction parm);
+
+    }
+}

ZR.Service/mes/wms/IService/IWmGoodsOutProductionService.cs

@@ -10,15 +10,15 @@ namespace ZR.Service.mes.wms.IService
     /// <summary>
     /// 出库货物记录表service接口
     /// </summary>
-    public interface IWmGoodsOutProductionService : IBaseService<WmGoodsOutProduction>
+    public interface IWmGoodsOutProductionService : IBaseService<WmGoodsOutRecord>
     {
         PagedInfo<WmGoodsOutProductionDto> GetList(WmGoodsOutProductionQueryDto parm);
 
-        WmGoodsOutProduction GetInfo(string Id);
+        WmGoodsOutRecord GetInfo(string Id);
 
-        WmGoodsOutProduction AddWmGoodsOutProduction(WmGoodsOutProduction parm);
+        WmGoodsOutRecord AddWmGoodsOutProduction(WmGoodsOutRecord parm);
 
-        int UpdateWmGoodsOutProduction(WmGoodsOutProduction parm);
+        int UpdateWmGoodsOutProduction(WmGoodsOutRecord parm);
 
     }
 }

ZR.Service/mes/wms/IService/IWmMaterialService.cs

@@ -20,5 +20,7 @@ namespace ZR.Service.mes.wms.IService
 
         int UpdateWmMaterial(WmMaterial parm);
 
+        WmGoodsNowProduction GetInfoByPatchCode(string patchCode);
+
     }
 }

ZR.Service/mes/wms/IService/IWmOutOrderService.cs

@@ -31,5 +31,10 @@ namespace ZR.Service.mes.wms.IService
 
         List<WmOutOrderPlan> Generate_outorderplan(string shipment_num);
 
+        (int, int) DoMaterialOut(WmDoMaterialOut_Dto doMaterialOut, string Createby);
+
+
+        bool OverOutorderplan(string shipment_num);
+
     }
 }