22

schangxiang@126.com

2024-12-17 2905c63ec884f531152a4e97a4d67034e8149d6d

22

 CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs

@@ -40,12 +40,13 @@
                            var value = edm.mes_push_packagecode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
                            if (value != null)
                            {
                                value.PushTime = value.UpdateTime = DateTime.Now;
                                var res = new HTTPService(Mes_Api).getContent<Respone>(Mes_Api_packagecompleted
                                    + "?PackageCode=" + value.PackageCode, Guid.NewGuid(), 10000);
                                value.UpdateTime = DateTime.Now;
                                value.RetTime = DateTime.Now;
                                if (res.iState == 0)
                                {
                                    value.PushTime = value.UpdateTime = DateTime.Now;
                                    value.UpdateUserName = SysGloble.WCSSystem;
                                    value.PushNum++;
                                    value.PushStatus = (int)PushStatusEnum.PushSuccess;
@@ -53,7 +54,6 @@
                                }
                                else
                                {
                                    value.PushTime = value.UpdateTime = DateTime.Now;
                                    value.UpdateUserName = SysGloble.WCSSystem;
                                    value.PushStatus = (int)PushStatusEnum.Pushing;
                                    value.PushNum++;

 CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs

@@ -40,12 +40,13 @@
                            var value = edm.mes_push_papercut.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
                            if (value != null)
                            {
                                value.PushTime = value.UpdateTime = DateTime.Now;
                                var res = new HTTPService(Mes_Api).getContent<Respone>(Mes_Api_papercut
                                    + "?PackageCode=" + value.PackageCode, Guid.NewGuid(), 10000);
                                value.UpdateTime = DateTime.Now;
                                value.RetTime = DateTime.Now;
                                if (res.iState == 0)
                                {
                                    value.PushTime = value.UpdateTime = DateTime.Now;
                                    value.UpdateUserName = SysGloble.WCSSystem;
                                    value.PushNum++;
                                    value.PushStatus = (int)PushStatusEnum.PushSuccess;
@@ -53,15 +54,18 @@
                                }
                                else
                                {
                                    value.PushTime = value.UpdateTime = DateTime.Now;
                                    value.UpdateUserName = SysGloble.WCSSystem;
                                    value.PushStatus = (int)PushStatusEnum.Pushing;
                                    value.PushNum++;
                                    value.ApiMessage = (res.message ?? "") + (res.errorMessage ?? "");

                                    //不再 æ›´æ–°ä¸º å‘送失败。必须要等待  çº¸ç®±æœºè¿”回正确的信息才行！！！【Editby shaocx,2024-12-17】
                                    /*
                                    if (value.PushNum >= 3)
                                    {
                                        value.PushStatus = (int)PushStatusEnum.PushFail;
                                    }
                                    //*/
                                }
                                edm.SaveChanges();
                            }

 CC/iWareSql/WmsDBModel/mes_push_packagecode.cs

@@ -19,6 +19,11 @@

        public DateTime? PushTime { get; set; }

        /// <summary>
        /// è¿”回时间
        /// </summary>
        public DateTime? RetTime { get; set; }

        public int PushNum { get; set; }

        public string ApiMessage { get; set; }

 CC/iWareSql/WmsDBModel/mes_push_papercut.cs

@@ -19,6 +19,12 @@

        public DateTime? PushTime { get; set; }


        /// <summary>
        /// è¿”回时间
        /// </summary>
        public DateTime? RetTime { get; set; }

        public double? Info1 { get; set; }

        public double? Info2 { get; set; }

 LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js

@@ -246,3 +246,10 @@
        data: data
     })
}
export function PartClear(data){ 
    return request({
        url: `/api/WmsOperationTask/PartClear`,
        method: 'post',
        data: data
     })
}

 LA24030_LuLiPackageLine_Pda/manifest.json

