更新版本

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumInterfaceAppService.cs

@@ -96,6 +96,61 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
           
             return ApplicationConsts.SuccessStr;
         }
+        /// <summary>
+        /// 准时化出库主表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("WmsOutputList")]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<List<TA_WMS_CTRL>> GetListAsync(string version,string begin,string end)
+        {
+
+           return  _dapper.GetTask(version,begin, end);
+
+      
+        }
+
+        /// <summary>
+        /// 准时化出库明细
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("WmsOutputDetailList")]
+        [UnitOfWork(false)]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<List<TA_WMS_JSKH>> GetDetailListAsync(string taskid,string materialCode,string billnum)
+        {
+            return _dapper.GetTaskList(taskid, materialCode, billnum);
+           
+        }
+
+
+
+        [HttpGet]
+        [Route("WmsOutputVersionList")]
+        [UnitOfWork(false)]
+        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+        virtual public async Task<List<string>> GetVersionListAsync(string taskid, string materialCode, string billnum)
+        {
+            return _dapper.GetVersionList();
+
+
+        }
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs

@@ -47,22 +47,12 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         public string KWMENG { set; get; }
         [ExporterHeader(DisplayName ="工厂")]
         public string ZNOTE1 { set; get; }
-   
         [ExporterHeader(DisplayName ="单价")]
         public string ZNOTE5 { set; get; }
         [ExporterHeader(DisplayName ="状态")]
         public string STATE { set; get; }
         [ExporterHeader(DisplayName ="单号")]
         public string REMARK { set; get; }
-
-
-
-
-
-
-
-
-
     }
 
 
@@ -73,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         {
 
         }
-        public virtual List<TA_WMS_CTRL> GetTask(string begin,string end)
+        public virtual List<TA_WMS_CTRL> GetTask(string version,string begin, string end)
         {
             var str = "";
 
@@ -85,45 +75,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
             {
                 str += string.Format("  and AccountDate<='{0}' ", end);
             }
-
-
- var sql = "SELECT TOP (1000) [wms_seq]\n" +
-     "      ,[wms_table]\n" +
-     "      ,[wms_table_qty]\n" +
-     "      ,[wms_state]\n" +
-     "      ,[remark]\n" +
-     "      ,[createtime]\n" +
-     "      ,[wms_domin]\n" +
-     "      ,[SourceBillNum]\n" +
-     "      ,[updatetime]\n" +
-     "      ,[wms_uid]\n" +
-     "      ,[JsonString]\n" +
-     "      ,[AccountDate]\n" +
-     "  FROM [TA_WMS_CTRL]  WHERE {0}" +
-     "  SourceBillNum LIKE 'S2%'  order by createtime desc2";
-
-          sql=  string.Format(sql, str);
-          var query=  DbConnection.Query<TA_WMS_CTRL>(sql);
-            return query.ToList();
-
-
-
-        }
-
-        public virtual List<TA_WMS_CTRL> GetTaskList(string begin, string end)
-        {
-            var str = "";
-
             if (!string.IsNullOrEmpty(begin))
             {
-                str += string.Format("  and AccountDate>='{0}' ", begin);
+                str += string.Format("  and JsonString='{0}' ", version);
             }
-            if (!string.IsNullOrEmpty(end))
-            {
-                str += string.Format("  and AccountDate<='{0}' ", end);
-            }
-
-
             var sql = "SELECT TOP (1000) [wms_seq]\n" +
                 "      ,[wms_table]\n" +
                 "      ,[wms_table_qty]\n" +
@@ -147,10 +102,67 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 
         }
 
+        public virtual List<TA_WMS_JSKH> GetTaskList(string taskid, string materialCode, string billnum)
+        {
+            var str = " where 1=1 ";
+
+            if (!string.IsNullOrEmpty(taskid))
+            {
+                str += string.Format("  and wms_seq='{0}' ", taskid);
+            }
+            if (!string.IsNullOrEmpty(materialCode))
+            {
+                str += string.Format("  and ZVBELN='{0}' ", billnum);
+            }
+            if (!string.IsNullOrEmpty(billnum))
+            {
+                str += string.Format("  and MATNR='{0}' ", materialCode);
+            }
+
+            var sql =
+            " SELECT [wms_seq]\n" +
+            "      ,[POSNR]\n" +
+            "      ,[ZVBELN] \n" +
+            "      ,[KUNNR] \n" +
+            "      ,[AUGRU]\n" +
+            "      ,[MATNR]\n" +
+            "      ,[ZPR0]\n" +
+            "      ,[KWMENG]\n" +
+            "      ,[ZNOTE1]\n" +
+            "      ,[ZNOTE4]\n" +
+            "      ,[ZNOTE5]\n" +
+            "      ,[STATE]\n" +
+            "      ,[REMARK]\n" +
+            "  FROM [TA_WMS_JSKH] {0} ";
+
+            sql = string.Format(sql, str);
+            var query = DbConnection.Query<TA_WMS_JSKH>(sql);
+            return query.ToList();
+
 
 
+        }
+
 
 
+        public virtual List<string> GetVersionList()
+        {
+
+
+            var sql =
+                " SELECT \n" +
+                "      distinct [JsonString]\n" +
+               
+                "  FROM [TA_WMS_CTRL]  WHERE {0}" +
+                "  SourceBillNum LIKE 'S2%'  order by createtime desc2";
+
+           
+            var query = DbConnection.Query<string>(sql);
+            return query.ToList();
+
+
+
+        }