222

schangxiang@126.com

2024-11-30 6143bf1429551edd4d71f45b120bc99689031e40

222

 LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/component/editDialog.vue

@@ -20,6 +20,16 @@
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="标记" prop="upiFlag">
                            <el-select clearable v-model="ruleForm.upiFlag" placeholder="请选择标记">
                                <el-option v-for="(item,index) in  getEnumUpiFlagData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </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 />
                            
@@ -147,7 +157,10 @@
    import { ElMessage } from "element-plus";
    import type { FormRules } from "element-plus";
    import { addMes_Package_UnLine_Record, updateMes_Package_UnLine_Record, detailMes_Package_UnLine_Record } from "/@/api/main/ReportCenter/mes_Package_UnLine_Record";
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';

    const getEnumUpiFlagData = ref<any>([]);
    //父级传递来的参数
    var props = defineProps({
        title: {
@@ -237,6 +250,7 @@

    // é¡µé¢åŠ è½½æ—¶
    onMounted(async () => {
            getEnumUpiFlagData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
    });

    //将属性或者函数暴露给父组件

 LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/mes_Package_UnLine_Record/index.vue

@@ -16,6 +16,15 @@
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="标记">
              <el-select clearable="" v-model="queryParamsMes_Package_UnLine_Record.upiFlag" placeholder="请选择标记">
                <el-option v-for="(item,index) in getEnumUpiFlagData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
                
              </el-select>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_UnLine_Record">
            <el-form-item label="生产单号">
              <el-input v-model="queryParamsMes_Package_UnLine_Record.info5" clearable="" placeholder="请输入生产单号"/>
              
@@ -133,6 +142,11 @@
                border="">
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="packageCode" label="包装号"  show-overflow-tooltip="" />
          <el-table-column prop="upiFlag" label="标记"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index)}}</el-tag>
            </template>
          </el-table-column>
        <el-table-column prop="info5" label="生产单号"  show-overflow-tooltip="" />
        <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
@@ -194,8 +208,13 @@

  import printDialogMes_Package_UnLine_Record from '/@/views/system/print/component/hiprint/preview.vue'
  import { pageMes_Package_UnLine_Record, deleteMes_Package_UnLine_Record,importExcelMes_Package_UnLine_Record,downloadExcelTemplateMes_Package_UnLine_Record } from '/@/api/main/ReportCenter/mes_Package_UnLine_Record';
    import { getAPI } from '/@/utils/axios-utils';
    import { SysEnumApi } from '/@/api-services/api';
  import commonFunction from '/@/utils/commonFunction';

  const getEnumUpiFlagData_Index = ref<any>([]);

    const { getEnumDesc } = commonFunction();
  
  /***************************************************[包下线记录操作]开始***************************************************/
  const showAdvanceQueryUIMes_Package_UnLine_Record = ref(false);
@@ -297,6 +316,7 @@
/***************************************************[包下线记录导出]开始***************************************************/
//定义当前页面的方法组
const functionMapMes_Package_UnLine_Record = {
      getEnumUpiFlagData_Index,
      formatDate_T_Date,
      formatDate_T_Time
};
@@ -321,6 +341,7 @@
/***************************************************[包下线记录导出]结束***************************************************/
  // åŒ…下线记录页面加载时
  onMounted(async () => {
    getEnumUpiFlagData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
  });

  handleQueryMes_Package_UnLine_Record();

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue

@@ -13,8 +13,8 @@
                        <el-input v-model="ruleForm.id" />
                    </el-form-item>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="部件条码" prop="upi">
                            <el-input v-model="ruleForm.upi" placeholder="请输入部件条码" maxlength="50" show-word-limit clearable />
                        <el-form-item label="部件条码" prop="uPI">
                            <el-input v-model="ruleForm.uPI" placeholder="请输入部件条码" maxlength="50" show-word-limit clearable />
                            
                        </el-form-item>
                        
@@ -249,6 +249,16 @@
                        </el-form-item>
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="标记" prop="upiFlag">
                            <el-select clearable v-model="ruleForm.upiFlag" placeholder="请选择标记">
                                <el-option v-for="(item,index) in  getEnumUpiFlagData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>