@@ -1,8 +1,8 @@
{
    "name" : "LuLiMuYe_Package_Pda",
    "appid" : "__UNI__28D87EB",
    "description" : "2024.12.14",
    "versionName" : "1.0.5",
    "description" : "2024.12.17",
    "versionName" : "1.0.6",
    "versionCode" : "100",
    "transformPx" : false,
    "app-plus" : {

 LA24030_LuLiPackageLine_Pda/pages.json

@@ -218,7 +218,16 @@
                "enablePullDownRefresh": false
            }

        },{
        },
        {
            "path": "pages/takeMaterial/orderpiece/exceptionHandle",
            "style": {
                "navigationBarTitleText": "异常处理",
                "enablePullDownRefresh": false
            }
		
        }
        ,{
            "path": "pages/takeMaterial/orderpiece/orderpiecePo",
            "style": {
                "navigationBarTitleText": "po收货",

 LA24030_LuLiPackageLine_Pda/pages/index/index.vue

@@ -108,6 +108,12 @@
                    src: '../../static/index/cancel.png',
                    pages: '../takeMaterial/orderpiece/orderpiece'
                },
{
                    name: '异常处理',
                    icon: 'icon-shouhuoguanli',
                    src: '../../static/index/cancel.png',
                    pages: '../takeMaterial/orderpiece/exceptionHandle'
                },

                {
                    name: '板件查看',

 LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/exceptionHandle.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,231 @@
<template>
  <view class="overflow" style="padding-bottom: 150rpx">
    <cu-custom bgColor="bg-white" :isBack="true">
      <block slot="backText"> </block>
      <block slot="content">异常处理</block>
    </cu-custom>
	
	
    <u-form
      labelPosition="left"
      label-width="180rpx"
      :model="warehouse"
      ref="warehouseRef"
    >
      <!-- <u-row
        class="border_bottom margin_top10rpx padding_left25rpx"
        style="background-color: #fff"
      >
        <u-col span="12">
          <u-form-item
            label="包装号:"
            prop="packageCode"
            required
            class="uFormItem"
          >
            <u-input
              v-model.trim="warehouse.packageCode"
              @confirm="getContainerData(1)"
              placeholder="请录入或扫码"
              class="width"
              :focus="curFoucus"
            >
            </u-input>
          </u-form-item>
        </u-col>
      </u-row> -->
      <u-row
        class="border_bottom margin_top10rpx padding_left25rpx"
        style="background-color: #fff"
      >
        <u-col span="12">
			
          <u-form-item label="" class="uFormItem">
              <button class=" bg-grey" @click="do_PartClear">269位置清除扫码信息</button>
          </u-form-item>
        </u-col>
      </u-row>
    </u-form>
      </div>
    </u-popup>
  </view>
</template>
<script>
import ButtonModal from "@/components/buttonModal.vue";
import ModalCode from "@/components/ModalCode.vue";
import {
  WmsOperationTaskSetNG,
  PartClear,
  querySingleUpiByUpi,
  getenumDataList,
} from "@/api/putIn/artificial.js";

export default {
  data() {
    return {
      operator: "",
      warehouse: {
        packageCode: "",
        upi: "",
      },
      singlist: [  ], //详情列表
      ordersId: 0, //当前容器绑定的上架单
      rescode: 0,
      resmessage: "",
      options: [
        {
          text: "详情",
          style: {
            backgroundColor: "#fc9f35",
          },
        },
      ],
      detailshow: false,
      materlist: {},
      curFoucus: true,
      timer: null,
      timerSm: null,
      detailableZb: false,
      detailable: false,
      gridFocus: false,
      gridable: true,
      kwbhAllowed: false,
      enumList: [],
      areaCodeEnum: [],
      upiFlagEnum: [],
    };
  },
  components: {
    ButtonModal,
    ModalCode,
  },
  created() {
    getenumDataList({
      EnumName: "UpiStatusEnum",
    }).then((res) => {
      this.enumList = res.result || [];
    });
    getenumDataList({
      EnumName: "AreaCodeEnum",
    }).then((res) => {
      this.areaCodeEnum = res.result || [];
    });
    getenumDataList({
      EnumName: "UpiFlagEnum",
    }).then((res) => {
      this.upiFlagEnum = res.result || [];
    });
  },
  onLoad() {
    this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
  },
  mounted() {},
  methods: {
    getEnumName(value) {
      const name = this.enumList.find((item) => item.value === value);
      return name ? name.name : "";
    },
    getUpiFlagEnumName(value) {
      const name = this.upiFlagEnum.find((item) => item.value === value);
      return name ? name.name : "";
    },
    getAreaCodeEnumName(value) {
      const name = this.areaCodeEnum.find((item) => item.value === value);
      return name ? name.name : "";
    },
    //获取的信息
    getContainerData() {
      if (!this.warehouse.upi) {
        uni.showToast({
          title: "请扫部件条码",
          icon: "none",
          duration: 2000,
        });
        return;
      }
      querySingleUpiByUpi({
        upi: this.warehouse.upi,
      }).then((res) => {
        const result = res.result;
        if (Array.isArray(result) && result.length == 0) {
          uni.showToast({
            title: "数据不存在",
            icon: "none",
            duration: 5000,
          });
          this.singlist = [];
          return;
        }
        this.singlist = res.result;
      });
    },
    // å¦‚果打开一个的时候，不需要关闭其他，则无需实现本方法
    open(index) {
      // å…ˆå°†æ­£åœ¨è¢«æ“ä½œçš„swipeAction标记为打开状态，否则由于props的特性限制，
      // åŽŸæœ¬ä¸º'false'，再次设置为'false'会无效
      this.singlist[index].show = true;
      this.singlist.map((val, idx) => {
        if (index != idx) this.singlist[idx].show = false;
      });
    },
    close(index) {
      this.singlist[index].show = false;
    },
    //物料详情
    longpress(index, eindex) {
      this.materlist = this.singlist[index];
      this.detailshow = true;
    },

    //确认
    do_PartClear() {
      const params = {
      };
      uni.showModal({
        title: "清理269扫码信息",
        content: "是否确认清理269扫码信息？",
        showCancel: true,
        cancelColor: "#333333",
        success: (res) => {
          if (res.confirm) {
            PartClear(params).then((res) => {
              this.rescode = 200;
              this.$refs.resmodal.show = true;
              this.resmessage = "清理269扫码信息成功";
            });
          } else if (res.cancel) {
          }
        },
      });

    },
    rest() {
      this.warehouse.upi = "";
      this.singlist = [];
    },

  
  },
};
</script>
<style lang="scss">
.content {
  height: 500rpx;
  overflow-y: scroll;
  width: 100%;
  padding: 15rpx;
  box-sizing: border-box;

  .content-item {
    padding: 15rpx;
    background-color: #fff;
    margin-bottom: 15rpx;
    border-radius: 8rpx;
    font-size: 32rpx;
  }
}

.bg_item {
  background: #ffebcd !important;
}
</style>

 LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue

@@ -31,7 +31,14 @@
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="推送时间" prop="pushTime">
                            <el-date-picker v-model="ruleForm.pushTime" type="datetime" placeholder="推送时间" />
                            <el-date-picker v-model="ruleForm.pushTime" type="date" 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="retTime">
                            <el-date-picker v-model="ruleForm.retTime" type="date" placeholder="返回时间" />
                            
                        </el-form-item>
                        

 LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue

@@ -26,7 +26,13 @@
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="推送时间">
              <el-date-picker placeholder="请选择推送时间" value-format="YYYY/MM/DD  HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMesPushPackageCode.pushTimeRange" />
              <el-date-picker placeholder="请选择推送时间" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPackageCode.pushTimeRange" />
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="返回时间">
              <el-date-picker placeholder="请选择返回时间" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPackageCode.retTimeRange" />
              
            </el-form-item>
          </el-col>
@@ -45,6 +51,12 @@
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="创建时间">
              <el-date-picker placeholder="请选择创建时间" value-format="YYYY/MM/DD  HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMesPushPackageCode.createTimeRange" />
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
            <el-form-item label="修改时间">
              <el-date-picker placeholder="请选择修改时间" value-format="YYYY/MM/DD  HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMesPushPackageCode.updateTimeRange" />
              
            </el-form-item>
          </el-col>
@@ -81,7 +93,8 @@
              <el-tag>{{ getEnumDesc(scope.row.pushStatus, getEnumPushStatusData_Index)}}</el-tag>
            </template>
          </el-table-column>
         <el-table-column prop="pushTime" label="推送时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
         <el-table-column prop="pushTime" label="推送时间" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
         <el-table-column prop="retTime" label="返回时间" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
        <el-table-column prop="pushNum" label="推送次数"  show-overflow-tooltip="" />
        <el-table-column prop="apiMessage" label="接口返回参数"  show-overflow-tooltip="" />
         <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />

 LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue

@@ -58,6 +58,13 @@
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="返回时间" prop="retTime">
                            <el-date-picker v-model="ruleForm.retTime" type="date" 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="pushNum">
                            <el-input-number v-model="ruleForm.pushNum" placeholder="请输入推送次数" clearable />
                            

 LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue

@@ -49,6 +49,12 @@
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPaperCut">
            <el-form-item label="返回时间">
              <el-date-picker placeholder="请选择返回时间" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPaperCut.retTimeRange" />
              
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPaperCut">
            <el-form-item label="推送次数">
              <el-input-number v-model="queryParamsMesPushPaperCut.pushNum"  clearable="" placeholder="请输入推送次数"/>
              
@@ -109,6 +115,7 @@
            </template>
          </el-table-column>
         <el-table-column prop="pushTime" label="推送时间" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
         <el-table-column prop="retTime" label="返回时间" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />
        <el-table-column prop="pushNum" label="推送次数"  show-overflow-tooltip="" />
        <el-table-column prop="apiMessage" label="接口返回参数"  show-overflow-tooltip="" />
         <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />

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

@@ -21,7 +21,8 @@
                        <el-form-item>
                            <el-button-group style="display: flex; align-items: center">
                                <el-button size="large" type="primary" icon="ele-Search" @click="handleQuery"> æŸ¥è¯¢ </el-button>
                                <el-button size="large" icon="ele-Finished" @click="ConfirmNg"> æ ‡è®°Ng </el-button>
                                <el-button size="large" icon="ele-Finished" @click="ConfirmNg"> æ ‡è®°NG并下线 </el-button>
                                <el-button size="large" icon="ele-Finished" @click="ConfirmNg2"> æ­£å¸¸ä¸‹çº¿ </el-button>
                                <!-- 
                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> é«˜çº§æŸ¥è¯¢ </el-button>
                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> éšè— </el-button> -->
@@ -56,7 +57,10 @@
                    </div>
                </div>
                <ul>

                    <li>
                        <span class="text_left">包装编号:</span>
                        <span class="text_rt">{{ tableData.packageCode }}</span>
                    </li>
                    <li>
                        <span class="text_left">批次号:</span>
                        <span class="text_rt">{{ tableData.planNo }}</span>
@@ -250,7 +254,8 @@


const ConfirmNg = () => {
  ElMessageBox.confirm("是否确认标记Ng？", "提示", {
    tableData.value.isNG =true 
  ElMessageBox.confirm("是否确认标记NG并下线？", "提示", {
    confirmButtonText: "确认",
    cancelButtonText: "取消",
    type: "warning"
@@ -262,7 +267,30 @@
        .then((res) => {
          //debugger
          if (res.data.code == 200) {
            ElMessage.success("标记成功");
            ElMessage.success("标记NG并下线成功");
            tableData.value ={}
          } else {
            ElMessage.error(`失败${res.data.code}:${JSON.stringify(res.data.message)}`);
          }
        });
    })
};

const ConfirmNg2 = () => {
    tableData.value.isNG =false 
  ElMessageBox.confirm("是否确认正常下线？", "提示", {
    confirmButtonText: "确认",
    cancelButtonText: "取消",
    type: "warning"
  })
    .then(() => {
        ConfirmNgF({ 
            ...tableData.value,
        })
        .then((res) => {
          //debugger
          if (res.data.code == 200) {
            ElMessage.success("正常下线成功");
            tableData.value ={}
          } else {
            ElMessage.error(`失败${res.data.code}:${JSON.stringify(res.data.message)}`);

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

@@ -31,6 +31,12 @@
    public DateTime? PushTime { get; set; }

    /// <summary>
    /// è¿”回时间
    /// </summary>
    [SugarColumn(ColumnName = "RetTime", ColumnDescription = "返回时间")]
    public DateTime? RetTime { get; set; }

    /// <summary>
    /// æŽ¨é€æ¬¡æ•°
    /// </summary>
    [Required]

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

@@ -47,6 +47,12 @@
    public DateTime? PushTime { get; set; }

    /// <summary>
    /// è¿”回时间
    /// </summary>
    [SugarColumn(ColumnName = "RetTime", ColumnDescription = "返回时间")]
    public DateTime? RetTime { get; set; }

    /// <summary>
    /// æŽ¨é€æ¬¡æ•°
    /// </summary>
    [Required]

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs

@@ -24,6 +24,11 @@
        public virtual DateTime? PushTime { get; set; }
        
        /// <summary>
        /// è¿”回时间
        /// </summary>
        public virtual DateTime? RetTime { get; set; }
        
        /// <summary>
        /// æŽ¨é€æ¬¡æ•°
        /// </summary>
        public virtual int PushNum { get; set; }
@@ -100,6 +105,15 @@
         /// </summary>
         public List<DateTime?> PushTimeRange { get; set; } 
        /// <summary>
        /// è¿”回时间
        /// </summary>
        public DateTime? RetTime { get; set; }
        
        /// <summary>
         /// è¿”回时间范围
         /// </summary>
         public List<DateTime?> RetTimeRange { get; set; } 
        /// <summary>
        /// æŽ¨é€æ¬¡æ•°
        /// </summary>
        public int? PushNum { get; set; }
@@ -118,6 +132,15 @@
         /// åˆ›å»ºæ—¶é—´èŒƒå›´
         /// </summary>
         public List<DateTime?> CreateTimeRange { get; set; } 
        /// <summary>
        /// ä¿®æ”¹æ—¶é—´
        /// </summary>
        public DateTime? UpdateTime { get; set; }
        
        /// <summary>
         /// ä¿®æ”¹æ—¶é—´èŒƒå›´
         /// </summary>
         public List<DateTime?> UpdateTimeRange { get; set; } 
    }

    /// <summary>

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs

@@ -26,6 +26,11 @@
    public DateTime? PushTime { get; set; }
    
    /// <summary>
    /// è¿”回时间
    /// </summary>
    public DateTime? RetTime { get; set; }
    
    /// <summary>
    /// æŽ¨é€æ¬¡æ•°
    /// </summary>
    public int PushNum { get; set; }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs

@@ -138,12 +138,22 @@
            .Select<MesPushPackageCodeOutput>();
        if(input.PushTimeRange != null && input.PushTimeRange.Count >0)
        {
            DateTime? start= input.PushTimeRange[0].Value;
            query = query.WhereIF(start.HasValue, u => u.PushTime >= start);
            DateTime? start= input.PushTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.PushTime > start);
            if (input.PushTimeRange.Count >1 && input.PushTimeRange[1].HasValue)
            {
                var end = input.PushTimeRange[1].Value;
                query = query.Where(u => u.PushTime <= end);
                var end = input.PushTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.PushTime < end);
            }
        } 
        if(input.RetTimeRange != null && input.RetTimeRange.Count >0)
        {
            DateTime? start= input.RetTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.RetTime > start);
            if (input.RetTimeRange.Count >1 && input.RetTimeRange[1].HasValue)
            {
                var end = input.RetTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.RetTime < end);
            }
        } 
        if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
@@ -156,6 +166,16 @@
                query = query.Where(u => u.CreateTime <= end);
            }
        } 
        if(input.UpdateTimeRange != null && input.UpdateTimeRange.Count >0)
        {
            DateTime? start= input.UpdateTimeRange[0].Value;
            query = query.WhereIF(start.HasValue, u => u.UpdateTime >= start);
            if (input.UpdateTimeRange.Count >1 && input.UpdateTimeRange[1].HasValue)
            {
                var end = input.UpdateTimeRange[1].Value;
                query = query.Where(u => u.UpdateTime <= end);
            }
        } 
        return query;
       }


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutInput.cs

@@ -39,6 +39,11 @@
        public virtual DateTime? PushTime { get; set; }
        
        /// <summary>
        /// è¿”回时间
        /// </summary>
        public virtual DateTime? RetTime { get; set; }
        
        /// <summary>
        /// æŽ¨é€æ¬¡æ•°
        /// </summary>
        public virtual int PushNum { get; set; }
@@ -130,6 +135,15 @@
         /// </summary>
         public List<DateTime?> PushTimeRange { get; set; } 
        /// <summary>
        /// è¿”回时间
        /// </summary>
        public DateTime? RetTime { get; set; }
        
        /// <summary>
         /// è¿”回时间范围
         /// </summary>
         public List<DateTime?> RetTimeRange { get; set; } 
        /// <summary>
        /// æŽ¨é€æ¬¡æ•°
        /// </summary>
        public int? PushNum { get; set; }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutOutput.cs

@@ -41,6 +41,11 @@
    public DateTime? PushTime { get; set; }
    
    /// <summary>
    /// è¿”回时间
    /// </summary>
    public DateTime? RetTime { get; set; }
    
    /// <summary>
    /// æŽ¨é€æ¬¡æ•°
    /// </summary>
    public int PushNum { get; set; }

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs

@@ -146,6 +146,16 @@
                query = query.Where(u => u.PushTime < end);
            }
        } 
        if(input.RetTimeRange != null && input.RetTimeRange.Count >0)
        {
            DateTime? start= input.RetTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.RetTime > start);
            if (input.RetTimeRange.Count >1 && input.RetTimeRange[1].HasValue)
            {
                var end = input.RetTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.RetTime < end);
            }
        } 
        if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
        {
            DateTime? start= input.CreateTimeRange[0].Value;

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/Dto/UnlineForNGPackageInput.cs

@@ -18,6 +18,11 @@
    /// </summary>
    public virtual string Reason { get; set; }

    /// <summary>
    /// æ˜¯å¦NG
    /// </summary>
    public virtual bool IsNG { get; set; }

}



 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs

