From a5acf83d77d56723125d8bdbe06e03db16a7c38d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 12月 2024 18:52:04 +0800
Subject: [PATCH] 将很快
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mesPushPackageCode/index.vue | 7 --
LA24030_LuLiPackageLine_Web/public/config.js | 4
CC/iWareSql/WmsDBModel/mes_push_packagecode.cs | 8 --
CC/iWareModel/Entity/MES/Respone.cs | 5 +
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue | 9 --
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue | 11 ---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs | 6 +-
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/3、DataProcess_BZ21_FinishTask.cs | 3
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs | 10 ---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs | 16 ----
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs | 2
CC/iWareSql/WmsDBModel/wms_rbline_task.cs | 4
CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs | 5 +
CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs | 5 +
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/1、DataProcess_BZ21.cs | 17 ++++-
CC/iWareSql/WmsDBModel/mes_push_papercut.cs | 8 --
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs | 27 ---------
17 files changed, 37 insertions(+), 110 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
index ca1fd9b..6d5a43b 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
@@ -78,12 +78,21 @@
using (WmsDBModel wmsDB = new WmsDBModel())
{
//瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
- var isValidate = TaskHandler.ValidateIssueTaskForBZ21(wmsDB, result);
+ var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result);
if (!isValidate)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
continue;
}
+
+ //澧炲姞鏍￠獙锛屽鏋滀笂涓�涓换鍔pi璺熸湰娆pi涓�鑷达紝灏辨姤閿� 銆怑ditby shaocx,2024-12-03銆�
+ var lastTask = wmsDB.wms_rbline_task.Where(x => x.RbTaskType == (int)RbTaskTypeEnum.鍚堝寘浠诲姟).OrderByDescending(x => x.Id).FirstOrDefault();
+ if (lastTask != null && lastTask.UPI == result)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-PLC閲嶅彂姝や换鍔★紝upi锛歿result}锛岀郴缁熶笉鑳介噸澶嶅鐞�,姝ゆ寰幆缁撴潫";
+ continue;
+ }
+
var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == result).FirstOrDefault();
if (upiObj == null)
{
@@ -95,7 +104,7 @@
var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
papercut.ApiMessage = "";
- papercut.PushNum = 1;
+ papercut.PushNum = 0;
papercut.PushStatus = (int)PushStatusEnum.NotPush;
papercut.CreateTime = papercut.UpdateTime = DateTime.Now;
wmsDB.mes_push_papercut.Add(papercut);
@@ -128,12 +137,12 @@
PackageCode = upiObj.PackageCode,
PushStatus = 0,
PushNum = 0,
- ApiMessage = "寰呮帹閫�",
+ ApiMessage = "",
CreateTime = DateTime.Now,
CreateUserName = "CC",
UpdateTime = DateTime.Now,
UpdateUserName = "CC",
- CreateOrgName = "11"
+
};
//鏂板浠诲姟琛�
var task = new wms_rbline_task()
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs"
index 4b5c6c7..f54eb35 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs"
@@ -53,7 +53,7 @@
var task = wmsDB.wms_rbline_task.Where(x =>
x.TaskNo == obj.R_SurrouondTaskNo.ToString()
&& x.RbTaskType == (int)RbTaskTypeEnum.鍚堝寘浠诲姟
- ).OrderByDescending(x=>x.Id).FirstOrDefault();
+ ).OrderByDescending(x => x.Id).FirstOrDefault();
if (task == null)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()},鏍规嵁 R_InboundNumber:{obj.R_InboundNumber}娌℃湁鎵惧埌宸蹭笅鍙戠殑浠诲姟 ";
@@ -77,6 +77,7 @@
foreach (var item in upiobj)
{
item.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
+ item.AreaCode = (int)AreaCodeEnum.鍖呰绾垮尯鍩�;
}
}
task.TaskStatus = (int)TaskStatusEnum.宸插畬鎴�;
diff --git a/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs b/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs
index 5d034dc..de45a8b 100644
--- a/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs
+++ b/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs
@@ -45,14 +45,15 @@
value.UpdateTime = DateTime.Now;
if (res.iState == 0)
{
+ value.PushNum++;
value.PushStatus = (int)PushStatusEnum.PushSuccess;
- value.ApiMessage = res.message;
+ value.ApiMessage = (res.message ?? "") + (res.errorMessage ?? "");
}
else
{
value.PushStatus = (int)PushStatusEnum.Pushing;
value.PushNum++;
- value.ApiMessage += res.message;
+ value.ApiMessage = (res.message ?? "") + (res.errorMessage ?? "");
if (value.PushNum == 3)
{
value.PushStatus = (int)PushStatusEnum.PushFail;
diff --git a/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs b/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs
index 5ad92fd..5602681 100644
--- a/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs
+++ b/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs
@@ -45,14 +45,15 @@
value.UpdateTime = DateTime.Now;
if (res.iState == 0)
{
+ value.PushNum++;
value.PushStatus = (int)PushStatusEnum.PushSuccess;
- value.ApiMessage = res.message;
+ value.ApiMessage = (res.message ?? "") + (res.errorMessage ?? "");
}
else
{
value.PushStatus = (int)PushStatusEnum.Pushing;
value.PushNum++;
- value.ApiMessage += res.message;
+ value.ApiMessage = (res.message ?? "") + (res.errorMessage ?? "");
if (value.PushNum == 3)
{
value.PushStatus = (int)PushStatusEnum.PushFail;
diff --git a/CC/iWareModel/Entity/MES/Respone.cs b/CC/iWareModel/Entity/MES/Respone.cs
index b585a44..76abf64 100644
--- a/CC/iWareModel/Entity/MES/Respone.cs
+++ b/CC/iWareModel/Entity/MES/Respone.cs
@@ -19,6 +19,11 @@
public string message { get; set; }
/// <summary>
+ /// 杩斿洖娑堟伅
+ /// </summary>
+ public string errorMessage { get; set; }
+
+ /// <summary>
/// 鑷畾涔夎繑鍥�
/// </summary>
public string data { get; set; }
diff --git a/CC/iWareSql/WmsDBModel/mes_push_packagecode.cs b/CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
index 9ac912f..a02e4bb 100644
--- a/CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
+++ b/CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
@@ -21,15 +21,7 @@
public int PushNum { get; set; }
- [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; }
diff --git a/CC/iWareSql/WmsDBModel/mes_push_papercut.cs b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
index a35a915..71cbe2b 100644
--- a/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
+++ b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
@@ -21,8 +21,6 @@
public int PushNum { get; set; }
- [Required]
- [StringLength(50)]
public string ApiMessage { get; set; }
public DateTime? CreateTime { get; set; }
@@ -40,11 +38,5 @@
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/CC/iWareSql/WmsDBModel/wms_rbline_task.cs b/CC/iWareSql/WmsDBModel/wms_rbline_task.cs
index 2ace10d..d0b64a8 100644
--- a/CC/iWareSql/WmsDBModel/wms_rbline_task.cs
+++ b/CC/iWareSql/WmsDBModel/wms_rbline_task.cs
@@ -46,8 +46,6 @@
public int? RbTaskType { get; set; }
- public int? LastNum { get; set; }
-
[StringLength(50)]
public string RbTaskTypeEnumName { get; set; }
@@ -84,5 +82,7 @@
public string UpdateUserName { get; set; }
public bool IsDelete { get; set; }
+
+ public int? LastNum { get; set; }
}
}
diff --git a/LA24030_LuLiPackageLine_Web/public/config.js b/LA24030_LuLiPackageLine_Web/public/config.js
index 086194f..8a3c992 100644
--- a/LA24030_LuLiPackageLine_Web/public/config.js
+++ b/LA24030_LuLiPackageLine_Web/public/config.js
@@ -4,6 +4,6 @@
"VITE_OPEN_CDN": "false",
"VITE_PUBLIC_PATH": "",
"VITE_SM_PUBLIC_KEY": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312",
- //"VITE_API_URL": "http://localhost:5005"
- "VITE_API_URL": "http://172.17.1.111:5005" //姝ｅ紡鍦板潃
+ //"VITE_API_URL": "http://localhost:5005"
+ "VITE_API_URL": "http://172.17.1.111:5005" //姝ｅ紡鍦板潃
}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
index e7088ce..a2b1103 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
@@ -45,14 +45,7 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="鎺ュ彛杩斿洖鍙傛暟" prop="apiMessage">
- <el-input v-model="ruleForm.apiMessage" placeholder="璇疯緭鍏ユ帴鍙ｈ繑鍥炲弬鏁�" maxlength="50" 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="createOrgName">
- <el-input v-model="ruleForm.createOrgName" placeholder="璇疯緭鍏ュ垱寤鸿�呴儴闂ㄥ悕绉�" maxlength="64" show-word-limit clearable />
+ <el-input v-model="ruleForm.apiMessage" placeholder="璇疯緭鍏ユ帴鍙ｈ繑鍥炲弬鏁�" maxlength="-1" show-word-limit clearable />
</el-form-item>
@@ -103,8 +96,6 @@
packageCode: [{required: true, message: '璇疯緭鍏ュ寘瑁呭彿锛�', trigger: 'blur',},],
pushStatus: [{required: true, message: '璇烽�夋嫨鎺ㄩ�佺姸鎬侊紒', trigger: 'change',},],
pushNum: [{required: true, message: '璇疯緭鍏ユ帹閫佹鏁帮紒', trigger: 'blur',},],
- apiMessage: [{required: true, message: '璇疯緭鍏ユ帴鍙ｈ繑鍥炲弬鏁帮紒', trigger: 'blur',},],
- createOrgName: [{required: true, message: '璇疯緭鍏ュ垱寤鸿�呴儴闂ㄥ悕绉帮紒', trigger: 'blur',},],
isDelete: [{required: true, message: '璇烽�夋嫨杞垹闄わ紒', trigger: 'change',},],
});
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
index 251be5a..59c1111 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
@@ -5,7 +5,7 @@
<el-row>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
<el-form-item label="鍏抽敭瀛�">
- <el-input v-model="queryParamsMesPushPackageCode.searchKey" clearable="" placeholder="鍖呰鍙�,鎺ュ彛杩斿洖鍙傛暟,鍒涘缓鑰呴儴闂ㄥ悕绉�,鍒涘缓浜�,淇敼浜�"/>
+ <el-input v-model="queryParamsMesPushPackageCode.searchKey" clearable="" placeholder="鍖呰鍙�,鎺ュ彛杩斿洖鍙傛暟,鍒涘缓浜�,淇敼浜�"/>
</el-form-item>
</el-col>
@@ -39,12 +39,6 @@
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
<el-form-item label="鎺ュ彛杩斿洖鍙傛暟">
<el-input v-model="queryParamsMesPushPackageCode.apiMessage" clearable="" placeholder="璇疯緭鍏ユ帴鍙ｈ繑鍥炲弬鏁�"/>
-
- </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-input v-model="queryParamsMesPushPackageCode.createOrgName" clearable="" placeholder="璇疯緭鍏ュ垱寤鸿�呴儴闂ㄥ悕绉�"/>
</el-form-item>
</el-col>
@@ -84,7 +78,6 @@
<el-table-column prop="pushTime" 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="createOrgName" 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_Web/src/views/main/WmsOrder/mesPushPackageCode/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mesPushPackageCode/index.vue
index 17c6b20..87b0cb1 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mesPushPackageCode/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mesPushPackageCode/index.vue
@@ -33,12 +33,6 @@
</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-input v-model="queryParamsMesPushPackageCode.createOrgName" clearable="" placeholder="璇疯緭鍏ュ垱寤鸿�呴儴闂ㄥ悕绉�"/>
-
- </el-form-item>
- </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
<el-form-item>
<el-button-group style="display: flex; align-items: center;">
@@ -75,7 +69,6 @@
<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="createOrgName" label="鍒涘缓鑰呴儴闂ㄥ悕绉�" show-overflow-tooltip="" />
<el-table-column label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('mesPushPackageCode:update') || auth('mesPushPackageCode:delete')">
<template #default="scope">
<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMesPushPackageCode(scope.row)" v-auth="'mesPushPackageCode:update'"> 缂栬緫 </el-button>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs
index b100c22..1aa5d82 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs
@@ -40,19 +40,7 @@
/// <summary>
/// 鎺ュ彛杩斿洖鍙傛暟
/// </summary>
- [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "鎺ュ彛杩斿洖鍙傛暟", Length = 50)]
- public string ApiMessage { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂↖d
- /// </summary>
- [SugarColumn(ColumnName = "CreateOrgId", ColumnDescription = "鍒涘缓鑰呴儴闂↖d")]
- public long? CreateOrgId { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "CreateOrgName", ColumnDescription = "鍒涘缓鑰呴儴闂ㄥ悕绉�", Length = 64)]
- public string CreateOrgName { get; set; }
+ [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "鎺ュ彛杩斿洖鍙傛暟", Length = 5000)]
+ public string? ApiMessage { get; set; }
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs
index e6a6b45..76fc071 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs
@@ -40,14 +40,14 @@
/// <summary>
/// 鎺ㄩ�佹鏁�
/// </summary>
- [Required]
+ [Required]
[SugarColumn(ColumnName = "PushNum", ColumnDescription = "鎺ㄩ�佹鏁�")]
public int PushNum { get; set; }
/// <summary>
/// 鎺ュ彛杩斿洖鍙傛暟
/// </summary>
- [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "鎺ュ彛杩斿洖鍙傛暟", Length = 50)]
- public string ApiMessage { get; set; }
+ [SugarColumn(ColumnName = "ApiMessage", ColumnDescription = "鎺ュ彛杩斿洖鍙傛暟", Length = 5000)]
+ public string? ApiMessage { get; set; }
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
index 82e4e02..045b99d 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
@@ -34,16 +34,6 @@
public virtual string ApiMessage { get; set; }
/// <summary>
- /// 鍒涘缓鑰呴儴闂↖d
- /// </summary>
- public virtual long? CreateOrgId { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
- /// </summary>
- public virtual string CreateOrgName { get; set; }
-
- /// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public virtual DateTime? CreateTime { get; set; }
@@ -119,11 +109,6 @@
/// </summary>
public string? ApiMessage { get; set; }
- /// <summary>
- /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
- /// </summary>
- public string? CreateOrgName { get; set; }
-
}
/// <summary>
@@ -148,18 +133,6 @@
/// </summary>
[Required(ErrorMessage = "鎺ㄩ�佹鏁颁笉鑳戒负绌�")]
public override int PushNum { get; set; }
-
- /// <summary>
- /// 鎺ュ彛杩斿洖鍙傛暟
- /// </summary>
- [Required(ErrorMessage = "鎺ュ彛杩斿洖鍙傛暟涓嶈兘涓虹┖")]
- public override string ApiMessage { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
- /// </summary>
- [Required(ErrorMessage = "鍒涘缓鑰呴儴闂ㄥ悕绉颁笉鑳戒负绌�")]
- public override string CreateOrgName { get; set; }
/// <summary>
/// 杞垹闄�
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
index aa5271c..97e454d 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
@@ -36,16 +36,6 @@
public string ApiMessage { get; set; }
/// <summary>
- /// 鍒涘缓鑰呴儴闂↖d
- /// </summary>
- public long? CreateOrgId { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
- /// </summary>
- public string CreateOrgName { get; set; }
-
- /// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public DateTime? CreateTime { get; set; }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
index 39b1fba..9845132 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
@@ -128,7 +128,6 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
u.PackageCode.Contains(input.SearchKey.Trim())
|| u.ApiMessage.Contains(input.SearchKey.Trim())
- || u.CreateOrgName.Contains(input.SearchKey.Trim())
|| u.CreateUserName.Contains(input.SearchKey.Trim())
|| u.UpdateUserName.Contains(input.SearchKey.Trim())
)
@@ -136,7 +135,6 @@
.WhereIF(input.PushStatus.HasValue, u => u.PushStatus == input.PushStatus)
.WhereIF(input.PushNum>0, u => u.PushNum == input.PushNum)
.WhereIF(!string.IsNullOrWhiteSpace(input.ApiMessage), u => u.ApiMessage.Contains(input.ApiMessage.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.CreateOrgName), u => u.CreateOrgName.Contains(input.CreateOrgName.Trim()))
.Select<MesPushPackageCodeOutput>();
if(input.PushTimeRange != null && input.PushTimeRange.Count >0)
{
--
Gitblit v1.9.3