@@ -277,6 +287,7 @@

    const getEnumAreaCodeData = ref<any>([]);
    const getEnumUpiStatusData = ref<any>([]);
    const getEnumUpiFlagData = ref<any>([]);
    //父级传递来的参数
    var props = defineProps({
        title: {
@@ -293,7 +304,7 @@
    const ruleForm = ref<any>({});
    //自行添加其他规则
    const rules = ref<FormRules>({
        upi: [{required: true, message: '请输入部件条码！', trigger: 'blur',},],
        uPI: [{required: true, message: '请输入部件条码！', trigger: 'blur',},],
        planNo: [{required: true, message: '请输入批次号！', trigger: 'blur',},],
        orderId: [{required: true, message: '请输入订单号！', trigger: 'blur',},],
        upiStatus: [{required: true, message: '请选择板料状态！', trigger: 'change',},],
@@ -374,6 +385,7 @@
    onMounted(async () => {
            getEnumAreaCodeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
            getEnumUpiStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
            getEnumUpiFlagData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
    });

    //将属性或者函数暴露给父组件

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue

@@ -11,7 +11,7 @@
          </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.upi" clearable="" placeholder="请输入部件条码"/>
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.uPI" clearable="" placeholder="请输入部件条码"/>
              
            </el-form-item>
          </el-col>
@@ -213,6 +213,15 @@
              
            </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-select clearable="" v-model="queryParamsMes_BatchOrderUPI_New.upiFlag" placeholder="请选择标记">
                <el-option v-for="(item,index) in getEnumUpiFlagData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
                
              </el-select>
              
            </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;">
@@ -241,11 +250,10 @@
                @sort-change="sortChangeMes_BatchOrderUPI_New"
                border="">
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="upi" label="部件条码" width="180" show-overflow-tooltip="" />
        <el-table-column prop="info5" label="生产单号"  width="130" show-overflow-tooltip="" />
        <el-table-column prop="packageCode" label="包装编码"  width="180"  show-overflow-tooltip="" />
        <el-table-column prop="planNo" label="批次号"  width="130"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  width="130"  show-overflow-tooltip="" />
        <el-table-column prop="uPI" label="部件条码"  show-overflow-tooltip="" />
        <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
        <el-table-column prop="info5" label="生产单号"  show-overflow-tooltip="" />
          <el-table-column prop="areaCode" label="所在区域"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index)}}</el-tag>
@@ -261,6 +269,7 @@
        <el-table-column prop="width" label="宽"  show-overflow-tooltip="" />
        <el-table-column prop="thk" label="厚"  show-overflow-tooltip="" />
        <el-table-column prop="isPA" label="是否优化包装"  show-overflow-tooltip="" />
        <el-table-column prop="packageCode" label="包装号"  show-overflow-tooltip="" />
        <el-table-column prop="machineXCenter" label="包装X坐标"  show-overflow-tooltip="" />
        <el-table-column prop="machineYCenter" label="包装Y坐标"  show-overflow-tooltip="" />
        <el-table-column prop="machineZCenter" label="包装Z坐标"  show-overflow-tooltip="" />
@@ -274,11 +283,11 @@
        <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="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="info17" label="机械臂是否旋转"  show-overflow-tooltip="" />
@@ -286,6 +295,11 @@
         <el-table-column prop="updateTime" label="修改时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
        <el-table-column prop="createUserName" label="创建人"  show-overflow-tooltip="" />
        <el-table-column prop="updateUserName" label="修改人"  show-overflow-tooltip="" />
          <el-table-column prop="upiFlag" label="标记"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index)}}</el-tag>
            </template>
          </el-table-column>
        <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_BatchOrderUPI_New:update') || auth('mes_BatchOrderUPI_New:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_BatchOrderUPI_New(scope.row)" v-auth="'mes_BatchOrderUPI_New:update'"> ç¼–辑 </el-button>
@@ -342,6 +356,7 @@

  const getEnumAreaCodeData_Index = ref<any>([]);
  const getEnumUpiStatusData_Index = ref<any>([]);
  const getEnumUpiFlagData_Index = ref<any>([]);

    const { getEnumDesc } = commonFunction();
  
@@ -469,6 +484,7 @@
const functionMapMes_BatchOrderUPI_New = {
      getEnumAreaCodeData_Index,
      getEnumUpiStatusData_Index,
      getEnumUpiFlagData_Index,
      formatDate_T_Date,
      formatDate_T_Time
};
@@ -495,6 +511,7 @@
  onMounted(async () => {
    getEnumAreaCodeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
    getEnumUpiStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
    getEnumUpiFlagData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
  });

  handleQueryMes_BatchOrderUPI_New();

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/component/editDialog.vue

@@ -61,6 +61,13 @@
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="是否齐包" prop="isQiBao">
                            <el-switch v-model="ruleForm.isQiBao" active-text="是" inactive-text="否" />
							
                        </el-form-item>
						
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="纸箱长" prop="info1">
                            <el-input v-model="ruleForm.info1" placeholder="请输入纸箱长" maxlength="53" show-word-limit clearable />
                            
@@ -137,6 +144,16 @@
                        </el-form-item>
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="标记" prop="upiFlag">
                            <el-select clearable v-model="ruleForm.upiFlag" placeholder="请选择标记">
                                <el-option v-for="(item,index) in  getEnumUpiFlagData" :key="index" :value="item.value" :label="`${item.describe}`"></el-option>
								
                            </el-select>
							
                        </el-form-item>
						
                    </el-col>
                </el-row>
            </el-form>
            <template #footer>
@@ -165,6 +182,7 @@

    const getEnumAreaCodeData = ref<any>([]);
    const getEnumUpiStatusData = ref<any>([]);
    const getEnumUpiFlagData = ref<any>([]);
    //父级传递来的参数
    var props = defineProps({
        title: {
@@ -257,6 +275,7 @@
    onMounted(async () => {
            getEnumAreaCodeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
            getEnumUpiStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
            getEnumUpiFlagData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
    });

    //将属性或者函数暴露给父组件

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Package_Gather/index.vue

@@ -52,6 +52,15 @@
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="是否齐包">
              <el-select clearable="" v-model="queryParamsMes_Package_Gather.isQiBao" placeholder="请选择是否齐包">
                <el-option v-for="(item,index) in getEnumIsQiBaoData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
                
              </el-select>
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="纸箱长">
              <el-input v-model="queryParamsMes_Package_Gather.info1" clearable="" placeholder="请输入纸箱长"/>
              
@@ -117,6 +126,15 @@
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Package_Gather">
            <el-form-item label="标记">
              <el-select clearable="" v-model="queryParamsMes_Package_Gather.upiFlag" placeholder="请选择标记">
                <el-option v-for="(item,index) in getEnumUpiFlagData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
                
              </el-select>
              
            </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;">
@@ -158,6 +176,14 @@
              <el-tag>{{ getEnumDesc(scope.row.upiStatus, getEnumUpiStatusData_Index)}}</el-tag>
            </template>
          </el-table-column>
        <el-table-column prop="isQiBao" label="是否齐包"  show-overflow-tooltip="">
          <template #default="scope">
            <el-tag v-if="scope.row.isQiBao"> æ˜¯ </el-tag>
            <el-tag type="danger" v-else> å¦ </el-tag>
            
          </template>
          
        </el-table-column>
        <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="" />
@@ -173,6 +199,11 @@
         <el-table-column prop="updateTime" label="修改时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
        <el-table-column prop="createUserName" label="创建人"  show-overflow-tooltip="" />
        <el-table-column prop="updateUserName" label="修改人"  show-overflow-tooltip="" />
          <el-table-column prop="upiFlag" label="标记"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.upiFlag, getEnumUpiFlagData_Index)}}</el-tag>
            </template>
          </el-table-column>
        <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mes_Package_Gather:update') || auth('mes_Package_Gather:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMes_Package_Gather(scope.row)" v-auth="'mes_Package_Gather:update'"> ç¼–辑 </el-button>