@@ -117,7 +117,7 @@


            //下线更新 è®¢å•è¡¨æ•°æ® _mesOrderGatherRep
            await UpdateOrderGather(packageObj);
            await UpdateOrderGather(packageObj, true);

            foreach (var quan in quanList)
            {
@@ -397,7 +397,7 @@


    /// <summary>
    /// NG包下线-扫描包号
    /// NG包下线或 æ­£å¸¸åŒ… ä¸‹çº¿ -扫描包号
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
@@ -419,6 +419,13 @@
        //{
        //    throw Oops.Oh("原因不能为空");
        //}
        string _OperRemark = "正常人工下线";
        UpiFlagEnum upiFlagEnum = UpiFlagEnum.正常;
        if (input.IsNG)
        {
            upiFlagEnum = UpiFlagEnum.NG;
            _OperRemark = "NG下线";
        }

        var singlePackage = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
        if (singlePackage == null)
@@ -431,7 +438,7 @@
            throw Oops.Oh($"包号{input.PackageCode}已经下线");
        }

        singlePackage.UpiFlag = UpiFlagEnum.NG;
        singlePackage.UpiFlag = upiFlagEnum;
        singlePackage.UpdateTime = DateTime.Now;
        singlePackage.UpiStatus = UpiStatusEnum.已下线;
        singlePackage.AreaCode = AreaCodeEnum.下线区域;
