LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -311,12 +311,36 @@ Dictionary<string, object> data = new Dictionary<string, object>(); if (printClassifyEnum == PrintClassifyEnum.å è£ æ¡ç ) { //data.Add("bar", item.SNCode); //data.Add("material", item.MaterialCode ?? "" + "/" + item.MaterialName ?? ""); //data.Add("supplier", item.SupplierName ?? ""); //data.Add("unit", item.MaterialUnit ?? ""); //data.Add("qty", item.Quantity); //data.Add("date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); data.Add("Info4", item.Info4);//åååå· data.Add("Info5", item.Info5 ?? "");//ç产åå· data.Add("Info6", "第" + (item.Info6 ?? "") + "å ");//第å å data.Add("bar", item.PackageCode);//äºç»´ç ï¼å å·ï¼ data.Add("Info7", item.Info7 ?? "");//ç»éåº data.Add("Info8", item.Info8 ?? "");//产å data.Add("Info9", item.PackageCode ?? "");//å è£ ç¼ç data.Add("Info10", item.Info10 ?? "");//客æ·åç§° data.Add("Info11", item.Info11 ?? "");//èªæoråè´§ data.Add("Info12", "å è£ æç» é¨ä»¶æ»æ°" + item.Info12 ?? "");//é¨ä»¶æç» data.Add("Info13", item.Info13 ?? "");//å½åå é¢ç§¯ data.Add("printTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); //æ¥è¯¢ä¸ å æ°æ® var mylist = mycontext.mes_batchOrderUPI_new.Where(x => x.PackageCode == item.PackageCode).ToList(); var gg = mylist.GroupBy(x => x.DetailName); int i = 0; foreach (var g in gg) { i++; data.Add("detail_" + i, g.Key ?? "");//é¨ä»¶åç§° data.Add("detail_" + i + "_length", g.ToList().First().Info16 ?? "");//é¨ä»¶å°ºå¯¸ data.Add("detail_" + i + "_number", g.ToList().Count());//é¨ä»¶æ°é } for (int p = (i + 1); p <= 6; p++) { data.Add("detail_" + p, "");//é¨ä»¶åç§° data.Add("detail_" + p + "_length", "");//é¨ä»¶å°ºå¯¸ data.Add("detail_" + p + "_number", "");//é¨ä»¶æ°é } } else { LA24030_LuLiPackageLine_Print/´òÓ¡Ä£°åÎļþ/°ü×°ÌõÂëÄ£°å_¶þάÂë.btwBinary files differ
LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/component/editDialog.vue
@@ -82,13 +82,6 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="å è£ ç¼ç " prop="info9"> <el-input v-model="ruleForm.info9" placeholder="请è¾å ¥å è£ ç¼ç " maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="èªæoråè´§" prop="info11"> <el-input v-model="ruleForm.info11" placeholder="请è¾å ¥èªæoråè´§" maxlength="60" show-word-limit clearable /> LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsRecordPrint/index.vue
@@ -5,7 +5,7 @@ <el-row> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10"> <el-form-item label="å ³é®å"> <el-input v-model="queryParamsWmsRecordPrint.searchKey" clearable="" placeholder="å è£ å·,éå®åååå·,ç产åå·,第å å ,ç»éåºåç§°,产ååç§°,客æ·åç§°,å è£ ç¼ç ,èªæoråè´§,å è£ é¨ä»¶æ»æ°é,å è£ é¢ç§¯,é¨ä»¶åç§°,é¨ä»¶å°ºå¯¸,夿³¨,å建人,ä¿®æ¹äºº"/> <el-input v-model="queryParamsWmsRecordPrint.searchKey" clearable="" placeholder="å è£ å·,éå®åååå·,ç产åå·,第å å ,ç»éåºåç§°,产ååç§°,客æ·åç§°,èªæoråè´§,å è£ é¨ä»¶æ»æ°é,å è£ é¢ç§¯,é¨ä»¶åç§°,é¨ä»¶å°ºå¯¸,夿³¨,å建人,ä¿®æ¹äºº"/> </el-form-item> </el-col> @@ -66,12 +66,6 @@ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRecordPrint"> <el-form-item label="客æ·åç§°"> <el-input v-model="queryParamsWmsRecordPrint.info10" clearable="" placeholder="请è¾å ¥å®¢æ·åç§°"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRecordPrint"> <el-form-item label="å è£ ç¼ç "> <el-input v-model="queryParamsWmsRecordPrint.info9" clearable="" placeholder="请è¾å ¥å è£ ç¼ç "/> </el-form-item> </el-col> @@ -190,7 +184,6 @@ <el-table-column prop="info7" label="ç»éåºåç§°" show-overflow-tooltip="" /> <el-table-column prop="info8" label="产ååç§°" show-overflow-tooltip="" /> <el-table-column prop="info10" label="客æ·åç§°" show-overflow-tooltip="" /> <el-table-column prop="info9" label="å è£ ç¼ç " show-overflow-tooltip="" /> <el-table-column prop="info11" label="èªæoråè´§" show-overflow-tooltip="" /> <el-table-column prop="info12" label="å è£ é¨ä»¶æ»æ°é" show-overflow-tooltip="" /> <el-table-column prop="info13" label="å è£ é¢ç§¯" show-overflow-tooltip="" /> LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue
@@ -186,6 +186,97 @@ </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="éå®åååå·" prop="info4"> <el-input v-model="ruleForm.info4" placeholder="请è¾å ¥éå®åååå·" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="ç产åå·" prop="info5"> <el-input v-model="ruleForm.info5" placeholder="请è¾å ¥ç产åå·" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="第å å " prop="info6"> <el-input v-model="ruleForm.info6" placeholder="请è¾å ¥ç¬¬å å " maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="ç»éåºåç§°" prop="info7"> <el-input v-model="ruleForm.info7" placeholder="请è¾å ¥ç»éåºåç§°" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="产ååç§°" prop="info8"> <el-input v-model="ruleForm.info8" placeholder="请è¾å ¥äº§ååç§°" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="客æ·åç§°" prop="info10"> <el-input v-model="ruleForm.info10" placeholder="请è¾å ¥å®¢æ·åç§°" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="å è£ ç¼ç " prop="info9"> <el-input v-model="ruleForm.info9" placeholder="请è¾å ¥å è£ ç¼ç " maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="èªæoråè´§" prop="info11"> <el-input v-model="ruleForm.info11" placeholder="请è¾å ¥èªæoråè´§" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="å è£ é¨ä»¶æ»æ°é" prop="info12"> <el-input v-model="ruleForm.info12" placeholder="请è¾å ¥å è£ é¨ä»¶æ»æ°é" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="å è£ é¢ç§¯" prop="info13"> <el-input v-model="ruleForm.info13" placeholder="请è¾å ¥å è£ é¢ç§¯" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="é¨ä»¶åç§°" prop="info14"> <el-input v-model="ruleForm.info14" placeholder="请è¾å ¥é¨ä»¶åç§°" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="é¨ä»¶æ°é" prop="info15"> <el-input-number v-model="ruleForm.info15" placeholder="请è¾å ¥é¨ä»¶æ°é" clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="é¨ä»¶å°ºå¯¸" prop="info16"> <el-input v-model="ruleForm.info16" placeholder="请è¾å ¥é¨ä»¶å°ºå¯¸" maxlength="60" show-word-limit clearable /> </el-form-item> </el-col> </el-row> </el-form> <template #footer> LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
@@ -5,7 +5,7 @@ <el-row> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10"> <el-form-item label="å ³é®å"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="æ¹æ¬¡å·,订åå·,é¨ä»¶æ¡ç ,é¨ä»¶åç§°,é¨ä»¶çº¹ç,å è£ å·,å建人,ä¿®æ¹äºº"/> <el-input v-model="queryParamsMes_BatchOrderUPI_New.searchKey" clearable="" placeholder="æ¹æ¬¡å·,订åå·,é¨ä»¶æ¡ç ,é¨ä»¶åç§°,é¨ä»¶çº¹ç,å è£ å·,éå®åååå·,ç产åå·,第å å ,ç»éåºåç§°,产ååç§°,客æ·åç§°,å è£ ç¼ç ,èªæoråè´§,å è£ é¨ä»¶æ»æ°é,å è£ é¢ç§¯,é¨ä»¶åç§°,é¨ä»¶å°ºå¯¸,å建人,ä¿®æ¹äºº"/> </el-form-item> </el-col> @@ -159,6 +159,84 @@ </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="éå®åååå·"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info4" clearable="" placeholder="请è¾å ¥éå®åååå·"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="ç产åå·"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info5" clearable="" placeholder="请è¾å ¥ç产åå·"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="第å å "> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info6" clearable="" placeholder="请è¾å ¥ç¬¬å å "/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="ç»éåºåç§°"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info7" clearable="" placeholder="请è¾å ¥ç»éåºåç§°"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="产ååç§°"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info8" clearable="" placeholder="请è¾å ¥äº§ååç§°"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="客æ·åç§°"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info10" clearable="" placeholder="请è¾å ¥å®¢æ·åç§°"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="å è£ ç¼ç "> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info9" clearable="" placeholder="请è¾å ¥å è£ ç¼ç "/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="èªæoråè´§"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info11" clearable="" placeholder="请è¾å ¥èªæoråè´§"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="å è£ é¨ä»¶æ»æ°é"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info12" clearable="" placeholder="请è¾å ¥å è£ é¨ä»¶æ»æ°é"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="å è£ é¢ç§¯"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info13" clearable="" placeholder="请è¾å ¥å è£ é¢ç§¯"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="é¨ä»¶åç§°"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info14" clearable="" placeholder="请è¾å ¥é¨ä»¶åç§°"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="é¨ä»¶æ°é"> <el-input-number v-model="queryParamsMes_BatchOrderUPI_New.info15" clearable="" placeholder="请è¾å ¥é¨ä»¶æ°é"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New"> <el-form-item label="é¨ä»¶å°ºå¯¸"> <el-input v-model="queryParamsMes_BatchOrderUPI_New.info16" clearable="" placeholder="请è¾å ¥é¨ä»¶å°ºå¯¸"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10"> <el-form-item> <el-button-group style="display: flex; align-items: center;"> @@ -199,7 +277,7 @@ </el-table-column> <el-table-column prop="planNo" label="æ¹æ¬¡å·" show-overflow-tooltip="" /> <el-table-column prop="orderId" label="订åå·" show-overflow-tooltip="" /> <el-table-column prop="upi" label="é¨ä»¶æ¡ç " width="200px" show-overflow-tooltip="" /> <el-table-column prop="upi" label="é¨ä»¶æ¡ç " show-overflow-tooltip="" /> <el-table-column prop="detailName" label="é¨ä»¶åç§°" show-overflow-tooltip="" /> <el-table-column prop="length" label="é¿" show-overflow-tooltip="" /> <el-table-column prop="width" label="宽" show-overflow-tooltip="" /> @@ -219,6 +297,19 @@ <el-table-column prop="info1" label="纸箱é¿" show-overflow-tooltip="" /> <el-table-column prop="info2" label="纸箱宽" show-overflow-tooltip="" /> <el-table-column prop="info3" label="纸箱é«" show-overflow-tooltip="" /> <el-table-column prop="info4" label="éå®åååå·" show-overflow-tooltip="" /> <el-table-column prop="info5" label="ç产åå·" show-overflow-tooltip="" /> <el-table-column prop="info6" label="第å å " show-overflow-tooltip="" /> <el-table-column prop="info7" label="ç»éåºåç§°" show-overflow-tooltip="" /> <el-table-column prop="info8" label="产ååç§°" show-overflow-tooltip="" /> <el-table-column prop="info10" label="客æ·åç§°" show-overflow-tooltip="" /> <el-table-column prop="info9" label="å è£ ç¼ç " show-overflow-tooltip="" /> <el-table-column prop="info11" label="èªæoråè´§" show-overflow-tooltip="" /> <el-table-column prop="info12" label="å è£ é¨ä»¶æ»æ°é" show-overflow-tooltip="" /> <el-table-column prop="info13" label="å è£ é¢ç§¯" show-overflow-tooltip="" /> <el-table-column prop="info14" label="é¨ä»¶åç§°" show-overflow-tooltip="" /> <el-table-column prop="info15" label="é¨ä»¶æ°é" show-overflow-tooltip="" /> <el-table-column prop="info16" label="é¨ä»¶å°ºå¯¸" show-overflow-tooltip="" /> <el-table-column prop="createTime" label="å建æ¶é´" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" /> <el-table-column prop="updateTime" label="ä¿®æ¹æ¶é´" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" /> <el-table-column prop="createUserName" label="å建人" show-overflow-tooltip="" /> LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs
@@ -73,12 +73,7 @@ [SugarColumn(ColumnName = "Info10", ColumnDescription = "客æ·åç§°", Length = 60)] public string? Info10 { get; set; } /// <summary> /// å è£ ç¼ç /// </summary> [SugarColumn(ColumnName = "Info9", ColumnDescription = "å è£ ç¼ç ", Length = 60)] public string? Info9 { get; set; } /// <summary> /// èªæoråè´§ /// </summary> LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/PrintCenter/WmsRecordPrint/WmsRecordPrintService.cs
@@ -133,7 +133,6 @@ || u.Info7.Contains(input.SearchKey.Trim()) || u.Info8.Contains(input.SearchKey.Trim()) || u.Info10.Contains(input.SearchKey.Trim()) || u.Info9.Contains(input.SearchKey.Trim()) || u.Info11.Contains(input.SearchKey.Trim()) || u.Info12.Contains(input.SearchKey.Trim()) || u.Info13.Contains(input.SearchKey.Trim()) @@ -152,7 +151,6 @@ .WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info8), u => u.Info8.Contains(input.Info8.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info10), u => u.Info10.Contains(input.Info10.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info9), u => u.Info9.Contains(input.Info9.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim())) LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/GetBatchOrderUPIInput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,189 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace Admin.NET.Application.Service.WmsOrder.Mes_BatchOrderUPI_New.Dto; public class GetBatchOrderUPIInput { [Required] [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "æ¹æ¬¡å·", Length = 50)] public string PlanNo { get; set; } [Required] [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订åå·", Length = 50)] public string OrderId { get; set; } [Required] [SugarColumn(ColumnName = "UPI", ColumnDescription = "é¨ä»¶æ¡ç ", Length = 50)] public string UPI { get; set; } [Required] [SugarColumn(ColumnName = "DetailName", ColumnDescription = "é¨ä»¶åç§°", Length = 50)] public string DetailName { get; set; } [SugarColumn(ColumnName = "Length", ColumnDescription = "é¿")] public float Length { get; set; } [SugarColumn(ColumnName = "Width", ColumnDescription = "宽")] public float Width { get; set; } [SugarColumn(ColumnName = "Thk", ColumnDescription = "å")] public float Thk { get; set; } [SugarColumn(ColumnName = "Matgrid", ColumnDescription = "é¨ä»¶çº¹ç", Length = 50)] public string? Matgrid { get; set; } [SugarColumn(ColumnName = "IsEB", ColumnDescription = "æ¯å¦å°è¾¹")] public int? IsEB { get; set; } /// <summary> /// æå设å¤ç¼å· ãEditBy shaocx,2022-05-28ã /// 0ï¼ä¸æå /// 1ï¼åé¢é» /// 2ï¼è±ªè¿å é¢é» /// 5ï¼åå ´å é¢é» /// </summary> [SugarColumn(ColumnName = "DRNum", ColumnDescription = "æå设å¤ç¼å·")] public int? DRNum { get; set; } [SugarColumn(ColumnName = "IsPA", ColumnDescription = "æ¯å¦ä¼åå è£ ")] public int? IsPA { get; set; } /// <summary> /// é¯åå¾å· /// </summary> [SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "é¯åå¾å·")] public int? MaterialIndeX { get; set; } #region å è£ çº¿æå ³ [Required] [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "å è£ å·", Length = 50)] public string PackageCode { get; set; } [Required] [SugarColumn(ColumnName = "MachineXCenter", ColumnDescription = "å è£ Xåæ ", Length = 50)] public float? MachineXCenter { get; set; } [Required] [SugarColumn(ColumnName = "MachineYCenter", ColumnDescription = "å è£ Yåæ ", Length = 50)] public float? MachineYCenter { get; set; } [Required] [SugarColumn(ColumnName = "MachineZCenter", ColumnDescription = "å è£ Zåæ ", Length = 50)] public float? MachineZCenter { get; set; } [Required] [SugarColumn(ColumnName = "Sequence", ColumnDescription = "屿°", Length = 50)] public int? Sequence { get; set; } [Required] [SugarColumn(ColumnName = "Shelf", ColumnDescription = "次åº", Length = 50)] public int? Shelf { get; set; } #endregion /// <summary> /// æ¯å¦è½¬å /// 0ï¼ä¸è½¬å /// 1ï¼è½¬å /// ç®ååªæåé¢é»æè½è½¬å /// </summary> [Required] [SugarColumn(ColumnName = "Rotation", ColumnDescription = "转åè§åº¦", Length = 50)] public float? Rotation { get; set; } [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱é¿", Length = 50)] public float? Info1 { get; set; } [SugarColumn(ColumnName = "Info2", ColumnDescription = "纸箱宽", Length = 50)] public float? Info2 { get; set; } [SugarColumn(ColumnName = "Info3", ColumnDescription = "纸箱é«", Length = 50)] public float? Info3 { get; set; } /// <summary> /// éå®åååå· /// </summary> [SugarColumn(ColumnName = "Info4", ColumnDescription = "éå®åååå·", Length = 60)] public string? Info4 { get; set; } /// <summary> /// ç产åå· /// </summary> [SugarColumn(ColumnName = "Info5", ColumnDescription = "ç产åå·", Length = 60)] public string? Info5 { get; set; } /// <summary> /// 第å å /// </summary> [SugarColumn(ColumnName = "Info6", ColumnDescription = "第å å ", Length = 60)] public string? Info6 { get; set; } /// <summary> /// ç»éåºåç§° /// </summary> [SugarColumn(ColumnName = "Info7", ColumnDescription = "ç»éåºåç§°", Length = 60)] public string? Info7 { get; set; } /// <summary> /// 产ååç§° /// </summary> [SugarColumn(ColumnName = "Info8", ColumnDescription = "产ååç§°", Length = 60)] public string? Info8 { get; set; } /// <summary> /// 客æ·åç§° /// </summary> [SugarColumn(ColumnName = "Info10", ColumnDescription = "客æ·åç§°", Length = 60)] public string? Info10 { get; set; } /// <summary> /// å è£ ç¼ç /// </summary> [SugarColumn(ColumnName = "Info9", ColumnDescription = "å è£ ç¼ç ", Length = 60)] public string? Info9 { get; set; } /// <summary> /// èªæoråè´§ /// </summary> [SugarColumn(ColumnName = "Info11", ColumnDescription = "èªæoråè´§", Length = 60)] public string? Info11 { get; set; } /// <summary> /// å è£ é¨ä»¶æ»æ°é /// </summary> [SugarColumn(ColumnName = "Info12", ColumnDescription = "å è£ é¨ä»¶æ»æ°é", Length = 60)] public string? Info12 { get; set; } /// <summary> /// å è£ é¢ç§¯ /// </summary> [SugarColumn(ColumnName = "Info13", ColumnDescription = "å è£ é¢ç§¯", Length = 60)] public string? Info13 { get; set; } /// <summary> /// é¨ä»¶åç§° /// </summary> [SugarColumn(ColumnName = "Info14", ColumnDescription = "é¨ä»¶åç§°", Length = 60)] public string? Info14 { get; set; } /// <summary> /// é¨ä»¶æ°é /// </summary> [SugarColumn(ColumnName = "Info15", ColumnDescription = "é¨ä»¶æ°é")] public int? Info15 { get; set; } /// <summary> /// é¨ä»¶å°ºå¯¸ /// </summary> [SugarColumn(ColumnName = "Info16", ColumnDescription = "é¨ä»¶å°ºå¯¸", Length = 60)] public string? Info16 { get; set; } } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
@@ -129,6 +129,71 @@ public virtual float? Info3 { get; set; } /// <summary> /// éå®åååå· /// </summary> public virtual string Info4 { get; set; } /// <summary> /// ç产åå· /// </summary> public virtual string Info5 { get; set; } /// <summary> /// 第å å /// </summary> public virtual string Info6 { get; set; } /// <summary> /// ç»éåºåç§° /// </summary> public virtual string Info7 { get; set; } /// <summary> /// 产ååç§° /// </summary> public virtual string Info8 { get; set; } /// <summary> /// 客æ·åç§° /// </summary> public virtual string Info10 { get; set; } /// <summary> /// å è£ ç¼ç /// </summary> public virtual string Info9 { get; set; } /// <summary> /// èªæoråè´§ /// </summary> public virtual string Info11 { get; set; } /// <summary> /// å è£ é¨ä»¶æ»æ°é /// </summary> public virtual string Info12 { get; set; } /// <summary> /// å è£ é¢ç§¯ /// </summary> public virtual string Info13 { get; set; } /// <summary> /// é¨ä»¶åç§° /// </summary> public virtual string Info14 { get; set; } /// <summary> /// é¨ä»¶æ°é /// </summary> public virtual int? Info15 { get; set; } /// <summary> /// é¨ä»¶å°ºå¯¸ /// </summary> public virtual string Info16 { get; set; } /// <summary> /// å建æ¶é´ /// </summary> public virtual DateTime? CreateTime { get; set; } @@ -295,6 +360,71 @@ /// </summary> public float? Info3 { get; set; } /// <summary> /// éå®åååå· /// </summary> public string? Info4 { get; set; } /// <summary> /// ç产åå· /// </summary> public string? Info5 { get; set; } /// <summary> /// 第å å /// </summary> public string? Info6 { get; set; } /// <summary> /// ç»éåºåç§° /// </summary> public string? Info7 { get; set; } /// <summary> /// 产ååç§° /// </summary> public string? Info8 { get; set; } /// <summary> /// 客æ·åç§° /// </summary> public string? Info10 { get; set; } /// <summary> /// å è£ ç¼ç /// </summary> public string? Info9 { get; set; } /// <summary> /// èªæoråè´§ /// </summary> public string? Info11 { get; set; } /// <summary> /// å è£ é¨ä»¶æ»æ°é /// </summary> public string? Info12 { get; set; } /// <summary> /// å è£ é¢ç§¯ /// </summary> public string? Info13 { get; set; } /// <summary> /// é¨ä»¶åç§° /// </summary> public string? Info14 { get; set; } /// <summary> /// é¨ä»¶æ°é /// </summary> public int? Info15 { get; set; } /// <summary> /// é¨ä»¶å°ºå¯¸ /// </summary> public string? Info16 { get; set; } } /// <summary> @@ -391,186 +521,3 @@ { } public class GetBatchOrderUPIInput { [Required] [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "æ¹æ¬¡å·", Length = 50)] public string PlanNo { get; set; } [Required] [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订åå·", Length = 50)] public string OrderId { get; set; } [Required] [SugarColumn(ColumnName = "UPI", ColumnDescription = "é¨ä»¶æ¡ç ", Length = 50)] public string UPI { get; set; } [Required] [SugarColumn(ColumnName = "DetailName", ColumnDescription = "é¨ä»¶åç§°", Length = 50)] public string DetailName { get; set; } [SugarColumn(ColumnName = "Length", ColumnDescription = "é¿")] public float Length { get; set; } [SugarColumn(ColumnName = "Width", ColumnDescription = "宽")] public float Width { get; set; } [SugarColumn(ColumnName = "Thk", ColumnDescription = "å")] public float Thk { get; set; } [SugarColumn(ColumnName = "Matgrid", ColumnDescription = "é¨ä»¶çº¹ç", Length = 50)] public string? Matgrid { get; set; } [SugarColumn(ColumnName = "IsEB", ColumnDescription = "æ¯å¦å°è¾¹")] public int? IsEB { get; set; } /// <summary> /// æå设å¤ç¼å· ãEditBy shaocx,2022-05-28ã /// 0ï¼ä¸æå /// 1ï¼åé¢é» /// 2ï¼è±ªè¿å é¢é» /// 5ï¼åå ´å é¢é» /// </summary> [SugarColumn(ColumnName = "DRNum", ColumnDescription = "æå设å¤ç¼å·")] public int? DRNum { get; set; } [SugarColumn(ColumnName = "IsPA", ColumnDescription = "æ¯å¦ä¼åå è£ ")] public int? IsPA { get; set; } /// <summary> /// é¯åå¾å· /// </summary> [SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "é¯åå¾å·")] public int? MaterialIndeX { get; set; } #region å è£ çº¿æå ³ [Required] [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "å è£ å·", Length = 50)] public string PackageCode { get; set; } [Required] [SugarColumn(ColumnName = "MachineXCenter", ColumnDescription = "å è£ Xåæ ", Length = 50)] public float? MachineXCenter { get; set; } [Required] [SugarColumn(ColumnName = "MachineYCenter", ColumnDescription = "å è£ Yåæ ", Length = 50)] public float? MachineYCenter { get; set; } [Required] [SugarColumn(ColumnName = "MachineZCenter", ColumnDescription = "å è£ Zåæ ", Length = 50)] public float? MachineZCenter { get; set; } [Required] [SugarColumn(ColumnName = "Sequence", ColumnDescription = "屿°", Length = 50)] public int? Sequence { get; set; } [Required] [SugarColumn(ColumnName = "Shelf", ColumnDescription = "次åº", Length = 50)] public int? Shelf { get; set; } #endregion /// <summary> /// æ¯å¦è½¬å /// 0ï¼ä¸è½¬å /// 1ï¼è½¬å /// ç®ååªæåé¢é»æè½è½¬å /// </summary> [Required] [SugarColumn(ColumnName = "Rotation", ColumnDescription = "转åè§åº¦", Length = 50)] public float? Rotation { get; set; } [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱é¿", Length = 50)] public float? Info1 { get; set; } [SugarColumn(ColumnName = "Info2", ColumnDescription = "纸箱宽", Length = 50)] public float? Info2 { get; set; } [SugarColumn(ColumnName = "Info3", ColumnDescription = "纸箱é«", Length = 50)] public float? Info3 { get; set; } /// <summary> /// éå®åååå· /// </summary> [SugarColumn(ColumnName = "Info4", ColumnDescription = "éå®åååå·", Length = 60)] public string? Info4 { get; set; } /// <summary> /// ç产åå· /// </summary> [SugarColumn(ColumnName = "Info5", ColumnDescription = "ç产åå·", Length = 60)] public string? Info5 { get; set; } /// <summary> /// 第å å /// </summary> [SugarColumn(ColumnName = "Info6", ColumnDescription = "第å å ", Length = 60)] public string? Info6 { get; set; } /// <summary> /// ç»éåºåç§° /// </summary> [SugarColumn(ColumnName = "Info7", ColumnDescription = "ç»éåºåç§°", Length = 60)] public string? Info7 { get; set; } /// <summary> /// 产ååç§° /// </summary> [SugarColumn(ColumnName = "Info8", ColumnDescription = "产ååç§°", Length = 60)] public string? Info8 { get; set; } /// <summary> /// 客æ·åç§° /// </summary> [SugarColumn(ColumnName = "Info10", ColumnDescription = "客æ·åç§°", Length = 60)] public string? Info10 { get; set; } /// <summary> /// å è£ ç¼ç /// </summary> [SugarColumn(ColumnName = "Info9", ColumnDescription = "å è£ ç¼ç ", Length = 60)] public string? Info9 { get; set; } /// <summary> /// èªæoråè´§ /// </summary> [SugarColumn(ColumnName = "Info11", ColumnDescription = "èªæoråè´§", Length = 60)] public string? Info11 { get; set; } /// <summary> /// å è£ é¨ä»¶æ»æ°é /// </summary> [SugarColumn(ColumnName = "Info12", ColumnDescription = "å è£ é¨ä»¶æ»æ°é", Length = 60)] public string? Info12 { get; set; } /// <summary> /// å è£ é¢ç§¯ /// </summary> [SugarColumn(ColumnName = "Info13", ColumnDescription = "å è£ é¢ç§¯", Length = 60)] public string? Info13 { get; set; } /// <summary> /// é¨ä»¶åç§° /// </summary> [SugarColumn(ColumnName = "Info14", ColumnDescription = "é¨ä»¶åç§°", Length = 60)] public string? Info14 { get; set; } /// <summary> /// é¨ä»¶æ°é /// </summary> [SugarColumn(ColumnName = "Info15", ColumnDescription = "é¨ä»¶æ°é")] public int? Info15 { get; set; } /// <summary> /// é¨ä»¶å°ºå¯¸ /// </summary> [SugarColumn(ColumnName = "Info16", ColumnDescription = "é¨ä»¶å°ºå¯¸", Length = 60)] public string? Info16 { get; set; } } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs
@@ -131,6 +131,71 @@ public float? Info3 { get; set; } /// <summary> /// éå®åååå· /// </summary> public string Info4 { get; set; } /// <summary> /// ç产åå· /// </summary> public string Info5 { get; set; } /// <summary> /// 第å å /// </summary> public string Info6 { get; set; } /// <summary> /// ç»éåºåç§° /// </summary> public string Info7 { get; set; } /// <summary> /// 产ååç§° /// </summary> public string Info8 { get; set; } /// <summary> /// 客æ·åç§° /// </summary> public string Info10 { get; set; } /// <summary> /// å è£ ç¼ç /// </summary> public string Info9 { get; set; } /// <summary> /// èªæoråè´§ /// </summary> public string Info11 { get; set; } /// <summary> /// å è£ é¨ä»¶æ»æ°é /// </summary> public string Info12 { get; set; } /// <summary> /// å è£ é¢ç§¯ /// </summary> public string Info13 { get; set; } /// <summary> /// é¨ä»¶åç§° /// </summary> public string Info14 { get; set; } /// <summary> /// é¨ä»¶æ°é /// </summary> public int? Info15 { get; set; } /// <summary> /// é¨ä»¶å°ºå¯¸ /// </summary> public string Info16 { get; set; } /// <summary> /// å建æ¶é´ /// </summary> public DateTime? CreateTime { get; set; } LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs
@@ -5,7 +5,7 @@ using System.Web; using System.Text; using Furion.DatabaseAccessor; using Mapster; using Admin.NET.Application.Service.WmsOrder.Mes_BatchOrderUPI_New.Dto; namespace Admin.NET.Application; /// <summary> @@ -95,7 +95,7 @@ var entity = input.Adapt<Mes_BatchOrderUPI_New>(); //é夿§éªè¯ await CheckExist(entity, true); await CheckExist(entity,true); await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); } @@ -113,28 +113,12 @@ return await _rep.GetFirstAsync(u => u.Id == input.Id); } [HttpPost] [ApiDescriptionSettings(Name = "GetBatchOrderUPIList")] [UnitOfWork] [AllowAnonymous] public async Task GetBatchOrderUPIList(List<GetBatchOrderUPIInput> input) { List<Mes_BatchOrderUPI_New> list = new List<Mes_BatchOrderUPI_New>(); foreach (var item in input) { Mes_BatchOrderUPI_New task = new Mes_BatchOrderUPI_New(); task = item.Adapt<Mes_BatchOrderUPI_New>(); task.AreaCode = AreaCodeEnum.æ åºå; task.UpiStatus = UpiStatusEnum.åå§; list.Add(task); } await _rep.InsertRangeAsync(list); } #region å¯¼å ¥ /// <summary> /// Excel模æ¿å¯¼å ¥æ¹æ¬¡æ°æ®åè½ /// </summary> @@ -144,15 +128,15 @@ [ApiDescriptionSettings(Name = "ImportExcel")] [Description("Mes_BatchOrderUPI_New/ImportExcel")] public async Task<int> ImportExcelAsync(IFormFile file) { { int _HeadStartLine = 2;//第1è¡æ¯è¯´æ,第2è¡æ¯åå int _DataStartLine = 3;//第3è¡å¼å§æ¯æ°æ® DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine); var addList = await CommonImport(importDataTable, _DataStartLine); var addList =await CommonImport(importDataTable, _DataStartLine); await _rep.InsertRangeAsync(addList); return addList.Count; } /// <summary> /// DataTable转æ¢å®ä½å¯¹è±¡å表 /// </summary> @@ -167,309 +151,373 @@ { index++; //å¯¼å ¥æ¨¡çå®å¶å代ç ï¼æ¿æ¢æ¨¡ç使ç¨ï¼ var addItem = new Mes_BatchOrderUPI_New(); #region å®ä¹åé var _AreaCode = "";//æå¨åºå var _UpiStatus = "";//æ¿æç¶æ var _PlanNo = "";//æ¹æ¬¡å· var _OrderId = "";//订åå· var _UPI = "";//é¨ä»¶æ¡ç var _DetailName = "";//é¨ä»¶åç§° var _Length = "";//é¿ var _Width = "";//宽 var _Thk = "";//å var _Matgrid = "";//é¨ä»¶çº¹ç var _IsEB = "";//æ¯å¦å°è¾¹ var _DRNum = "";//æå设å¤ç¼å· var _IsPA = "";//æ¯å¦ä¼åå è£ var _MaterialIndeX = "";//é¯åå¾å· var _PackageCode = "";//å è£ å· var _MachineXCenter = "";//å è£ Xåæ var _MachineYCenter = "";//å è£ Yåæ var _MachineZCenter = "";//å è£ Zåæ var _Sequence = "";//屿° var _Shelf = "";//æ¬¡åº var _Rotation = "";//转åè§åº¦ var _Info1 = "";//çº¸ç®±é¿ var _Info2 = "";//纸箱宽 var _Info3 = "";//çº¸ç®±é« #endregion #region åå¼ _AreaCode = row["æå¨åºå"]?.ToString(); _UpiStatus = row["æ¿æç¶æ"]?.ToString(); _PlanNo = row["æ¹æ¬¡å·"]?.ToString(); _OrderId = row["订åå·"]?.ToString(); _UPI = row["é¨ä»¶æ¡ç "]?.ToString(); _DetailName = row["é¨ä»¶åç§°"]?.ToString(); _Length = row["é¿"]?.ToString(); _Width = row["宽"]?.ToString(); _Thk = row["å"]?.ToString(); _Matgrid = row["é¨ä»¶çº¹ç"]?.ToString(); _IsEB = row["æ¯å¦å°è¾¹"]?.ToString(); _DRNum = row["æå设å¤ç¼å·"]?.ToString(); _IsPA = row["æ¯å¦ä¼åå è£ "]?.ToString(); _MaterialIndeX = row["é¯åå¾å·"]?.ToString(); _PackageCode = row["å è£ å·"]?.ToString(); _MachineXCenter = row["å è£ Xåæ "]?.ToString(); _MachineYCenter = row["å è£ Yåæ "]?.ToString(); _MachineZCenter = row["å è£ Zåæ "]?.ToString(); _Sequence = row["屿°"]?.ToString(); _Shelf = row["次åº"]?.ToString(); _Rotation = row["转åè§åº¦"]?.ToString(); _Info1 = row["纸箱é¿"]?.ToString(); _Info2 = row["纸箱宽"]?.ToString(); _Info3 = row["纸箱é«"]?.ToString(); #endregion #region éªè¯ if (!string.IsNullOrEmpty(_AreaCode)) { Admin.NET.Application.AreaCodeEnum enumAreaCode = default(Admin.NET.Application.AreaCodeEnum); if (!Enum.TryParse<Admin.NET.Application.AreaCodeEnum>(_AreaCode, out enumAreaCode) && !string.IsNullOrEmpty(_AreaCode)) { throw Oops.Oh($"第{index}è¡[æå¨åºå]{_AreaCode}å¼ä¸æ£ç¡®ï¼"); } else { addItem.AreaCode = enumAreaCode; } } if (string.IsNullOrEmpty(_UpiStatus)) { throw Oops.Oh($"第{index}è¡[æ¿æç¶æ]{_UpiStatus}ä¸è½ä¸ºç©ºï¼"); } if (!string.IsNullOrEmpty(_UpiStatus)) { Admin.NET.Application.UpiStatusEnum enumUpiStatus = default(Admin.NET.Application.UpiStatusEnum); if (!Enum.TryParse<Admin.NET.Application.UpiStatusEnum>(_UpiStatus, out enumUpiStatus) && !string.IsNullOrEmpty(_UpiStatus)) { throw Oops.Oh($"第{index}è¡[æ¿æç¶æ]{_UpiStatus}å¼ä¸æ£ç¡®ï¼"); } else { addItem.UpiStatus = enumUpiStatus; } } if (string.IsNullOrEmpty(_PlanNo)) { throw Oops.Oh($"第{index}è¡[æ¹æ¬¡å·]{_PlanNo}ä¸è½ä¸ºç©ºï¼"); } if (!string.IsNullOrEmpty(_PlanNo)) { addItem.PlanNo = (string)(_PlanNo.Trim()); } if (string.IsNullOrEmpty(_OrderId)) { throw Oops.Oh($"第{index}è¡[订åå·]{_OrderId}ä¸è½ä¸ºç©ºï¼"); } if (!string.IsNullOrEmpty(_OrderId)) { addItem.OrderId = (string)(_OrderId.Trim()); } if (string.IsNullOrEmpty(_UPI)) { throw Oops.Oh($"第{index}è¡[é¨ä»¶æ¡ç ]{_UPI}ä¸è½ä¸ºç©ºï¼"); } if (!string.IsNullOrEmpty(_UPI)) { addItem.UPI = (string)(_UPI.Trim()); } if (string.IsNullOrEmpty(_DetailName)) { throw Oops.Oh($"第{index}è¡[é¨ä»¶åç§°]{_DetailName}ä¸è½ä¸ºç©ºï¼"); } if (!string.IsNullOrEmpty(_DetailName)) { addItem.DetailName = (string)(_DetailName.Trim()); } if (string.IsNullOrEmpty(_Length)) { throw Oops.Oh($"第{index}è¡[é¿]{_Length}ä¸è½ä¸ºç©ºï¼"); } //if(!string.IsNullOrEmpty(_Length)) //{ // addItem.Length = (float)(_Length.Trim()); // } //if (string.IsNullOrEmpty(_Width)) //{ // throw Oops.Oh($"第{index}è¡[宽]{_Width}ä¸è½ä¸ºç©ºï¼"); //} //if(!string.IsNullOrEmpty(_Width)) //{ // addItem.Width = (float)(_Width.Trim()); // } //if (string.IsNullOrEmpty(_Thk)) //{ // throw Oops.Oh($"第{index}è¡[å]{_Thk}ä¸è½ä¸ºç©ºï¼"); //} //if(!string.IsNullOrEmpty(_Thk)) //{ // addItem.Thk = (float)(_Thk.Trim()); // } if (!string.IsNullOrEmpty(_Matgrid)) { addItem.Matgrid = (string)(_Matgrid.Trim()); } if (!string.IsNullOrEmpty(_IsEB)) { if (!int.TryParse(_IsEB, out int outIsEB) && !string.IsNullOrEmpty(_IsEB)) { throw Oops.Oh($"第{index}è¡[æ¯å¦å°è¾¹]{_IsEB}å¼ä¸æ£ç¡®ï¼"); } if (outIsEB <= 0 && !string.IsNullOrEmpty(_IsEB)) { throw Oops.Oh($"第{index}è¡[æ¯å¦å°è¾¹]{_IsEB}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.IsEB = outIsEB; } } if (!string.IsNullOrEmpty(_DRNum)) { if (!int.TryParse(_DRNum, out int outDRNum) && !string.IsNullOrEmpty(_DRNum)) { throw Oops.Oh($"第{index}è¡[æå设å¤ç¼å·]{_DRNum}å¼ä¸æ£ç¡®ï¼"); } if (outDRNum <= 0 && !string.IsNullOrEmpty(_DRNum)) { throw Oops.Oh($"第{index}è¡[æå设å¤ç¼å·]{_DRNum}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.DRNum = outDRNum; } } if (!string.IsNullOrEmpty(_IsPA)) { if (!int.TryParse(_IsPA, out int outIsPA) && !string.IsNullOrEmpty(_IsPA)) { throw Oops.Oh($"第{index}è¡[æ¯å¦ä¼åå è£ ]{_IsPA}å¼ä¸æ£ç¡®ï¼"); } if (outIsPA <= 0 && !string.IsNullOrEmpty(_IsPA)) { throw Oops.Oh($"第{index}è¡[æ¯å¦ä¼åå è£ ]{_IsPA}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.IsPA = outIsPA; } } if (!string.IsNullOrEmpty(_MaterialIndeX)) { if (!int.TryParse(_MaterialIndeX, out int outMaterialIndeX) && !string.IsNullOrEmpty(_MaterialIndeX)) { throw Oops.Oh($"第{index}è¡[é¯åå¾å·]{_MaterialIndeX}å¼ä¸æ£ç¡®ï¼"); } if (outMaterialIndeX <= 0 && !string.IsNullOrEmpty(_MaterialIndeX)) { throw Oops.Oh($"第{index}è¡[é¯åå¾å·]{_MaterialIndeX}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.MaterialIndeX = outMaterialIndeX; } } if (string.IsNullOrEmpty(_PackageCode)) { throw Oops.Oh($"第{index}è¡[å è£ å·]{_PackageCode}ä¸è½ä¸ºç©ºï¼"); } if (!string.IsNullOrEmpty(_PackageCode)) { addItem.PackageCode = (string)(_PackageCode.Trim()); } //if(!string.IsNullOrEmpty(_MachineXCenter)) //{ // addItem.MachineXCenter = (float)(_MachineXCenter.Trim()); // } //if(!string.IsNullOrEmpty(_MachineYCenter)) //{ // addItem.MachineYCenter = (float)(_MachineYCenter.Trim()); // } //if(!string.IsNullOrEmpty(_MachineZCenter)) //{ // addItem.MachineZCenter = (float)(_MachineZCenter.Trim()); // } if (!string.IsNullOrEmpty(_Sequence)) { if (!int.TryParse(_Sequence, out int outSequence) && !string.IsNullOrEmpty(_Sequence)) { throw Oops.Oh($"第{index}è¡[屿°]{_Sequence}å¼ä¸æ£ç¡®ï¼"); } if (outSequence <= 0 && !string.IsNullOrEmpty(_Sequence)) { throw Oops.Oh($"第{index}è¡[屿°]{_Sequence}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.Sequence = outSequence; } } if (!string.IsNullOrEmpty(_Shelf)) { if (!int.TryParse(_Shelf, out int outShelf) && !string.IsNullOrEmpty(_Shelf)) { throw Oops.Oh($"第{index}è¡[次åº]{_Shelf}å¼ä¸æ£ç¡®ï¼"); } if (outShelf <= 0 && !string.IsNullOrEmpty(_Shelf)) { throw Oops.Oh($"第{index}è¡[次åº]{_Shelf}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.Shelf = outShelf; } } //if(!string.IsNullOrEmpty(_Rotation)) //{ // addItem.Rotation = (float)(_Rotation.Trim()); // } //if(!string.IsNullOrEmpty(_Info1)) //{ // addItem.Info1 = (float)(_Info1.Trim()); // } //if(!string.IsNullOrEmpty(_Info2)) //{ // addItem.Info2 = (float)(_Info2.Trim()); // } //if(!string.IsNullOrEmpty(_Info3)) //{ // addItem.Info3 = (float)(_Info3.Trim()); // } #endregion var addItem = new Mes_BatchOrderUPI_New(); #region å®ä¹åé var _AreaCode = "";//æå¨åºå var _UpiStatus = "";//æ¿æç¶æ var _PlanNo = "";//æ¹æ¬¡å· var _OrderId = "";//订åå· var _UPI = "";//é¨ä»¶æ¡ç var _DetailName = "";//é¨ä»¶åç§° var _Length = "";//é¿ var _Width = "";//宽 var _Thk = "";//å var _Matgrid = "";//é¨ä»¶çº¹ç var _IsEB = "";//æ¯å¦å°è¾¹ var _DRNum = "";//æå设å¤ç¼å· var _IsPA = "";//æ¯å¦ä¼åå è£ var _MaterialIndeX = "";//é¯åå¾å· var _PackageCode = "";//å è£ å· var _MachineXCenter = "";//å è£ Xåæ var _MachineYCenter = "";//å è£ Yåæ var _MachineZCenter = "";//å è£ Zåæ var _Sequence = "";//屿° var _Shelf = "";//æ¬¡åº var _Rotation = "";//转åè§åº¦ var _Info1 = "";//çº¸ç®±é¿ var _Info2 = "";//纸箱宽 var _Info3 = "";//çº¸ç®±é« var _Info4 = "";//éå®åååå· var _Info5 = "";//ç产åå· var _Info6 = "";//第å å var _Info7 = "";//ç»éåºåç§° var _Info8 = "";//产ååç§° var _Info10 = "";//客æ·åç§° var _Info9 = "";//å è£ ç¼ç var _Info11 = "";//èªæoråè´§ var _Info12 = "";//å è£ é¨ä»¶æ»æ°é var _Info13 = "";//å è£ é¢ç§¯ var _Info14 = "";//é¨ä»¶åç§° var _Info15 = "";//é¨ä»¶æ°é var _Info16 = "";//é¨ä»¶å°ºå¯¸ #endregion #region åå¼ _AreaCode = row["æå¨åºå"]?.ToString() ; _UpiStatus = row["æ¿æç¶æ"]?.ToString() ; _PlanNo = row["æ¹æ¬¡å·"]?.ToString() ; _OrderId = row["订åå·"]?.ToString() ; _UPI = row["é¨ä»¶æ¡ç "]?.ToString() ; _DetailName = row["é¨ä»¶åç§°"]?.ToString() ; _Length = row["é¿"]?.ToString() ; _Width = row["宽"]?.ToString() ; _Thk = row["å"]?.ToString() ; _Matgrid = row["é¨ä»¶çº¹ç"]?.ToString() ; _IsEB = row["æ¯å¦å°è¾¹"]?.ToString() ; _DRNum = row["æå设å¤ç¼å·"]?.ToString() ; _IsPA = row["æ¯å¦ä¼åå è£ "]?.ToString() ; _MaterialIndeX = row["é¯åå¾å·"]?.ToString() ; _PackageCode = row["å è£ å·"]?.ToString() ; _MachineXCenter = row["å è£ Xåæ "]?.ToString() ; _MachineYCenter = row["å è£ Yåæ "]?.ToString() ; _MachineZCenter = row["å è£ Zåæ "]?.ToString() ; _Sequence = row["屿°"]?.ToString() ; _Shelf = row["次åº"]?.ToString() ; _Rotation = row["转åè§åº¦"]?.ToString() ; _Info1 = row["纸箱é¿"]?.ToString() ; _Info2 = row["纸箱宽"]?.ToString() ; _Info3 = row["纸箱é«"]?.ToString() ; _Info4 = row["éå®åååå·"]?.ToString() ; _Info5 = row["ç产åå·"]?.ToString() ; _Info6 = row["第å å "]?.ToString() ; _Info7 = row["ç»éåºåç§°"]?.ToString() ; _Info8 = row["产ååç§°"]?.ToString() ; _Info10 = row["客æ·åç§°"]?.ToString() ; _Info9 = row["å è£ ç¼ç "]?.ToString() ; _Info11 = row["èªæoråè´§"]?.ToString() ; _Info12 = row["å è£ é¨ä»¶æ»æ°é"]?.ToString() ; _Info13 = row["å è£ é¢ç§¯"]?.ToString() ; _Info14 = row["é¨ä»¶åç§°"]?.ToString() ; _Info15 = row["é¨ä»¶æ°é"]?.ToString() ; _Info16 = row["é¨ä»¶å°ºå¯¸"]?.ToString() ; #endregion #region éªè¯ if(!string.IsNullOrEmpty(_AreaCode)) { Admin.NET.Application.AreaCodeEnum enumAreaCode = default(Admin.NET.Application.AreaCodeEnum); if(!Enum.TryParse<Admin.NET.Application.AreaCodeEnum>(_AreaCode, out enumAreaCode)&&!string.IsNullOrEmpty(_AreaCode)) { throw Oops.Oh($"第{index}è¡[æå¨åºå]{_AreaCode}å¼ä¸æ£ç¡®ï¼"); } else { addItem.AreaCode = enumAreaCode; } } if (string.IsNullOrEmpty(_UpiStatus)) { throw Oops.Oh($"第{index}è¡[æ¿æç¶æ]{_UpiStatus}ä¸è½ä¸ºç©ºï¼"); } if(!string.IsNullOrEmpty(_UpiStatus)) { Admin.NET.Application.UpiStatusEnum enumUpiStatus = default(Admin.NET.Application.UpiStatusEnum); if(!Enum.TryParse<Admin.NET.Application.UpiStatusEnum>(_UpiStatus, out enumUpiStatus)&&!string.IsNullOrEmpty(_UpiStatus)) { throw Oops.Oh($"第{index}è¡[æ¿æç¶æ]{_UpiStatus}å¼ä¸æ£ç¡®ï¼"); } else { addItem.UpiStatus = enumUpiStatus; } } if (string.IsNullOrEmpty(_PlanNo)) { throw Oops.Oh($"第{index}è¡[æ¹æ¬¡å·]{_PlanNo}ä¸è½ä¸ºç©ºï¼"); } if(!string.IsNullOrEmpty(_PlanNo)) { addItem.PlanNo = (string)(_PlanNo.Trim()); } if (string.IsNullOrEmpty(_OrderId)) { throw Oops.Oh($"第{index}è¡[订åå·]{_OrderId}ä¸è½ä¸ºç©ºï¼"); } if(!string.IsNullOrEmpty(_OrderId)) { addItem.OrderId = (string)(_OrderId.Trim()); } if (string.IsNullOrEmpty(_UPI)) { throw Oops.Oh($"第{index}è¡[é¨ä»¶æ¡ç ]{_UPI}ä¸è½ä¸ºç©ºï¼"); } if(!string.IsNullOrEmpty(_UPI)) { addItem.UPI = (string)(_UPI.Trim()); } if (string.IsNullOrEmpty(_DetailName)) { throw Oops.Oh($"第{index}è¡[é¨ä»¶åç§°]{_DetailName}ä¸è½ä¸ºç©ºï¼"); } if(!string.IsNullOrEmpty(_DetailName)) { addItem.DetailName = (string)(_DetailName.Trim()); } if (string.IsNullOrEmpty(_Length)) { throw Oops.Oh($"第{index}è¡[é¿]{_Length}ä¸è½ä¸ºç©ºï¼"); } //if(!string.IsNullOrEmpty(_Length)) //{ // addItem.Length = (float)(_Length.Trim()); // } //if (string.IsNullOrEmpty(_Width)) //{ // throw Oops.Oh($"第{index}è¡[宽]{_Width}ä¸è½ä¸ºç©ºï¼"); //} //if(!string.IsNullOrEmpty(_Width)) //{ // addItem.Width = (float)(_Width.Trim()); // } //if (string.IsNullOrEmpty(_Thk)) //{ // throw Oops.Oh($"第{index}è¡[å]{_Thk}ä¸è½ä¸ºç©ºï¼"); //} //if(!string.IsNullOrEmpty(_Thk)) //{ // addItem.Thk = (float)(_Thk.Trim()); // } if(!string.IsNullOrEmpty(_Matgrid)) { addItem.Matgrid = (string)(_Matgrid.Trim()); } if(!string.IsNullOrEmpty(_IsEB)) { if (!int.TryParse(_IsEB, out int outIsEB)&&!string.IsNullOrEmpty(_IsEB)) { throw Oops.Oh($"第{index}è¡[æ¯å¦å°è¾¹]{_IsEB}å¼ä¸æ£ç¡®ï¼"); } if (outIsEB <= 0&&!string.IsNullOrEmpty(_IsEB)) { throw Oops.Oh($"第{index}è¡[æ¯å¦å°è¾¹]{_IsEB}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.IsEB = outIsEB; } } if(!string.IsNullOrEmpty(_DRNum)) { if (!int.TryParse(_DRNum, out int outDRNum)&&!string.IsNullOrEmpty(_DRNum)) { throw Oops.Oh($"第{index}è¡[æå设å¤ç¼å·]{_DRNum}å¼ä¸æ£ç¡®ï¼"); } if (outDRNum <= 0&&!string.IsNullOrEmpty(_DRNum)) { throw Oops.Oh($"第{index}è¡[æå设å¤ç¼å·]{_DRNum}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.DRNum = outDRNum; } } if(!string.IsNullOrEmpty(_IsPA)) { if (!int.TryParse(_IsPA, out int outIsPA)&&!string.IsNullOrEmpty(_IsPA)) { throw Oops.Oh($"第{index}è¡[æ¯å¦ä¼åå è£ ]{_IsPA}å¼ä¸æ£ç¡®ï¼"); } if (outIsPA <= 0&&!string.IsNullOrEmpty(_IsPA)) { throw Oops.Oh($"第{index}è¡[æ¯å¦ä¼åå è£ ]{_IsPA}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.IsPA = outIsPA; } } if(!string.IsNullOrEmpty(_MaterialIndeX)) { if (!int.TryParse(_MaterialIndeX, out int outMaterialIndeX)&&!string.IsNullOrEmpty(_MaterialIndeX)) { throw Oops.Oh($"第{index}è¡[é¯åå¾å·]{_MaterialIndeX}å¼ä¸æ£ç¡®ï¼"); } if (outMaterialIndeX <= 0&&!string.IsNullOrEmpty(_MaterialIndeX)) { throw Oops.Oh($"第{index}è¡[é¯åå¾å·]{_MaterialIndeX}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.MaterialIndeX = outMaterialIndeX; } } if (string.IsNullOrEmpty(_PackageCode)) { throw Oops.Oh($"第{index}è¡[å è£ å·]{_PackageCode}ä¸è½ä¸ºç©ºï¼"); } if(!string.IsNullOrEmpty(_PackageCode)) { addItem.PackageCode = (string)(_PackageCode.Trim()); } if(!string.IsNullOrEmpty(_Sequence)) { if (!int.TryParse(_Sequence, out int outSequence)&&!string.IsNullOrEmpty(_Sequence)) { throw Oops.Oh($"第{index}è¡[屿°]{_Sequence}å¼ä¸æ£ç¡®ï¼"); } if (outSequence <= 0&&!string.IsNullOrEmpty(_Sequence)) { throw Oops.Oh($"第{index}è¡[屿°]{_Sequence}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.Sequence = outSequence; } } if(!string.IsNullOrEmpty(_Shelf)) { if (!int.TryParse(_Shelf, out int outShelf)&&!string.IsNullOrEmpty(_Shelf)) { throw Oops.Oh($"第{index}è¡[次åº]{_Shelf}å¼ä¸æ£ç¡®ï¼"); } if (outShelf <= 0&&!string.IsNullOrEmpty(_Shelf)) { throw Oops.Oh($"第{index}è¡[次åº]{_Shelf}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.Shelf = outShelf; } } if(!string.IsNullOrEmpty(_Info4)) { addItem.Info4 = (string)(_Info4.Trim()); } if(!string.IsNullOrEmpty(_Info5)) { addItem.Info5 = (string)(_Info5.Trim()); } if(!string.IsNullOrEmpty(_Info6)) { addItem.Info6 = (string)(_Info6.Trim()); } if(!string.IsNullOrEmpty(_Info7)) { addItem.Info7 = (string)(_Info7.Trim()); } if(!string.IsNullOrEmpty(_Info8)) { addItem.Info8 = (string)(_Info8.Trim()); } if(!string.IsNullOrEmpty(_Info10)) { addItem.Info10 = (string)(_Info10.Trim()); } if(!string.IsNullOrEmpty(_Info9)) { addItem.Info9 = (string)(_Info9.Trim()); } if(!string.IsNullOrEmpty(_Info11)) { addItem.Info11 = (string)(_Info11.Trim()); } if(!string.IsNullOrEmpty(_Info12)) { addItem.Info12 = (string)(_Info12.Trim()); } if(!string.IsNullOrEmpty(_Info13)) { addItem.Info13 = (string)(_Info13.Trim()); } if(!string.IsNullOrEmpty(_Info14)) { addItem.Info14 = (string)(_Info14.Trim()); } if(!string.IsNullOrEmpty(_Info15)) { if (!int.TryParse(_Info15, out int outInfo15)&&!string.IsNullOrEmpty(_Info15)) { throw Oops.Oh($"第{index}è¡[é¨ä»¶æ°é]{_Info15}å¼ä¸æ£ç¡®ï¼"); } if (outInfo15 <= 0&&!string.IsNullOrEmpty(_Info15)) { throw Oops.Oh($"第{index}è¡[é¨ä»¶æ°é]{_Info15}å¼ä¸è½å°äºçäº0ï¼"); } else { addItem.Info15 = outInfo15; } } if(!string.IsNullOrEmpty(_Info16)) { addItem.Info16 = (string)(_Info16.Trim()); } #endregion details.Add(addItem); } @@ -477,7 +525,7 @@ await CheckExisitForImport(details); return details; } /// <summary> /// æ ¹æ®çæ¬ä¸è½½æ¹æ¬¡æ°æ®çExcelå¯¼å ¥æ¨¡æ¿ /// </summary> @@ -491,7 +539,7 @@ var fileName = HttpUtility.UrlEncode($"å¯¼å ¥æ¨¡æ¿(æ¹æ¬¡æ°æ®).xlsx", Encoding.GetEncoding("UTF-8")); return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName }; } #endregion #region ç§ææ¹æ³ @@ -511,6 +559,18 @@ || u.DetailName.Contains(input.SearchKey.Trim()) || u.Matgrid.Contains(input.SearchKey.Trim()) || u.PackageCode.Contains(input.SearchKey.Trim()) || u.Info4.Contains(input.SearchKey.Trim()) || u.Info5.Contains(input.SearchKey.Trim()) || u.Info6.Contains(input.SearchKey.Trim()) || u.Info7.Contains(input.SearchKey.Trim()) || u.Info8.Contains(input.SearchKey.Trim()) || u.Info10.Contains(input.SearchKey.Trim()) || u.Info9.Contains(input.SearchKey.Trim()) || u.Info11.Contains(input.SearchKey.Trim()) || u.Info12.Contains(input.SearchKey.Trim()) || u.Info13.Contains(input.SearchKey.Trim()) || u.Info14.Contains(input.SearchKey.Trim()) || u.Info16.Contains(input.SearchKey.Trim()) || u.CreateUserName.Contains(input.SearchKey.Trim()) || u.UpdateUserName.Contains(input.SearchKey.Trim()) ) @@ -521,60 +581,92 @@ .WhereIF(!string.IsNullOrWhiteSpace(input.UPI), u => u.UPI.Contains(input.UPI.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.DetailName), u => u.DetailName.Contains(input.DetailName.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Matgrid), u => u.Matgrid.Contains(input.Matgrid.Trim())) .WhereIF(input.IsEB > 0, u => u.IsEB == input.IsEB) .WhereIF(input.DRNum > 0, u => u.DRNum == input.DRNum) .WhereIF(input.IsPA > 0, u => u.IsPA == input.IsPA) .WhereIF(input.MaterialIndeX > 0, u => u.MaterialIndeX == input.MaterialIndeX) .WhereIF(input.IsEB>0, u => u.IsEB == input.IsEB) .WhereIF(input.DRNum>0, u => u.DRNum == input.DRNum) .WhereIF(input.IsPA>0, u => u.IsPA == input.IsPA) .WhereIF(input.MaterialIndeX>0, u => u.MaterialIndeX == input.MaterialIndeX) .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim())) .WhereIF(input.Sequence > 0, u => u.Sequence == input.Sequence) .WhereIF(input.Shelf > 0, u => u.Shelf == input.Shelf) .WhereIF(input.Sequence>0, u => u.Sequence == input.Sequence) .WhereIF(input.Shelf>0, u => u.Shelf == input.Shelf) .WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info6), u => u.Info6.Contains(input.Info6.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info7), u => u.Info7.Contains(input.Info7.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info8), u => u.Info8.Contains(input.Info8.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info10), u => u.Info10.Contains(input.Info10.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info9), u => u.Info9.Contains(input.Info9.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info11), u => u.Info11.Contains(input.Info11.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info12), u => u.Info12.Contains(input.Info12.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info13), u => u.Info13.Contains(input.Info13.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info14), u => u.Info14.Contains(input.Info14.Trim())) .WhereIF(input.Info15>0, u => u.Info15 == input.Info15) .WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim())) .Select<Mes_BatchOrderUPI_NewOutput>(); return query; } } /// <summary> /// é夿§éªè¯ /// </summary> /// <param name="input">éªè¯å¯¹è±¡</param> /// <param name="isEdit">æ¯å¦æ¯ç¼è¾</param> /// <returns></returns> private async Task CheckExist(Mes_BatchOrderUPI_New input, bool isEdit = false) { //没æé ç½®ç»åæ ¡éªï¼ä¸éè¦éªé //没æé ç½®åç¬æ ¡éªï¼ä¸éè¦éªé } /// <summary> /// æ ¹æ®ç»åæ ¡éªååç¬æ ¡éªéªè¯æ°æ®æ¯å¦å·²åå¨-å¯¼å ¥æ¶éªè¯ /// </summary> /// <param name="inputs"></param> /// <returns></returns> private async Task CheckExisitForImport(List<Mes_BatchOrderUPI_New> inputs) { if (inputs?.Count <= 0) /// <summary> /// é夿§éªè¯ /// </summary> /// <param name="input">éªè¯å¯¹è±¡</param> /// <param name="isEdit">æ¯å¦æ¯ç¼è¾</param> /// <returns></returns> private async Task CheckExist( Mes_BatchOrderUPI_New input,bool isEdit=false) { throw Oops.Oh($"å¯¼å ¥æ°æ®ä¸è½ä¸ºç©º"); //没æé ç½®ç»åæ ¡éªï¼ä¸éè¦éªé //没æé ç½®åç¬æ ¡éªï¼ä¸éè¦éªé } /// <summary> /// æ ¹æ®ç»åæ ¡éªååç¬æ ¡éªéªè¯æ°æ®æ¯å¦å·²åå¨-å¯¼å ¥æ¶éªè¯ /// </summary> /// <param name="inputs"></param> /// <returns></returns> private async Task CheckExisitForImport(List<Mes_BatchOrderUPI_New> inputs) { if (inputs?.Count <= 0) { throw Oops.Oh($"å¯¼å ¥æ°æ®ä¸è½ä¸ºç©º"); } //æ ¹æ®ç»åæ ¡éªéªè¯è¡¨æ ¼ä¸ä¸æ¯å¦å·²åå¨ç¸åæ°æ® //æ ¹æ®åç¬æ ¡éªéªè¯è¡¨æ ¼ä¸ä¸æ¯å¦å·²åå¨ç¸åæ°æ® } //æ ¹æ®ç»åæ ¡éªéªè¯è¡¨æ ¼ä¸ä¸æ¯å¦å·²åå¨ç¸åæ°æ® //æ ¹æ®åç¬æ ¡éªéªè¯è¡¨æ ¼ä¸ä¸æ¯å¦å·²åå¨ç¸åæ°æ® } #endregion [HttpPost] [ApiDescriptionSettings(Name = "GetBatchOrderUPIList")] [UnitOfWork] [AllowAnonymous] public async Task GetBatchOrderUPIList(List<GetBatchOrderUPIInput> input) { List<Mes_BatchOrderUPI_New> list = new List<Mes_BatchOrderUPI_New>(); foreach (var item in input) { Mes_BatchOrderUPI_New task = new Mes_BatchOrderUPI_New(); task = item.Adapt<Mes_BatchOrderUPI_New>(); task.AreaCode = AreaCodeEnum.æ åºå; task.UpiStatus = UpiStatusEnum.åå§; list.Add(task); } await _rep.InsertRangeAsync(list); } } LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/Åú´ÎÊý¾Ýµ¼ÈëÄ£°å.xlsxBinary files differ