@@ -222,6 +253,8 @@

  const getEnumAreaCodeData_Index = ref<any>([]);
  const getEnumUpiStatusData_Index = ref<any>([]);
  const getEnumIsQiBaoData_Index = ref<any>([]);
  const getEnumUpiFlagData_Index = ref<any>([]);

    const { getEnumDesc } = commonFunction();
  
@@ -327,6 +360,8 @@
const functionMapMes_Package_Gather = {
      getEnumAreaCodeData_Index,
      getEnumUpiStatusData_Index,
      getEnumIsQiBaoData_Index,
      getEnumUpiFlagData_Index,
      formatDate_T_Date,
      formatDate_T_Time
};
@@ -353,6 +388,8 @@
  onMounted(async () => {
    getEnumAreaCodeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('AreaCodeEnum')).data.result ?? [];
    getEnumUpiStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiStatusEnum')).data.result ?? [];
    getEnumIsQiBaoData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('TrueFalseEnum')).data.result ?? [];
    getEnumUpiFlagData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('UpiFlagEnum')).data.result ?? [];
  });

  handleQueryMes_Package_Gather();

 LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/component/editDialog.vue

@@ -27,8 +27,8 @@
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="部件条码" prop="upi">
                            <el-input v-model="ruleForm.upi" placeholder="请输入部件条码" maxlength="50" show-word-limit clearable />
                        <el-form-item label="部件条码" prop="uPI">
                            <el-input v-model="ruleForm.uPI" placeholder="请输入部件条码" maxlength="50" show-word-limit clearable />
                            
                        </el-form-item>
                        
@@ -132,14 +132,14 @@
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="下发时间" prop="issueTime">
                            <el-date-picker v-model="ruleForm.issueTime" type="date" placeholder="下发时间" />
                            <el-date-picker v-model="ruleForm.issueTime" type="datetime" placeholder="下发时间" />
                            
                        </el-form-item>
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="任务完成时间" prop="finishedTime">
                            <el-date-picker v-model="ruleForm.finishedTime" type="date" placeholder="任务完成时间" />
                            <el-date-picker v-model="ruleForm.finishedTime" type="datetime" placeholder="任务完成时间" />
                            
                        </el-form-item>
                        
