From bcde5ea70330cb16597c2320b94b5f1d7cb15752 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 15 二月 2025 15:32:16 +0800
Subject: [PATCH] 优化页面
---
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue | 2
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue | 2
/dev/null | 97 ------------------------
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs | 13 +++
Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue | 34 ++++----
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs | 18 +++-
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs | 4
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 3
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue | 2
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue | 1
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 3
Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/basicinfo/demo_Product/LocationChange.vue | 7 +
12 files changed, 57 insertions(+), 129 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue
index 5359a18..5f2514f 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue
@@ -24,19 +24,19 @@
sortName: "AreaCode"
});
const editFormFields = ref({
- // "toArea": "",
- // "fromArea": "",
- // "barcodeType": "",
+ "toArea": "",
+ "fromArea": "",
+ "barcodeType": "",
"productLine": "",
"inLineNum": "",
"cacheNum":""
});
const editFormOptions = ref([
- // [
- // { "title": "鐩爣搴撳尯", "field": "toArea", type: "text" },
- // { "title": "鏉ユ簮搴撳尯", "field": "fromArea", type: "text" },
- // { "title": "鎵樼洏绫诲瀷", "field": "barcodeType", type: "text" },
- // ],
+ [
+ { "title": "鐩爣搴撳尯", "field": "toArea", type: "text" },
+ { "title": "鏉ユ簮搴撳尯", "field": "fromArea", type: "text" },
+ { "title": "鎵樼洏绫诲瀷", "field": "barcodeType", type: "text" },
+ ],
[
{ "title": "鎵�灞炰骇绾�", "field": "productLine", type: "text" },
{ "title": "鍦ㄩ�旀暟閲�", "field": "inLineNum", type: "text" },
@@ -45,11 +45,11 @@
]);
const searchFormFields = ref({});
const searchFormOptions = ref([
- // [
- // { "title": "鐩爣搴撳尯", "field": "toArea", type: "text" },
- // { "title": "鏉ユ簮搴撳尯", "field": "fromArea", type: "text" },
- // { "title": "鎵樼洏绫诲瀷", "field": "barcodeType", type: "text" },
- // ],
+ [
+ { "title": "鐩爣搴撳尯", "field": "toArea", type: "text" },
+ { "title": "鏉ユ簮搴撳尯", "field": "fromArea", type: "text" },
+ { "title": "鎵樼洏绫诲瀷", "field": "barcodeType", type: "text" },
+ ],
[
{ "title": "鎵�灞炰骇绾�", "field": "productLine", type: "text" },
{ "title": "鍦ㄩ�旀暟閲�", "field": "inLineNum", type: "text" },
@@ -57,10 +57,10 @@
]
]);
const columns = ref([{ field: 'ID', title: '涓婚敭', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
- //{ field: 'toArea', title: '鐩爣搴撳尯', type: 'string', sort: true, width: 110, require: true, align: 'left', sort: true },
- //{ field: 'fromArea', title: '鏉ユ簮搴撳尯', type: 'string', sort: true, width: 110, align: 'left' },
- //{ field: 'barcodeType', title: '鎵樼洏绫诲瀷', type: 'string', sort: true, width: 110, align: 'left' },
- { field: 'productLine', title: '鎵�灞炰骇绾�', type: 'string', sort: true, width: 110, align: 'left',},
+ { field: 'toArea', title: '鐩爣搴撳尯', type: 'string', sort: true, width: 110, require: true, align: 'left', sort: true },
+ { field: 'fromArea', title: '鏉ユ簮搴撳尯', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'barcodeType', title: '鎵樼洏绫诲瀷', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'productLine', title: '鎵�灞炰骇绾�', type: 'string', sort: true, width: 110, align: 'left',bind: { key: "ProductionLine", data: [] } },
{ field: 'inLineNum', title: '鍦ㄩ�旀暟閲�', type: 'int', sort: true, width: 110, align: 'left' },
{ field: 'cacheNum', title: '鍙紦瀛樻暟閲�', type: 'int', sort: true, width: 100, align: 'left' },
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
index 65e0050..03060f2 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -152,7 +152,8 @@
title: "浜х嚎",
type: "string",
width: 70,
- align: "left",
+ align: "left",
+ bind: { key: "ProductionLine", data: [] }
},
{
field: "exceptionMessage",
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
index 5c271ef..a043770 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
@@ -153,6 +153,7 @@
type: "string",
width: 70,
align: "left",
+ bind: { key: "ProductionLine", data: [] }
},
{
field: "exceptionMessage",
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
index 2b93a15..c8dbbc8 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs
@@ -85,17 +85,24 @@
{
return content.Error("褰撳墠鎵樼洏瀛樺湪浠诲姟");
}
-
+ var Station = await _stationManagerRepository.QueryFirstAsync(x => x.stationType == 6 && x.productLine == stationManager.productLine && x.stationArea == stationManager.stationArea);
+ var tasks= await BaseDal.QueryFirstAsync(x => x.TaskType == (int)TaskOutboundTypeEnum.InToOut && x.TargetAddress == stationManager.stationLocation && x.CurrentAddress == Station.stationChildCode);
+ if(tasks!=null)
+ {
+ ConsoleHelper.WriteErrorLine($"銆恵stationManager.stationChildCode}銆戝凡瀛樺湪鐩存帴鍑哄簱浠诲姟浠诲姟");
+ return content.Error($"銆恵stationManager.stationChildCode}銆戝凡瀛樺湪鐩存帴鍑哄簱浠诲姟浠诲姟");
+ }
if (stationManager.stationType == 7)
{
- var Station = await _stationManagerRepository.QueryFirstAsync(x => x.stationType == 6 && x.productLine == stationManager.productLine && x.stationArea == stationManager.stationArea);
- var runTask = await BaseDal.QueryFirstAsync(x => x.SourceAddress == Station.stationChildCode && x.TaskState == (int)TaskInStatusEnum.InNew && x.TaskType == (int)TaskInboundTypeEnum.InTray);
+
+ var runTask = await BaseDal.QueryFirstAsync(x => x.CurrentAddress == Station.stationChildCode && x.TaskState == (int)TaskInStatusEnum.Line_InFinish && x.TaskType == (int)TaskInboundTypeEnum.InTray);
if (runTask != null)
{
runTask.TargetAddress = stationManager.stationLocation;
runTask.NextAddress = stationManager.stationChildCode;
runTask.Grade = 3;
runTask.TaskType = (int)TaskOutboundTypeEnum.InToOut;
+ runTask.TaskState = (int)TaskOutStatusEnum.OutNew;
var config1 = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
var wmsBase1 = config1.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
@@ -106,18 +113,19 @@
}
var wmsIpAddrss1 = wmsBase1 + requestTask1;
- var result1 = await HttpHelper.PostAsync(wmsIpAddrss1, new { palletCode = runTask.PalletCode, EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode }.ToJsonString());
+ var result1 = await HttpHelper.PostAsync(wmsIpAddrss1, new { palletCode = runTask.PalletCode, EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = Station.stationChildCode }.ToJsonString());
content = JsonConvert.DeserializeObject<WebResponseContent>(result1);
if (content.Status)
{
await BaseDal.UpdateDataAsync(runTask);
+ ConsoleHelper.WriteSuccessLine($"銆恵runTask.PalletCode}鐩存帴鍑哄簱鑷充簩灏併��");
return content.OK("鎴愬姛");
}
else
ConsoleHelper.WriteErrorLine(content.Message);
}
else
- ConsoleHelper.WriteErrorLine("鏈壘鍒扮┖鎵樼洏鍏ュ簱浠诲姟");
+ ConsoleHelper.WriteErrorLine($"銆恵Station.stationChildCode}銆戞湭鎵惧埌绌烘墭鐩樺叆搴撲换鍔�");
}
var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/basicinfo/demo_Product/LocationChange.vue b/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/basicinfo/demo_Product/LocationChange.vue
index 052810c..c92303b 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/basicinfo/demo_Product/LocationChange.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/basicinfo/demo_Product/LocationChange.vue
@@ -62,6 +62,7 @@
//鑷畾涔夋寜閽�
customOpen(row) {
this.locationCode = row.locationCode;
+ this.locationId = row.id;
this.model = true;
this.$nextTick(() => {
this.$refs.table.load(null, true);
@@ -71,9 +72,9 @@
loadBefore(params, callBack) {//璋冪敤鍚庡彴鎺ュ彛鍓嶅鐞�
//璁剧疆鏌ヨ鏉′欢鍙傛暟
params.wheres.push({
- name: "locationCode",
- value: this.locationCode,
- displayType: "like"//妯＄硦鏌ヨ
+ name: "locationId",
+ value: this.locationId,
+ displayType: "text"//妯＄硦鏌ヨ
})
//涔熷彲浠ョ粰value璁剧疆鍊硷紝鍚庡彴鑷繁瑙ｆ瀽
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxing.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxing.vue
deleted file mode 100644
index b4c1850..0000000
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxing.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
- <ViewGridDetail :columns="columns" :detailColumns="detailColumns" :title="title" :url="url" :heigth="heigth"
- :paginationHide="paginationHide" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
- :dropdownItems="dropdownItems" :table="table">
-
- </ViewGridDetail>
-</template>
-
-<script>
-import ViewGridDetail from "../../../components/basic/ViewGrid/ViewGridDetail.vue";
-import VolForm from "../../../components/basic/VolForm.vue";
-
-export default {
- components: { VolForm, ViewGridDetail },
- data() {
- return {
- title: "缁勭洏鏁版嵁",
- url: "/api/BoxingInfo/GetPageData",
- dropdownItems: [],
- table: 'DtBoxing',
- columns: [
- { field: 'id', title: '搴撳瓨ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
- { field: 'palletCode', title: '鎵樼洏鏉＄爜', type: 'string', width: 110, align: 'left', sort: true },
- { field: 'locationCode', title: '搴撲綅', type: 'string', width: 110, align: 'left' },
- { field: 'isFull', title: '鏄惁婊＄洏', type: 'bool', width: 110, align: 'left' },
- // { field: 'state', title: '搴撳瓨鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "StockState", data: [] } },
- { field: 'remark', title: '澶囨敞', type: 'string', width: 120, hidden: true, align: 'left' },
- { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },
- ],
- detailColumns: [
- { title: "鐢佃姱搴忓垪鍙�", field: "serialNumber", type: "text" },
- { title: "鐗╂枡缂栧彿", field: "materielCode", type: "text" },
- { title: "鐗╂枡鍚嶇О", field: "materielName", type: "text" },
- { title: "搴撳瓨鐘舵��", field: "status", type: "text" },
- { title: "缁勭洏鏁伴噺", field: "stockQuantity", type: "text" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "text" },
- ],
- searchFormFields: {},
-
- searchFormOptions: [
- [
- { "title": "鎵樼洏鏉＄爜", "field": "palletCode", type: "text" },
- { "title": "鐗╂枡缂栧彿", "field": "materielCode", type: "text" },
- { "title": "搴撳瓨鐘舵��", "field": "status", type: "select", dataKey: "StockState", data: [] },
- { "title": "缁勭洏绫诲瀷", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
- ]
- ],
- tableData: [],
- heigth: 740,
- currentPage1: {
- sort: "",
- order: "desc",
- Foots: "",
- total: 0,
- // 2020.08.29澧炲姞鑷畾涔夊垎椤垫潯澶у皬
- sizes: [30, 60, 100, 120],
- size: 30, // 榛樿鍒嗛〉澶у皬
- Wheres: [],
- page: 1,
- rows: 30,
- }
- };
- },
-
- methods: {
- onInit() {
- this.dropdownItems.unshift({
- name: '鍒犻櫎', //鎸夐挳鍚嶇О
- icon: 'el-icon-document', //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
- type: 'primary', //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
- value: '321', //鎸夐挳鍊�
- onClick: function () {
- let rows = this.table.columns;
- if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- if (rows.length > 1) return this.$error("鍙兘閫夋嫨涓�鏉℃暟鎹�!");
- this.http
- .post("api/DtBoxing/Delete?locationID=" + rows[0].palletCode, "", "鏁版嵁澶勭悊涓�...")
- .then((x) => {
- if (x.status) {
- this.$Message.success('鎴愬姛.');
- this.refresh();
- } else {
- return this.$error(x.message);
- }
- });
- }
- });
-
- },
- },
- created() {
- this.onInit();
- }
-};
-</script>
-
-<style></style>
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue
index 7e83f2e..7570ede 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue
@@ -49,7 +49,7 @@
{ field: 'isFull', title: '鏄惁婊＄洏', type: 'bool', width: 110, align: 'left' },
// { field: 'state', title: '搴撳瓨鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "StockState", data: [] } },
{ field: 'remark', title: '澶囨敞', type: 'string', width: 120, align: 'left' },
- { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left' },
+ { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left' , bind: { key: "ProductionLine", data: [] } },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'int', sort: true, width: 100, align: 'left' },
]);
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
index b6742c8..700b7ac 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
@@ -78,7 +78,7 @@
{ field: 'nextAddress', title: '涓嬩竴浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'targetAddress', title: '鐩爣浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'grade', title: '浼樺厛绾�', type: 'int', width: 60, align: 'left' },
- { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left' },
+ { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left', bind: { key: "ProductionLine", data: [] } },
{ field: 'processCode', title: '宸ュ簭', type: 'string', width: 90, align: 'left' },
{ field: 'dispatchertime', title: '浠诲姟涓嬪彂鏃堕棿', type: 'datetime', width: 150, align: 'left', sort: true },
{ field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left',hidden: true, },
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue
index 50efeb5..3b78f15 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue
@@ -78,7 +78,7 @@
{ field: 'nextAddress', title: '涓嬩竴浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'targetAddress', title: '鐩爣浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'grade', title: '浼樺厛绾�', type: 'int', width: 60, align: 'left' },
- { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left' },
+ { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left', bind: { key: "ProductionLine", data: [] } },
{ field: 'processCode', title: '宸ュ簭', type: 'string', width: 90, align: 'left' },
{ field: 'dispatchertime', title: '浠诲姟涓嬪彂鏃堕棿', type: 'datetime', width: 150, align: 'left', sort: true },
{ field: 'operateType', title: '鎿嶄綔绫诲瀷', type: 'string', width: 110, align: 'left', bind: { key: "operateType", data: [] }},
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs
index 18b4539..3029cce 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs
@@ -62,7 +62,7 @@
CreateDate = DateTime.Now,
Creater = "HK",
CurrentAddress = result.LocationID,
- Grade = 1,
+ Grade = result.IsNG == 1 ? 1 : 2,
Dispatchertime = DateTime.Now,
PalletCode = result.PalletBarcode,
Roadway = location.RoadwayNo,
@@ -79,7 +79,7 @@
WMSTaskDTO taskDTO = new WMSTaskDTO()
{
TaskNum = task.TaskNum.Value,
- Grade = 1,
+ Grade = result.IsNG == 1 ? 1 : 2,
PalletCode = task.PalletCode,
RoadWay = task.Roadway,
SourceAddress = task.SourceAddress,
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index 0653533..a86d379 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -1166,12 +1166,13 @@
var toStation = await _stationManagerRepository.QueryFirstAsync(x => x.stationType == 7 && x.productLine == fromStation.productLine && x.stationArea == fromStation.stationArea);
if (!toStation.IsNullOrEmpty())
{
+ var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.AreaId == int.Parse(fromStation.stationArea));
task.TargetAddress = toStation.stationLocation;
task.NextAddress = toStation.stationChildCode;
task.Grade = 3;
task.TaskType = (int)TaskOutboundTypeEnum.InToOut;
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
- var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
location.LocationStatus = (int)LocationEnum.Free;
await _locationRepository.UpdateDataAsync(location);
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
index c3879dd..6250387 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
@@ -145,6 +145,19 @@
{
throw new Exception("鏈壘鍒板叆搴撶珯鍙伴厤缃�");
}
+ //List<string> strings;
+ //if (areaIn == "GWSC1")
+ //{
+ // strings = new List<string>
+ // {
+ // (boxing.ProductionLine != null && boxing.ProductionLine == "ZJ-7") ? "GWSC1" : "GWSC2"
+ // };
+ //}
+ //else
+ //{
+ // strings = stationManagers.Roadway.Split(',').ToList();
+ //}
+
List<string> strings = stationManagers.Roadway.Split(',').ToList();
var resultContent = await CreateNewTask(input, result.ProductionLine, boxing.ProcessCode, strings);
--
Gitblit v1.9.3