From dd53f4d569ed4e48bba9b0912353d54112876342 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 29 11月 2024 14:48:38 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs | 12 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs | 89 ++++++++++++
CC/iWareSql/WmsDBModel/mes_package_linequeue.cs | 20 +-
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue | 41 +++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs | 25 +++
CC/iWareSql/WmsDBModel/mes_package_gather.cs | 17 +-
CC/iWareSql/WmsDBModel/mes_order_gather.cs | 45 ++++++
CC/iWareSql/WmsDBModel/mes_package_unline_record.cs | 18 +-
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs | 31 ++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs | 4
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs | 10
CC/iWareSql/WmsDBModel/WmsDBModel.cs | 1
CC/iWareSql/WmsDBModel/mes_push_papercut.cs | 18 -
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue | 40 +++++
14 files changed, 327 insertions(+), 44 deletions(-)
diff --git a/CC/iWareSql/WmsDBModel/WmsDBModel.cs b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
index 7a01456..fca626a 100644
--- a/CC/iWareSql/WmsDBModel/WmsDBModel.cs
+++ b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
@@ -17,6 +17,7 @@
public virtual DbSet<GoViewPro> GoViewPro { get; set; }
public virtual DbSet<GoViewProData> GoViewProData { get; set; }
public virtual DbSet<mes_batchOrderUPI_new> mes_batchOrderUPI_new { get; set; }
+ public virtual DbSet<mes_order_gather> mes_order_gather { get; set; }
public virtual DbSet<mes_package_gather> mes_package_gather { get; set; }
public virtual DbSet<mes_package_linequeue> mes_package_linequeue { get; set; }
public virtual DbSet<mes_package_unline_record> mes_package_unline_record { get; set; }
diff --git a/CC/iWareSql/WmsDBModel/mes_order_gather.cs b/CC/iWareSql/WmsDBModel/mes_order_gather.cs
new file mode 100644
index 0000000..907212b
--- /dev/null
+++ b/CC/iWareSql/WmsDBModel/mes_order_gather.cs
@@ -0,0 +1,45 @@
+namespace iWareSql.WmsDBModel
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel.DataAnnotations;
+ using System.ComponentModel.DataAnnotations.Schema;
+ using System.Data.Entity.Spatial;
+
+ public partial class mes_order_gather
+ {
+ [DatabaseGenerated(DatabaseGeneratedOption.None)]
+ public long Id { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
+
+ public bool? IsKitting { get; set; }
+
+ public int PackageNum { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? UpdateTime { get; set; }
+
+ public long? CreateUserId { get; set; }
+
+ [StringLength(64)]
+ public string CreateUserName { get; set; }
+
+ public long? UpdateUserId { get; set; }
+
+ [StringLength(64)]
+ public string UpdateUserName { get; set; }
+
+ public bool IsDelete { get; set; }
+ }
+}
diff --git a/CC/iWareSql/WmsDBModel/mes_package_gather.cs b/CC/iWareSql/WmsDBModel/mes_package_gather.cs
index e032b15..d3a0f82 100644
--- a/CC/iWareSql/WmsDBModel/mes_package_gather.cs
+++ b/CC/iWareSql/WmsDBModel/mes_package_gather.cs
@@ -13,22 +13,24 @@
[Required]
[StringLength(50)]
+ public string PackageCode { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ [Required]
+ [StringLength(50)]
public string PlanNo { get; set; }
[Required]
[StringLength(50)]
public string OrderId { get; set; }
- [StringLength(60)]
- public string Info5 { get; set; }
-
public int? AreaCode { get; set; }
public int UpiStatus { get; set; }
- [Required]
- [StringLength(50)]
- public string PackageCode { get; set; }
+ public bool? IsQiBao { get; set; }
public double? Info1 { get; set; }
@@ -50,9 +52,6 @@
[StringLength(60)]
public string Info10 { get; set; }
-
- [StringLength(60)]
- public string Info9 { get; set; }
[StringLength(60)]
public string Info11 { get; set; }
diff --git a/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs b/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs
index d5d5455..209d581 100644
--- a/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs
+++ b/CC/iWareSql/WmsDBModel/mes_package_linequeue.cs
@@ -13,22 +13,22 @@
[Required]
[StringLength(50)]
+ public string PackageCode { get; set; }
+
+ [StringLength(60)]
+ public string Info5 { get; set; }
+
+ [Required]
+ [StringLength(50)]
public string PlanNo { get; set; }
[Required]
[StringLength(50)]
public string OrderId { get; set; }
- [StringLength(60)]
- public string Info5 { get; set; }
-
public int? AreaCode { get; set; }
public int UpiStatus { get; set; }
-
- [Required]
- [StringLength(50)]
- public string PackageCode { get; set; }
public double? Info1 { get; set; }
@@ -50,9 +50,6 @@
[StringLength(60)]
public string Info10 { get; set; }
-
- [StringLength(60)]
- public string Info9 { get; set; }
[StringLength(60)]
public string Info11 { get; set; }
@@ -78,5 +75,8 @@
public string UpdateUserName { get; set; }
public bool IsDelete { get; set; }
+
+ [StringLength(60)]
+ public string Info9 { get; set; }
}
}
diff --git a/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs b/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
index 4188c52..3c256f1 100644
--- a/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
+++ b/CC/iWareSql/WmsDBModel/mes_package_unline_record.cs
@@ -13,18 +13,18 @@
[Required]
[StringLength(50)]
- public string PlanNo { get; set; }
-
- [Required]
- [StringLength(50)]
- public string OrderId { get; set; }
+ public string PackageCode { get; set; }
[StringLength(60)]
public string Info5 { get; set; }
[Required]
[StringLength(50)]
- public string PackageCode { get; set; }
+ public string PlanNo { get; set; }
+
+ [Required]
+ [StringLength(50)]
+ public string OrderId { get; set; }
public double? Info1 { get; set; }
@@ -46,9 +46,6 @@
[StringLength(60)]
public string Info10 { get; set; }
-
- [StringLength(60)]
- public string Info9 { get; set; }
[StringLength(60)]
public string Info11 { get; set; }
@@ -77,5 +74,8 @@
public string UpdateUserName { get; set; }
public bool IsDelete { get; set; }
+
+ [StringLength(60)]
+ public string Info9 { get; set; }
}
}
diff --git a/CC/iWareSql/WmsDBModel/mes_push_papercut.cs b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
index eb45ef9..a35a915 100644
--- a/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
+++ b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
@@ -15,12 +15,6 @@
[StringLength(50)]
public string PackageCode { get; set; }
- public double? Info1 { get; set; }
-
- public double? Info2 { get; set; }
-
- public double? Info3 { get; set; }
-
public int PushStatus { get; set; }
public DateTime? PushTime { get; set; }
@@ -30,12 +24,6 @@
[Required]
[StringLength(50)]
public string ApiMessage { get; set; }
-
- public long? CreateOrgId { get; set; }
-
- [Required]
- [StringLength(64)]
- public string CreateOrgName { get; set; }
public DateTime? CreateTime { get; set; }
@@ -52,5 +40,11 @@
public string UpdateUserName { get; set; }
public bool IsDelete { get; set; }
+
+ public double? Info1 { get; set; }
+
+ public double? Info2 { get; set; }
+
+ public double? Info3 { get; set; }
}
}
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue
index cb1cf3e..b70cd52 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/component/editDialog.vue
@@ -47,6 +47,41 @@
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="宸蹭笅绾垮寘鏁�" prop="unLinePackageNum">
+ <el-input-number v-model="ruleForm.unLinePackageNum" placeholder="璇疯緭鍏ュ凡涓嬬嚎鍖呮暟" clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鏈笅绾垮寘鏁�" prop="noUnLinePackageNum">
+ <el-input-number v-model="ruleForm.noUnLinePackageNum" placeholder="璇疯緭鍏ユ湭涓嬬嚎鍖呮暟" clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鎬诲寘瑁呴潰绉�" prop="allPackageArea">
+ <el-input v-model="ruleForm.allPackageArea" placeholder="璇疯緭鍏ユ�诲寘瑁呴潰绉�" maxlength="18" show-word-limit clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="宸叉壂鎻忓寘瑁呴潰绉�" prop="scanPackageArea">
+ <el-input v-model="ruleForm.scanPackageArea" placeholder="璇疯緭鍏ュ凡鎵弿鍖呰闈㈢Н" maxlength="18" show-word-limit clearable />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="鏈壂鎻忓寘瑁呴潰绉�" prop="noScanPackageArea">
+ <el-input v-model="ruleForm.noScanPackageArea" placeholder="璇疯緭鍏ユ湭鎵弿鍖呰闈㈢Н" maxlength="18" show-word-limit clearable />
+
+ </el-form-item>
+
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -90,6 +125,11 @@
planNo: [{required: true, message: '璇疯緭鍏ユ壒娆″彿锛�', trigger: 'blur',},],
orderId: [{required: true, message: '璇疯緭鍏ヨ鍗曞彿锛�', trigger: 'blur',},],
packageNum: [{required: true, message: '璇疯緭鍏ュ寘鏁帮紒', trigger: 'blur',},],
+ unLinePackageNum: [{required: true, message: '璇疯緭鍏ュ凡涓嬬嚎鍖呮暟锛�', trigger: 'blur',},],
+ noUnLinePackageNum: [{required: true, message: '璇疯緭鍏ユ湭涓嬬嚎鍖呮暟锛�', trigger: 'blur',},],
+ allPackageArea: [{required: true, message: '璇疯緭鍏ユ�诲寘瑁呴潰绉紒', trigger: 'blur',},],
+ scanPackageArea: [{required: true, message: '璇疯緭鍏ュ凡鎵弿鍖呰闈㈢Н锛�', trigger: 'blur',},],
+ noScanPackageArea: [{required: true, message: '璇疯緭鍏ユ湭鎵弿鍖呰闈㈢Н锛�', trigger: 'blur',},],
isDelete: [{required: true, message: '璇烽�夋嫨杞垹闄わ紒', trigger: 'change',},],
});
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue
index a94fb95..3824935 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_Order_Gather/index.vue
@@ -42,6 +42,42 @@
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="宸蹭笅绾垮寘鏁�">
+ <el-input-number v-model="queryParamsMes_Order_Gather.unLinePackageNum" clearable="" placeholder="璇疯緭鍏ュ凡涓嬬嚎鍖呮暟"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鏈笅绾垮寘鏁�">
+ <el-input-number v-model="queryParamsMes_Order_Gather.noUnLinePackageNum" clearable="" placeholder="璇疯緭鍏ユ湭涓嬬嚎鍖呮暟"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鎬诲寘瑁呴潰绉�">
+ <el-input v-model="queryParamsMes_Order_Gather.allPackageArea" clearable="" placeholder="璇疯緭鍏ユ�诲寘瑁呴潰绉�"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="宸叉壂鎻忓寘瑁呴潰绉�">
+ <el-input v-model="queryParamsMes_Order_Gather.scanPackageArea" clearable="" placeholder="璇疯緭鍏ュ凡鎵弿鍖呰闈㈢Н"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鏈壂鎻忓寘瑁呴潰绉�">
+ <el-input v-model="queryParamsMes_Order_Gather.noScanPackageArea" clearable="" placeholder="璇疯緭鍏ユ湭鎵弿鍖呰闈㈢Н"/>
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_Order_Gather">
+ <el-form-item label="鍒涘缓鏃堕棿">
+ <el-date-picker placeholder="璇烽�夋嫨鍒涘缓鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMes_Order_Gather.createTimeRange" />
+
+ </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;">
@@ -81,6 +117,11 @@
</el-table-column>
<el-table-column prop="packageNum" label="鍖呮暟" show-overflow-tooltip="" />
+ <el-table-column prop="unLinePackageNum" label="宸蹭笅绾垮寘鏁�" show-overflow-tooltip="" />
+ <el-table-column prop="noUnLinePackageNum" label="鏈笅绾垮寘鏁�" show-overflow-tooltip="" />
+ <el-table-column prop="allPackageArea" label="鎬诲寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="scanPackageArea" label="宸叉壂鎻忓寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="noScanPackageArea" label="鏈壂鎻忓寘瑁呴潰绉�" show-overflow-tooltip="" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
<el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs
index 990b241..c5f728e 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Order_Gather.cs
@@ -41,5 +41,36 @@
[SugarColumn(ColumnName = "PackageNum", ColumnDescription = "鍖呮暟")]
public int PackageNum { get; set; }
+ /// <summary>
+ /// 宸蹭笅绾垮寘鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "UnLinePackageNum", ColumnDescription = "宸蹭笅绾垮寘鏁�")]
+ public int UnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鏈笅绾垮寘鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "NoUnLinePackageNum", ColumnDescription = "鏈笅绾垮寘鏁�")]
+ public int NoUnLinePackageNum { get; set; }
+
+
+ /// <summary>
+ /// 鎬诲寘瑁呴潰绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "AllPackageArea", ColumnDescription = "鎬诲寘瑁呴潰绉�")]
+ public decimal AllPackageArea { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "ScanPackageArea", ColumnDescription = "宸叉壂鎻忓寘瑁呴潰绉�")]
+ public decimal ScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鏈壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "NoScanPackageArea", ColumnDescription = "鏈壂鎻忓寘瑁呴潰绉�")]
+ public decimal NoScanPackageArea { get; set; }
+
}
}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
index b7f323f..5d69793 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
@@ -45,6 +45,10 @@
throw Oops.Oh("鏈鏈夐噸澶嶇殑UPI锛侀噸澶嶅彿涓�:" + dit.Key + ",閲嶅鏉℃暟:" + dit.Value);
}
+ //鍚屼竴涓猆PI鍙兘灞炰簬涓�涓� 鎵规鍙�+璁㈠崟鍙�
+ //浼氬瓨鍦� 涓�涓壒娆″彿锛屽涓鍗曞彿鐨勬儏鍐�
+ //浼氬瓨鍦� 涓�涓鍗曞彿锛屽涓壒娆″彿鐨勬儏鍐�
+
//鎸夌収鎵规鍙�+璁㈠崟鍙峰垹闄�
List<string> packageList = new List<string>();
input.ForEach(x => packageList.Add(x.PlanNo + "_" + x.OrderId));//upis鏄紶杩囨潵鐨剈pi瀛楁闆嗗悎
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs
index 6ec190c..ee955e5 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherInput.cs
@@ -34,6 +34,31 @@
public virtual int PackageNum { get; set; }
/// <summary>
+ /// 宸蹭笅绾垮寘鏁�
+ /// </summary>
+ public virtual int UnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鏈笅绾垮寘鏁�
+ /// </summary>
+ public virtual int NoUnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鎬诲寘瑁呴潰绉�
+ /// </summary>
+ public virtual decimal AllPackageArea { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public virtual decimal ScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鏈壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public virtual decimal NoScanPackageArea { get; set; }
+
+ /// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public virtual DateTime? CreateTime { get; set; }
@@ -105,6 +130,40 @@
/// </summary>
public int? PackageNum { get; set; }
+ /// <summary>
+ /// 宸蹭笅绾垮寘鏁�
+ /// </summary>
+ public int? UnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鏈笅绾垮寘鏁�
+ /// </summary>
+ public int? NoUnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鎬诲寘瑁呴潰绉�
+ /// </summary>
+ public decimal? AllPackageArea { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public decimal? ScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鏈壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public decimal? NoScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿鑼冨洿
+ /// </summary>
+ public List<DateTime?> CreateTimeRange { get; set; }
}
/// <summary>
@@ -131,6 +190,36 @@
public override int PackageNum { get; set; }
/// <summary>
+ /// 宸蹭笅绾垮寘鏁�
+ /// </summary>
+ [Required(ErrorMessage = "宸蹭笅绾垮寘鏁颁笉鑳戒负绌�")]
+ public override int UnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鏈笅绾垮寘鏁�
+ /// </summary>
+ [Required(ErrorMessage = "鏈笅绾垮寘鏁颁笉鑳戒负绌�")]
+ public override int NoUnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鎬诲寘瑁呴潰绉�
+ /// </summary>
+ [Required(ErrorMessage = "鎬诲寘瑁呴潰绉笉鑳戒负绌�")]
+ public override decimal AllPackageArea { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ [Required(ErrorMessage = "宸叉壂鎻忓寘瑁呴潰绉笉鑳戒负绌�")]
+ public override decimal ScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鏈壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ [Required(ErrorMessage = "鏈壂鎻忓寘瑁呴潰绉笉鑳戒负绌�")]
+ public override decimal NoScanPackageArea { get; set; }
+
+ /// <summary>
/// 杞垹闄�
/// </summary>
[Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs
index 98044ec..8766f3b 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Dto/Mes_Order_GatherOutput.cs
@@ -36,6 +36,31 @@
public int PackageNum { get; set; }
/// <summary>
+ /// 宸蹭笅绾垮寘鏁�
+ /// </summary>
+ public int UnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鏈笅绾垮寘鏁�
+ /// </summary>
+ public int NoUnLinePackageNum { get; set; }
+
+ /// <summary>
+ /// 鎬诲寘瑁呴潰绉�
+ /// </summary>
+ public decimal AllPackageArea { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public decimal ScanPackageArea { get; set; }
+
+ /// <summary>
+ /// 鏈壂鎻忓寘瑁呴潰绉�
+ /// </summary>
+ public decimal NoScanPackageArea { get; set; }
+
+ /// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public DateTime? CreateTime { get; set; }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs
index 979ece1..f5b22c7 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_Order_Gather/Mes_Order_GatherService.cs
@@ -137,7 +137,19 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.OrderId), u => u.OrderId.Contains(input.OrderId.Trim()))
.WhereIF(input.IsKitting.HasValue, u => u.IsKitting == input.IsKitting)
.WhereIF(input.PackageNum>0, u => u.PackageNum == input.PackageNum)
+ .WhereIF(input.UnLinePackageNum>0, u => u.UnLinePackageNum == input.UnLinePackageNum)
+ .WhereIF(input.NoUnLinePackageNum>0, u => u.NoUnLinePackageNum == input.NoUnLinePackageNum)
.Select<Mes_Order_GatherOutput>();
+ if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
+ {
+ DateTime? start= input.CreateTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.CreateTime >= start);
+ if (input.CreateTimeRange.Count >1 && input.CreateTimeRange[1].HasValue)
+ {
+ var end = input.CreateTimeRange[1].Value;
+ query = query.Where(u => u.CreateTime <= end);
+ }
+ }
return query;
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
index c503936..6ce3158 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
@@ -119,7 +119,7 @@
{
throw Oops.Oh($"娌℃湁閰嶇疆 鍒ゆ柇榻愬 鍊�");
}
- if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value!="鏃�")
+ if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value != "鏃�")
{
throw Oops.Oh($"鍒ゆ柇榻愬鍊煎凡缁忓瓨鍦ㄥ�納sysConfig.Value},涓嶅厑璁告搷浣�");
}
@@ -172,12 +172,14 @@
/// <param name="input"></param>
/// <returns></returns>
[HttpGet]
- [ApiDescriptionSettings(Name = "KittingList")]
- [Description("WmsStockQuan/KittingList")]
- public async Task<List<Mes_Order_Gather>> KittingList([FromQuery] KittingListInput input)
+ [ApiDescriptionSettings(Name = "QueryNoKittingList")]
+ [Description("WmsOperationTask/QueryNoKittingList")]
+ public async Task<List<Mes_Order_Gather>> QueryNoKittingList([FromQuery] KittingListInput input)
{
var list = await _mesOrderGatherRep.AsQueryable()
.WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
+ .Where(x=>((DateTime)x.CreateTime).ToString("yyyyMMdd")==DateTime.Now.ToString("yyyyMMdd"))
.Where(x => x.IsKitting == false)
.OrderBy(g => g.Id)
.ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List
--
Gitblit v1.9.3