@@ -196,7 +196,7 @@
    //自行添加其他规则
    const rules = ref<FormRules>({
        taskNo: [{required: true, message: '请输入任务号！', trigger: 'blur',},],
        upi: [{required: true, message: '请输入部件条码！', trigger: 'blur',},],
        uPI: [{required: true, message: '请输入部件条码！', trigger: 'blur',},],
        length: [{required: true, message: '请输入长！', trigger: 'blur',},],
        width: [{required: true, message: '请输入宽！', trigger: 'blur',},],
        thk: [{required: true, message: '请输入厚！', trigger: 'blur',},],

 LA24030_LuLiPackageLine_Web/src/views/main/WmsTask/wmsRbLineTask/index.vue

@@ -23,7 +23,7 @@
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineTask">
            <el-form-item label="部件条码">
              <el-input v-model="queryParamsWmsRbLineTask.upi" clearable="" placeholder="请输入部件条码"/>
              <el-input v-model="queryParamsWmsRbLineTask.uPI" clearable="" placeholder="请输入部件条码"/>
              
            </el-form-item>
          </el-col>
@@ -113,13 +113,13 @@
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineTask">
            <el-form-item label="下发时间">
              <el-date-picker placeholder="请选择下发时间" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsWmsRbLineTask.issueTimeRange" />
              <el-date-picker placeholder="请选择下发时间" value-format="YYYY/MM/DD  HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsWmsRbLineTask.issueTimeRange" />
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIWmsRbLineTask">
            <el-form-item label="任务完成时间">
              <el-date-picker placeholder="请选择任务完成时间" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsWmsRbLineTask.finishedTimeRange" />
              <el-date-picker placeholder="请选择任务完成时间" value-format="YYYY/MM/DD  HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsWmsRbLineTask.finishedTimeRange" />
              
            </el-form-item>
          </el-col>
@@ -162,7 +162,7 @@
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="taskNo" label="任务号"  show-overflow-tooltip="" />
        <el-table-column prop="taskName" label="任务名称"  show-overflow-tooltip="" />
        <el-table-column prop="upi" label="部件条码"  show-overflow-tooltip="" />
        <el-table-column prop="uPI" label="部件条码"  show-overflow-tooltip="" />
        <el-table-column prop="length" label="长"  show-overflow-tooltip="" />
        <el-table-column prop="width" label="宽"  show-overflow-tooltip="" />
        <el-table-column prop="thk" label="厚"  show-overflow-tooltip="" />
@@ -184,8 +184,8 @@
        <el-table-column prop="taskStatusName" label="任务状态名称"  show-overflow-tooltip="" />
        <el-table-column prop="taskDescribe" label="任务描述"  show-overflow-tooltip="" />
        <el-table-column prop="taskMsg" label="任务消息"  show-overflow-tooltip="" />
         <el-table-column prop="issueTime" label="下发时间" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
         <el-table-column prop="finishedTime" label="任务完成时间" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
         <el-table-column prop="issueTime" label="下发时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
         <el-table-column prop="finishedTime" label="任务完成时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
        <el-table-column prop="isFlagFinish" label="是否标记强制完成"  show-overflow-tooltip="">
          <template #default="scope">
            <el-tag v-if="scope.row.isFlagFinish"> æ˜¯ </el-tag>

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs

@@ -50,6 +50,13 @@
        [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "板料状态")]
        public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.初始;

        /// <summary>
        /// æ ‡è®°
        /// </summary>
        [SugarColumn(ColumnName = "UpiFlag", ColumnDescription = "标记")]
        public UpiFlagEnum? UpiFlag { get; set; } = UpiFlagEnum.正常;


        #endregion



 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs

@@ -53,6 +53,12 @@


        /// <summary>
        /// æ ‡è®°
        /// </summary>
        [SugarColumn(ColumnName = "UpiFlag", ColumnDescription = "标记")]
        public UpiFlagEnum? UpiFlag { get; set; } = UpiFlagEnum.正常;

        /// <summary>
        /// æ˜¯å¦é½åŒ…
        /// </summary>
        [SugarColumn(ColumnName = "IsQiBao", ColumnDescription = "是否齐包")]

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs

@@ -18,6 +18,12 @@
        public string PackageCode { get; set; }

        /// <summary>
        /// æ ‡è®°
        /// </summary>
        [SugarColumn(ColumnName = "UpiFlag", ColumnDescription = "标记")]
        public UpiFlagEnum? UpiFlag { get; set; } = UpiFlagEnum.正常;

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
@@ -31,7 +37,7 @@
        [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
        public string OrderId { get; set; }

    



        [SugarColumn(ColumnName = "Info1", ColumnDescription = "纸箱长", Length = 50)]

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/UpiFlagEnum.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@


using System.ComponentModel;

namespace Admin.NET.Application;

/// <summary>
/// æ¿æ–™æ ‡è®°æžšä¸¾
/// </summary>
[Description("板料标记枚举")]
public enum UpiFlagEnum
{
    /// <summary>
    /// æ­£å¸¸
    /// </summary>
    [Description("正常")]
    æ­£å¸¸ = 0,

    /// <summary>
    /// NG
    /// </summary>
    [Description("NG")]
    NG = 1,


}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordInput.cs

@@ -14,6 +14,11 @@
        public virtual string PackageCode { get; set; }
        
        /// <summary>
        /// æ ‡è®°
        /// </summary>
        public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public virtual string Info5 { get; set; }
@@ -141,6 +146,11 @@
        public string? PackageCode { get; set; }
        
        /// <summary>
        /// æ ‡è®°
        /// </summary>
        public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
        
        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        public string? Info5 { get; set; }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Dto/Mes_Package_UnLine_RecordOutput.cs

@@ -16,6 +16,11 @@
    public string PackageCode { get; set; }
    
    /// <summary>
    /// æ ‡è®°
    /// </summary>
    public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
    
    /// <summary>
    /// ç”Ÿäº§å•å·
    /// </summary>
    public string Info5 { get; set; }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ReportCenter/Mes_Package_UnLine_Record/Mes_Package_UnLine_RecordService.cs

@@ -143,6 +143,7 @@
                || u.UpdateUserName.Contains(input.SearchKey.Trim())
            )
            .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
            .WhereIF(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.PlanNo), u => u.PlanNo.Contains(input.PlanNo.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs

@@ -208,6 +208,11 @@
        /// </summary>
        public virtual bool IsDelete { get; set; }
        
        /// <summary>
        /// æ ‡è®°
        /// </summary>
        public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
        
    }

    /// <summary>
@@ -385,6 +390,11 @@
        /// </summary>
        public string? Info17 { get; set; }
        
        /// <summary>
        /// æ ‡è®°
        /// </summary>
        public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
        
    }

    /// <summary>

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs

@@ -210,6 +210,11 @@
    /// </summary>
    public bool IsDelete { get; set; }
    
    /// <summary>
    /// æ ‡è®°
    /// </summary>
    public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
    
    }
 


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Mes_BatchOrderUPI_NewService.cs

@@ -184,6 +184,7 @@
                           var _Info15 = "";//部件数量
                           var _Info16 = "";//部件尺寸
                           var _Info17 = "";//机械臂是否旋转
                           var _UpiFlag = "";//标记
                          #endregion
                          
                          
@@ -221,6 +222,7 @@
                           _Info15 = row["部件数量"]?.ToString() ;
                           _Info16 = row["部件尺寸"]?.ToString() ;
                           _Info17 = row["机械臂是否旋转"]?.ToString() ;
                           _UpiFlag = row["标记"]?.ToString() ;
                          #endregion
                          
                          
