1

Reportapi/MyCode.Project.Domain/Message/Request/JackYun/CreateAndStockinGetRequestBizData.cs

@@ -0,0 +1,114 @@
+using MyCode.Project.Infrastructure.JackYun;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MyCode.Project.Domain.Message.Request.JackYun
+{
+    public class CreateAndStockinGetRequestBizData : BaseRequestBizData
+    {
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public String memo { get; set; }
+        
+        /// <summary>
+        /// 来源，默认ERP
+        /// </summary>
+        public String source { get; set; }
+        
+        /// <summary>
+        /// 制单人
+        /// </summary>
+        public String @operator { get; set; }
+
+        /// <summary>
+        /// 关联单据编号
+        /// 可随机，保证不重复即可
+        /// </summary>
+        public String relDataId { get; set; }
+        
+        /// <summary>
+        /// 出库类型 101=采购入库 102=调拨入库 103=盘盈入库 104=其他入库
+        /// </summary>
+        public int inType { get; set; }
+        
+        /// <summary>
+        /// 仓库code
+        /// </summary>
+        public String inWarehouseCode { get; set; }
+        
+        /// <summary>
+        /// 申请人姓名
+        /// </summary>
+        public String applyUserName { get; set; }
+        
+        /// <summary>
+        /// 入库申请单明细
+        /// </summary>
+        public List<StockInDetailViews> stockInDetailViews { get; set; }
+        
+        ///// <summary>
+        ///// 收发货人信息
+        ///// </summary>
+        //public StockInExpressInfo stockInExpressInfo { get; set; }
+        
+        /// <summary>
+        /// 申请人部门
+        /// </summary>
+        public String applyDepartName { get; set; }
+        
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+        public DateTime applyDate { get; set; }
+
+    }
+
+    public class StockInDetailViews
+    {
+        
+        /// <summary>
+        /// 价格
+        /// </summary>
+        public decimal skuPrice { get; set; }
+        
+        /// <summary>
+        /// 关联实际业务明细表的id
+        /// </summary>
+        public long relDetailId { get; set; }
+        
+        /// <summary>
+        /// 规格id
+        /// </summary>
+        public long skuId { get; set; }
+        
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal skuCount { get; set; }
+        
+        /// <summary>
+        /// 货品编号
+        /// </summary>
+        public String goodsNo { get; set; }
+        
+        /// <summary>
+        /// 计量单位名称
+        /// </summary>
+        public String unitName { get; set; }
+        
+         
+        /// <summary>
+        /// 是否正品
+        /// </summary>
+        public Byte isCertified { get; set; }
+        
+        /// <summary>
+        /// 条形码
+        /// </summary>
+        public String skuBarcode { get; set; }
+    }
+}

Reportapi/MyCode.Project.Domain/Message/Response/JackYun/CreateAndStockinResp.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MyCode.Project.Domain.Message.Response.JackYun
+{
+    public class CreateAndStockinResp
+    {
+        /// <summary>
+        /// [单据号]
+        /// </summary>
+        public string relDataId;
+
+        /// <summary>
+        /// [单据行号]
+        /// </summary>
+        public string relDetailId;
+
+        /// <summary>
+        /// [变动方向]
+        /// </summary>
+        public string type;
+
+        /// <summary>
+        /// [SKU]
+        /// </summary>
+        public string outSkuCode;
+
+        /// <summary>
+        /// [BARCODE]
+        /// </summary>
+        public string skuBarcode;
+
+        /// <summary>
+        /// [单位]
+        /// </summary>
+        public string unitName;
+
+        /// <summary>
+        /// [数量]
+        /// </summary>
+        public decimal skuCount;
+
+        /// <summary>
+        /// [仓库]
+        /// </summary>
+        public string inWarehouseCode;
+
+        /// <summary>
+        /// [过账日期]
+        /// </summary>
+        public DateTime applyDate;
+
+        /// <summary>
+        /// [备注]
+        /// </summary>
+        public string rowRemark;
+
+        /// <summary>
+        /// [status]
+        /// </summary>
+        public int status;
+
+    }
+}

Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj

