222

schangxiang@126.com

2024-11-26 c00d4c5cda3af8e63a5969c58b9151b858e9105e

222

 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/´òÓ¡Ä£°åÎļþ/°ü×°ÌõÂëÄ£°å_¶þάÂë.btw

Binary 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,11 +73,6 @@
        [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发货

 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>
@@ -113,23 +113,7 @@
        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);
    }




@@ -194,6 +178,19 @@
            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


@@ -222,6 +219,19 @@
            _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


@@ -408,18 +418,7 @@
            {
                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))
@@ -452,22 +451,71 @@
                }

            }
            //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());
            // }
                         
                          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


@@ -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())
            )
@@ -528,6 +588,19 @@
            .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(!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;
    }
@@ -576,5 +649,24 @@
    }
    #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/Åú´ÎÊý¾Ýµ¼ÈëÄ£°å.xlsx

Binary files differ