@@ -309,12 +311,6 @@
                            throw Oops.Oh($"第{index}行[长]{_Length}不能为空！");
                          }
                          
                         
                          if (string.IsNullOrEmpty(_Thk))
                          {
                            throw Oops.Oh($"第{index}行[厚]{_Thk}不能为空！");
                          }
                          
                      
                          if(!string.IsNullOrEmpty(_IsPA))
                          {
@@ -342,7 +338,7 @@
                          {
                                addItem.PackageCode = (string)(_PackageCode.Trim());
                           }
                         
                          
                          if(!string.IsNullOrEmpty(_Sequence))
                          {
                              if (!int.TryParse(_Sequence, out int outSequence)&&!string.IsNullOrEmpty(_Sequence))
@@ -375,7 +371,15 @@
                              }
                          
                          }
                         
                       
                          if(!string.IsNullOrEmpty(_Info4))
                          {
                                addItem.Info4 = (string)(_Info4.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info6))
                          {
                                addItem.Info6 = (string)(_Info6.Trim());
                           }
                          if(!string.IsNullOrEmpty(_Info7))
                          {
                                addItem.Info7 = (string)(_Info7.Trim());
@@ -431,6 +435,20 @@
                          if(!string.IsNullOrEmpty(_Info17))
                          {
                                addItem.Info17 = (string)(_Info17.Trim());
                           }
                          if(!string.IsNullOrEmpty(_UpiFlag))
                          {
                          Admin.NET.Application.UpiFlagEnum  enumUpiFlag = default(Admin.NET.Application.UpiFlagEnum);
                          
                             if(!Enum.TryParse<Admin.NET.Application.UpiFlagEnum>(_UpiFlag, out enumUpiFlag)&&!string.IsNullOrEmpty(_UpiFlag))
                              {
                                throw Oops.Oh($"第{index}行[标记]{_UpiFlag}值不正确！");
                              }
                              else
                              {
                                 addItem.UpiFlag = enumUpiFlag;
                              }
                          
                           }
                          #endregion
                          
@@ -514,6 +532,7 @@
            .WhereIF(input.Info15>0, u => u.Info15 == input.Info15)
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info16), u => u.Info16.Contains(input.Info16.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info17), u => u.Info17.Contains(input.Info17.Trim()))
            .WhereIF(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
            .Select<Mes_BatchOrderUPI_NewOutput>();
        return query;
       }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherInput.cs

@@ -39,6 +39,11 @@
        public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
        
        /// <summary>
        /// æ˜¯å¦é½åŒ…
        /// </summary>
        public virtual bool? IsQiBao { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
        /// </summary>
        public virtual float? Info1 { get; set; }
@@ -128,6 +133,11 @@
        /// </summary>
        public virtual bool IsDelete { get; set; }
        
        /// <summary>
        /// æ ‡è®°
        /// </summary>
        public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
        
    }

    /// <summary>
@@ -169,6 +179,11 @@
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        public Admin.NET.Application.UpiStatusEnum? UpiStatus { get; set; }
        
        /// <summary>
        /// æ˜¯å¦é½åŒ…
        /// </summary>
        public bool? IsQiBao { get; set; }
        
        /// <summary>
        /// çº¸ç®±é•¿
@@ -225,6 +240,11 @@
        /// </summary>
        public string? Info13 { get; set; }
        
        /// <summary>
        /// æ ‡è®°
        /// </summary>
        public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
        
    }

    /// <summary>

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Dto/Mes_Package_GatherOutput.cs

@@ -41,6 +41,11 @@
    public Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
    
    /// <summary>
    /// æ˜¯å¦é½åŒ…
    /// </summary>
    public bool? IsQiBao { get; set; }
    
    /// <summary>
    /// çº¸ç®±é•¿
    /// </summary>
    public float? Info1 { get; set; }
@@ -130,6 +135,11 @@
    /// </summary>
    public bool IsDelete { get; set; }
    
    /// <summary>
    /// æ ‡è®°
    /// </summary>
    public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }
    
    }
 


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Package_Gather/Mes_Package_GatherService.cs

@@ -147,6 +147,7 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
            .WhereIF(input.AreaCode.HasValue, u => u.AreaCode == input.AreaCode)
            .WhereIF(input.UpiStatus.HasValue, u => u.UpiStatus == input.UpiStatus)
            .WhereIF(input.IsQiBao.HasValue, u => u.IsQiBao == input.IsQiBao)
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info4), u => u.Info4.Contains(input.Info4.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()))
@@ -155,6 +156,7 @@
            .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(input.UpiFlag.HasValue, u => u.UpiFlag == input.UpiFlag)
            .Select<Mes_Package_GatherOutput>();
        return query;
       }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs

@@ -92,7 +92,7 @@
        var entity = input.Adapt<WmsRbLineTask>();

        //重复性验证
        await CheckExist(entity, true);
        await CheckExist(entity,true);

        await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
    }
@@ -115,7 +115,7 @@


    #region å¯¼å…¥

    
    /// <summary>
    /// Excel模板导入机器人任务表功能
    /// </summary>