@@ -62,6 +62,7 @@
     <Compile Include="Message\Act\Common\ReportExportAct.cs" />
     <Compile Include="Message\Act\Common\ExcelData.cs" />
     <Compile Include="Message\Act\Common\RequestModel.cs" />
+    <Compile Include="Message\Request\JackYun\CreateAndStockinGetRequestBizData.cs" />
     <Compile Include="Message\Request\JackYun\OrderTradeFullInfoGetRequestBizData.cs" />
     <Compile Include="Message\Request\KingDee\BillDelete.cs" />
     <Compile Include="Message\Request\KingDee\BillSave.cs" />
@@ -71,6 +72,7 @@
     <Compile Include="Message\Response\Common\IdName.cs" />
     <Compile Include="Message\Response\Common\ItemResult.cs" />
     <Compile Include="Message\Response\Common\ListHeadFieldData.cs" />
+    <Compile Include="Message\Response\JackYun\CreateAndStockinResp.cs" />
     <Compile Include="Message\Response\JackYun\PushOrderListResp.cs" />
     <Compile Include="Message\Response\KingDee\ErrorResponse.cs" />
     <Compile Include="Message\Response\LxmZHMDReport\ReportCalRateResp.cs" />
@@ -86,6 +88,7 @@
     <Compile Include="Model\PushKingDeeOrder.cs" />
     <Compile Include="Model\PushKingDeeOrderItem.cs" />
     <Compile Include="Model\SysWorkprocess.cs" />
+    <Compile Include="Model\WMStoJackyunInventoryMovementView1.cs" />
     <Compile Include="Model\YTKJTShopParameter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repositories\IApiLogRepository.cs" />
@@ -95,10 +98,12 @@
     <Compile Include="Repositories\IPushKingDeeOrderRepository.cs" />
     <Compile Include="Repositories\IRepository.cs" />
     <Compile Include="Repositories\IRepository`.cs" />
+    <Compile Include="Repositories\ISysWorkprocessHistoryRepository.cs" />
     <Compile Include="Repositories\ISysWorkprocessRepository.cs" />
+    <Compile Include="Repositories\IWMStoJackyunInventoryMovementView1Repository.cs" />
     <Compile Include="Repositories\IYTKJTShopParameterRepository.cs" />
-    <Compile Include="ZHMDModel\WMStoJackyunInventoryMovementView1.cs" />
-    <Compile Include="ZHMDRepositories\IWMStoJackyunInventoryMovementView1Repository.cs" />
+    <Compile Include="ZHMDModel\WMStoJackyunInventoryMovementView2.cs" />
+    <Compile Include="ZHMDRepositories\IWMStoJackyunInventoryMovementView2Repository.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

Reportapi/MyCode.Project.Domain/ZHMDModel/WMStoJackyunInventoryMovementView2.cs

@@ -8,10 +8,10 @@ namespace MyCode.Project.Domain.ZHMDModel
     ///<summary>
     ///
     ///</summary>
-    [SugarTable("WMStoJackyun_InventoryMovement_View1")]
-    public partial class WMStoJackyunInventoryMovementView1
+    [SugarTable("WMStoJackyun_InventoryMovement_View2")]
+    public partial class WMStoJackyunInventoryMovementView2
     {
-           public WMStoJackyunInventoryMovementView1(){
+           public WMStoJackyunInventoryMovementView2(){
 
 
            }

Reportapi/MyCode.Project.Domain/ZHMDRepositories/IWMStoJackyunInventoryMovementView2Repository.cs

@@ -8,10 +8,11 @@ using MyCode.Project.Domain;
 using MyCode.Project.Domain.ZHMDModel;
 using MyCode.Project.Infrastructure.Common;
 using MyCode.Project.Domain.Message;
+using MyCode.Project.Domain.Model;
 
 namespace MyCode.Project.Domain.Repositories.ZHMDRepositories
 {
-	public interface IWMStoJackyunInventoryMovementView1Repository 
+	public interface IWMStoJackyunInventoryMovementView2Repository 
 	{
         List<WMStoJackyunInventoryMovementView1> GetList(DateTime now);