@@ -462,7 +469,7 @@
            wmsRecordUpi.CreateTime = DateTime.Now;
            wmsRecordUpi.CreateUserName = _cretaorName;
            wmsRecordUpi.Location = "";
            wmsRecordUpi.OperRemark = "NG下线";
            wmsRecordUpi.OperRemark = _OperRemark;
            await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);

            WmsRecordUpiNg wmsRecordUpiNg = new WmsRecordUpiNg();
@@ -470,7 +477,7 @@
            wmsRecordUpiNg.Id = Yitter.IdGenerator.YitIdHelper.NextId();
            wmsRecordUpiNg.CreateTime = DateTime.Now;
            wmsRecordUpiNg.CreateUserName = _cretaorName;
            wmsRecordUpiNg.OperRemark = "NG下线";
            wmsRecordUpiNg.OperRemark = _OperRemark;
            await _wmsRecordUpiNgRep.InsertAsync(wmsRecordUpiNg);


@@ -492,14 +499,14 @@
        }

        //下线更新 è®¢å•è¡¨æ•°æ® _mesOrderGatherRep
        await UpdateOrderGather(singlePackage);
        await UpdateOrderGather(singlePackage, input.IsNG);


        WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
        wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>();
        wmsRecordPackage.Id = Yitter.IdGenerator.YitIdHelper.NextId();
        wmsRecordPackage.Location = "";
        wmsRecordPackage.OperRemark = "NG下线";
        wmsRecordPackage.OperRemark = _OperRemark;
        wmsRecordPackage.CreateTime = DateTime.Now;
        wmsRecordPackage.CreateUserName = _cretaorName;
        await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);