@@ -125,15 +125,15 @@
    [ApiDescriptionSettings(Name = "ImportExcel")]
    [Description("WmsRbLineTask/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>
@@ -148,234 +148,218 @@
        {
            index++;
            //导入模版定制化代码（替换模版使用）

            var addItem = new WmsRbLineTask();
            #region å®šä¹‰å˜é‡
            var _TaskNo = "";//任务号
            var _TaskName = "";//任务名称
            var _UPI = "";//部件条码
            var _Length = "";//长
            var _Width = "";//宽
            var _Thk = "";//厚
            var _PlanNo = "";//批次号
            var _OrderId = "";//订单号
            var _PackageCode = "";//包装号
            var _PlaceCode = "";//库位编码
            var _RbTaskType = "";//任务类型
            var _RbTaskTypeEnumName = "";//任务类型名称
            var _TaskStatus = "";//任务状态
            var _TaskStatusName = "";//任务状态名称
            var _TaskDescribe = "";//任务描述
            var _TaskMsg = "";//任务消息
            var _IssueTime = "";//下发时间
            var _FinishedTime = "";//任务完成时间
            var _IsFlagFinish = "";//是否标记强制完成
            #endregion


            #region å–值
            _TaskNo = row["任务号"]?.ToString();
            _TaskName = row["任务名称"]?.ToString();
            _UPI = row["部件条码"]?.ToString();
            _Length = row["长"]?.ToString();
            _Width = row["宽"]?.ToString();
            _Thk = row["厚"]?.ToString();
            _PlanNo = row["批次号"]?.ToString();
            _OrderId = row["订单号"]?.ToString();
            _PackageCode = row["包装号"]?.ToString();
            _PlaceCode = row["库位编码"]?.ToString();
            _RbTaskType = row["任务类型"]?.ToString();
            _RbTaskTypeEnumName = row["任务类型名称"]?.ToString();
            _TaskStatus = row["任务状态"]?.ToString();
            _TaskStatusName = row["任务状态名称"]?.ToString();
            _TaskDescribe = row["任务描述"]?.ToString();
            _TaskMsg = row["任务消息"]?.ToString();
            _IssueTime = row["下发时间"]?.ToString();
            _FinishedTime = row["任务完成时间"]?.ToString();
            _IsFlagFinish = row["是否标记强制完成"]?.ToString();
            #endregion


            #region éªŒè¯

            if (string.IsNullOrEmpty(_TaskNo))
            {
                throw Oops.Oh($"第{index}行[任务号]{_TaskNo}不能为空！");
            }

            if (!string.IsNullOrEmpty(_TaskNo))
            {
                addItem.TaskNo = (string)(_TaskNo.Trim());
            }
            if (!string.IsNullOrEmpty(_TaskName))
            {
                addItem.TaskName = (string)(_TaskName.Trim());
            }

            if (string.IsNullOrEmpty(_UPI))
            {
                throw Oops.Oh($"第{index}行[部件条码]{_UPI}不能为空！");
            }

            if (!string.IsNullOrEmpty(_UPI))
            {
                addItem.UPI = (string)(_UPI.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(_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(_PackageCode))
            {
                throw Oops.Oh($"第{index}行[包装号]{_PackageCode}不能为空！");
            }

            if (!string.IsNullOrEmpty(_PackageCode))
            {
                addItem.PackageCode = (string)(_PackageCode.Trim());
            }

            if (string.IsNullOrEmpty(_PlaceCode))
            {
                throw Oops.Oh($"第{index}行[库位编码]{_PlaceCode}不能为空！");
            }

            if (!string.IsNullOrEmpty(_PlaceCode))
            {
                addItem.PlaceCode = (string)(_PlaceCode.Trim());
            }
            if (!string.IsNullOrEmpty(_RbTaskType))
            {
                Admin.NET.Application.RbTaskTypeEnum enumRbTaskType = default(Admin.NET.Application.RbTaskTypeEnum);

                if (!Enum.TryParse<Admin.NET.Application.RbTaskTypeEnum>(_RbTaskType, out enumRbTaskType) && !string.IsNullOrEmpty(_RbTaskType))
                {
                    throw Oops.Oh($"第{index}行[任务类型]{_RbTaskType}值不正确！");
                }
                else
                {
                    addItem.RbTaskType = enumRbTaskType;
                }

            }
            if (!string.IsNullOrEmpty(_RbTaskTypeEnumName))
            {
                addItem.RbTaskTypeEnumName = (string)(_RbTaskTypeEnumName.Trim());
            }

            if (string.IsNullOrEmpty(_TaskStatus))
            {
                throw Oops.Oh($"第{index}行[任务状态]{_TaskStatus}不能为空！");
            }

            if (!string.IsNullOrEmpty(_TaskStatus))
            {
                Admin.NET.Application.TaskStatusEnum enumTaskStatus = default(Admin.NET.Application.TaskStatusEnum);

                if (!Enum.TryParse<Admin.NET.Application.TaskStatusEnum>(_TaskStatus, out enumTaskStatus) && !string.IsNullOrEmpty(_TaskStatus))
                {
                    throw Oops.Oh($"第{index}行[任务状态]{_TaskStatus}值不正确！");
                }
                else
                {
                    addItem.TaskStatus = enumTaskStatus;
                }

            }

            if (string.IsNullOrEmpty(_TaskStatusName))
            {
                throw Oops.Oh($"第{index}行[任务状态名称]{_TaskStatusName}不能为空！");
            }

            if (!string.IsNullOrEmpty(_TaskStatusName))
            {
                addItem.TaskStatusName = (string)(_TaskStatusName.Trim());
            }
            if (!string.IsNullOrEmpty(_TaskDescribe))
            {
                addItem.TaskDescribe = (string)(_TaskDescribe.Trim());
            }
            if (!string.IsNullOrEmpty(_TaskMsg))
            {
                addItem.TaskMsg = (string)(_TaskMsg.Trim());
            }
            if (!string.IsNullOrEmpty(_IssueTime))
            {
                addItem.IssueTime = Convert.ToDateTime(Convert.ToDateTime(_IssueTime.Trim()).ToShortDateString());
            }
            if (!string.IsNullOrEmpty(_FinishedTime))
            {
                addItem.FinishedTime = Convert.ToDateTime(Convert.ToDateTime(_FinishedTime.Trim()).ToShortDateString());
            }

            if (string.IsNullOrEmpty(_IsFlagFinish))
            {
                throw Oops.Oh($"第{index}行[是否标记强制完成]{_IsFlagFinish}不能为空！");
            }

            if (!string.IsNullOrEmpty(_IsFlagFinish))
            {
                if (!_IsFlagFinish.Equals("是") && !_IsFlagFinish.Equals("否"))
                {
                    throw Oops.Oh($"第{index}行[是否标记强制完成]{_IsFlagFinish}值不正确！");
                }
                else
                {
                    bool outIsFlagFinish = _IsFlagFinish.Equals("是") ? true : false;
                    addItem.IsFlagFinish = outIsFlagFinish;
                }
            }

            #endregion

                                      
                           var addItem = new WmsRbLineTask();
                          #region å®šä¹‰å˜é‡
                           var _TaskNo = "";//任务号
                           var _TaskName = "";//任务名称
                           var _UPI = "";//部件条码
                           var _Length = "";//长
                           var _Width = "";//宽
                           var _Thk = "";//厚
                           var _PlanNo = "";//批次号
                           var _OrderId = "";//订单号
                           var _PackageCode = "";//包装号
                           var _PlaceCode = "";//库位编码
                           var _RbTaskType = "";//任务类型
                           var _RbTaskTypeEnumName = "";//任务类型名称
                           var _TaskStatus = "";//任务状态
                           var _TaskStatusName = "";//任务状态名称
                           var _TaskDescribe = "";//任务描述
                           var _TaskMsg = "";//任务消息
                           var _IssueTime = "";//下发时间
                           var _FinishedTime = "";//任务完成时间
                           var _IsFlagFinish = "";//是否标记强制完成
                          #endregion
                          
                          
                          #region å–值
                           _TaskNo = row["任务号"]?.ToString() ;
                           _TaskName = row["任务名称"]?.ToString() ;
                           _UPI = row["部件条码"]?.ToString() ;
                           _Length = row["长"]?.ToString() ;
                           _Width = row["宽"]?.ToString() ;
                           _Thk = row["厚"]?.ToString() ;
                           _PlanNo = row["批次号"]?.ToString() ;
                           _OrderId = row["订单号"]?.ToString() ;
                           _PackageCode = row["包装号"]?.ToString() ;
                           _PlaceCode = row["库位编码"]?.ToString() ;
                           _RbTaskType = row["任务类型"]?.ToString() ;
                           _RbTaskTypeEnumName = row["任务类型名称"]?.ToString() ;
                           _TaskStatus = row["任务状态"]?.ToString() ;
                           _TaskStatusName = row["任务状态名称"]?.ToString() ;
                           _TaskDescribe = row["任务描述"]?.ToString() ;
                           _TaskMsg = row["任务消息"]?.ToString() ;
                           _IssueTime = row["下发时间"]?.ToString() ;
                           _FinishedTime = row["任务完成时间"]?.ToString() ;
                           _IsFlagFinish = row["是否标记强制完成"]?.ToString() ;
                          #endregion
                          
                          
                          #region éªŒè¯
                          
                          if (string.IsNullOrEmpty(_TaskNo))
                          {
                            throw Oops.Oh($"第{index}行[任务号]{_TaskNo}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_TaskNo))
                          {
                                addItem.TaskNo = (string)(_TaskNo.Trim());
                           }
                          if(!string.IsNullOrEmpty(_TaskName))
                          {
                                addItem.TaskName = (string)(_TaskName.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_UPI))
                          {
                            throw Oops.Oh($"第{index}行[部件条码]{_UPI}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_UPI))
                          {
                                addItem.UPI = (string)(_UPI.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_Length))
                          {
                            throw Oops.Oh($"第{index}行[长]{_Length}不能为空！");
                          }
                          
                        
                          
                          if (string.IsNullOrEmpty(_Thk))
                          {
                            throw Oops.Oh($"第{index}行[厚]{_Thk}不能为空！");
                          }
                          
                       
                          
                          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(_PackageCode))
                          {
                            throw Oops.Oh($"第{index}行[包装号]{_PackageCode}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_PackageCode))
                          {
                                addItem.PackageCode = (string)(_PackageCode.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_PlaceCode))
                          {
                            throw Oops.Oh($"第{index}行[库位编码]{_PlaceCode}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_PlaceCode))
                          {
                                addItem.PlaceCode = (string)(_PlaceCode.Trim());
                           }
                          if(!string.IsNullOrEmpty(_RbTaskType))
                          {
                          Admin.NET.Application.RbTaskTypeEnum  enumRbTaskType = default(Admin.NET.Application.RbTaskTypeEnum);
                          
                             if(!Enum.TryParse<Admin.NET.Application.RbTaskTypeEnum>(_RbTaskType, out enumRbTaskType)&&!string.IsNullOrEmpty(_RbTaskType))
                              {
                                throw Oops.Oh($"第{index}行[任务类型]{_RbTaskType}值不正确！");
                              }
                              else
                              {
                                 addItem.RbTaskType = enumRbTaskType;
                              }
                          
                           }
                          if(!string.IsNullOrEmpty(_RbTaskTypeEnumName))
                          {
                                addItem.RbTaskTypeEnumName = (string)(_RbTaskTypeEnumName.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_TaskStatus))
                          {
                            throw Oops.Oh($"第{index}行[任务状态]{_TaskStatus}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_TaskStatus))
                          {
                          Admin.NET.Application.TaskStatusEnum  enumTaskStatus = default(Admin.NET.Application.TaskStatusEnum);
                          
                             if(!Enum.TryParse<Admin.NET.Application.TaskStatusEnum>(_TaskStatus, out enumTaskStatus)&&!string.IsNullOrEmpty(_TaskStatus))
                              {
                                throw Oops.Oh($"第{index}行[任务状态]{_TaskStatus}值不正确！");
                              }
                              else
                              {
                                 addItem.TaskStatus = enumTaskStatus;
                              }
                          
                           }
                          
                          if (string.IsNullOrEmpty(_TaskStatusName))
                          {
                            throw Oops.Oh($"第{index}行[任务状态名称]{_TaskStatusName}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_TaskStatusName))
                          {
                                addItem.TaskStatusName = (string)(_TaskStatusName.Trim());
                           }
                          if(!string.IsNullOrEmpty(_TaskDescribe))
                          {
                                addItem.TaskDescribe = (string)(_TaskDescribe.Trim());
                           }
                          if(!string.IsNullOrEmpty(_TaskMsg))
                          {
                                addItem.TaskMsg = (string)(_TaskMsg.Trim());
                           }
                          if(!string.IsNullOrEmpty(_IssueTime))
                          {
                                addItem.IssueTime =   Convert.ToDateTime(_IssueTime.Trim());
                           }
                          if(!string.IsNullOrEmpty(_FinishedTime))
                          {
                                addItem.FinishedTime =   Convert.ToDateTime(_FinishedTime.Trim());
                           }
                          
                          if (string.IsNullOrEmpty(_IsFlagFinish))
                          {
                            throw Oops.Oh($"第{index}行[是否标记强制完成]{_IsFlagFinish}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_IsFlagFinish))
                          {
                            if(!_IsFlagFinish.Equals("是") && !_IsFlagFinish.Equals("否"))
                             {
                               throw Oops.Oh($"第{index}行[是否标记强制完成]{_IsFlagFinish}值不正确！");
                             }
                             else
                             {
                               bool outIsFlagFinish = _IsFlagFinish.Equals("是") ? true : false;
                               addItem.IsFlagFinish = outIsFlagFinish;
                             }
                             }
                          
                          #endregion
                          

            details.Add(addItem);
        }
@@ -383,7 +367,7 @@
        await CheckExisitForImport(details);
        return details;
    }

    
    /// <summary>
    /// æ ¹æ®ç‰ˆæœ¬ä¸‹è½½æœºå™¨äººä»»åŠ¡è¡¨çš„Excel导入模板
    /// </summary>
@@ -397,7 +381,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 ç§æœ‰æ–¹æ³•
@@ -440,72 +424,72 @@
            .WhereIF(!string.IsNullOrWhiteSpace(input.TaskMsg), u => u.TaskMsg.Contains(input.TaskMsg.Trim()))
            .WhereIF(input.IsFlagFinish.HasValue, u => u.IsFlagFinish == input.IsFlagFinish)
            .Select<WmsRbLineTaskOutput>();
        if (input.IssueTimeRange != null && input.IssueTimeRange.Count > 0)
        if(input.IssueTimeRange != null && input.IssueTimeRange.Count >0)
        {
            DateTime? start = input.IssueTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.IssueTime > start);
            if (input.IssueTimeRange.Count > 1 && input.IssueTimeRange[1].HasValue)
            DateTime? start= input.IssueTimeRange[0].Value;
            query = query.WhereIF(start.HasValue, u => u.IssueTime >= start);
            if (input.IssueTimeRange.Count >1 && input.IssueTimeRange[1].HasValue)
            {
                var end = input.IssueTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.IssueTime < end);
                var end = input.IssueTimeRange[1].Value;
                query = query.Where(u => u.IssueTime <= end);
            }
        }
        if (input.FinishedTimeRange != null && input.FinishedTimeRange.Count > 0)
        } 
        if(input.FinishedTimeRange != null && input.FinishedTimeRange.Count >0)
        {
            DateTime? start = input.FinishedTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.FinishedTime > start);
            if (input.FinishedTimeRange.Count > 1 && input.FinishedTimeRange[1].HasValue)
            DateTime? start= input.FinishedTimeRange[0].Value;
            query = query.WhereIF(start.HasValue, u => u.FinishedTime >= start);
            if (input.FinishedTimeRange.Count >1 && input.FinishedTimeRange[1].HasValue)
            {
                var end = input.FinishedTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.FinishedTime < end);
                var end = input.FinishedTimeRange[1].Value;
                query = query.Where(u => u.FinishedTime <= end);
            }
        }
        } 
        return query;
    }
       }

    /// <summary>
    /// é‡å¤æ€§éªŒè¯
    /// </summary>
    /// <param name="input">验证对象</param>
    /// <param name="isEdit">是否是编辑</param>
    /// <returns></returns>
    private async Task CheckExist(WmsRbLineTask input, bool isEdit = false)
    {



        //没有配置组合校验，不需要验重


        //没有配置单独校验，不需要验重
    }

    /// <summary>
    /// æ ¹æ®ç»„合校验和单独校验验证数据是否已存在-导入时验证
    /// </summary>
    /// <param name="inputs"></param>
    /// <returns></returns>
    private async Task CheckExisitForImport(List<WmsRbLineTask> inputs)
    {
        if (inputs?.Count <= 0)
        /// <summary>
        /// é‡å¤æ€§éªŒè¯
        /// </summary>
        /// <param name="input">验证对象</param>
        /// <param name="isEdit">是否是编辑</param>
        /// <returns></returns>
        private async Task CheckExist( WmsRbLineTask input,bool isEdit=false)
        {
            throw Oops.Oh($"导入数据不能为空");
           


            //没有配置组合校验，不需要验重

           
            //没有配置单独校验，不需要验重
       }

       /// <summary>
        /// æ ¹æ®ç»„合校验和单独校验验证数据是否已存在-导入时验证
        /// </summary>
        /// <param name="inputs"></param>
        /// <returns></returns>
        private async Task CheckExisitForImport(List<WmsRbLineTask> inputs)
        { 
            if (inputs?.Count <= 0)
            {
                throw Oops.Oh($"导入数据不能为空");
            }
            //根据组合校验验证表格中中是否已存在相同数据  
                      






          
           //根据单独校验验证表格中中是否已存在相同数据  
           
           
           
        }
        //根据组合校验验证表格中中是否已存在相同数据  








        //根据单独校验验证表格中中是否已存在相同数据  



    }
    #endregion
     #endregion

}


 LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/Åú´ÎÊý¾Ýµ¼ÈëÄ£°å.xlsx

Binary files differ

 LA24030_LuLiPackageLine_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/»úÆ÷ÈËÈÎÎñ±íµ¼ÈëÄ£°å.xlsx

Binary files differ