@@ -515,7 +522,7 @@
    /// </summary>
    /// <param name="singlePackage"></param>
    /// <returns></returns>
    private async Task UpdateOrderGather(Mes_Package_Gather singlePackage)
    private async Task UpdateOrderGather(Mes_Package_Gather singlePackage, bool isNG)
    {
        //下线更新 è®¢å•è¡¨æ•°æ® _mesOrderGatherRep
        bool isAdd = false;
@@ -533,11 +540,22 @@
        var packageList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).ToListAsync();
        order.PackageNum = packageList.Count();
        order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.已下线).Count() + 1;
        order.NgPackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.已下线 && x.UpiFlag == UpiFlagEnum.NG).Count() + 1;

        order.NgPackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.已下线 && x.UpiFlag == UpiFlagEnum.NG).Count();
        if (isNG)
        {
            order.NgPackageNum = order.NgPackageNum + 1;
        }

        order.NoUnLinePackageNum = order.PackageNum - order.UnLinePackageNum;

        order.AllPackageArea = packageList.Sum(x => Convert.ToDecimal(x.Info13));
        order.ScanPackageArea = packageList.Where(x => x.UpiStatus == UpiStatusEnum.已下线 && x.UpiFlag == (int)UpiFlagEnum.正常).Sum(x => Convert.ToDecimal(x.Info13));
        if (isNG == false)
        {
            order.ScanPackageArea = order.ScanPackageArea + Convert.ToDecimal(singlePackage.Info13);
        }

        order.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea;
        if (isAdd)
        {
@@ -733,7 +751,6 @@
    [HttpPost]
    [ApiDescriptionSettings(Name = "PartClear")]
    [Description("WmsOperationTask/PartClear")]
    [UnitOfWork]
    public async Task PartClear()
    {
        //模式判断