From b4fb87eceedef213a602afa59aeb104a0c6c08d7 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 19 十一月 2024 10:15:34 +0800
Subject: [PATCH] 同步
---
Code Management/WMS/WIDESEA_WMSClient/src/views/Home.vue | 166 ---------------------------
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 19 ++
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs | 4
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue | 6
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs | 6 +
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs | 14 +
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs | 6
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceProtocolService.cs | 5
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs | 15 +
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine_After.cs | 2
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs | 1
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs | 2
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs | 2
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs | 8
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/MCS/IMCSService.cs | 2
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs | 4
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue | 82 +++++++++++++
17 files changed, 150 insertions(+), 194 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine_After.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine_After.cs
index 6be648e..f35365d 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine_After.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine_After.cs
@@ -220,7 +220,7 @@
public T ReadCustomer<T>(string deviceChildCode) where T : IDataTransfer, new()
{
if (!IsConnected) throw new Exception($"閫氳杩炴帴閿欒锛岃妫�鏌ョ綉缁�");
- DeviceProDTO? devicePro = _deviceProDTOs.Where(x => x.DeviceProParamType == "ReadDeviceCommand" && x.DeviceChildCode == deviceChildCode).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ DeviceProDTO? devicePro = _deviceProDTOs.Where(x => x.DeviceProParamType == "DeviceCommand" && x.DeviceChildCode == deviceChildCode).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
if (devicePro == null)
{
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceProtocolService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceProtocolService.cs
index 82c0830..ef65b50 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceProtocolService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceProtocolService.cs
@@ -79,5 +79,10 @@
//saveModel.MainData[""]
return base.AddData(saveModel);
}
+
+ //public WebResponseContent InsertProtocol_Line(int PLCid,string ChildCode,)
+ //{
+
+ //}
}
}
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
index 99de6e7..97fabec 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
@@ -142,8 +142,6 @@
_taskService.UpdateTaskStatusToNext(inTask);
}
-
-
}
/// <summary>
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs
index 34d8573..6bd191d 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs
@@ -52,9 +52,9 @@
public short Reserved3 { get; set; }
public byte InteractiveSignal { get; set; }
public short HasPallet { get; set; }
- public short ConveyorLineAlarm { get; set; }
- public short Reserved4 { get; set; }
- public short Reserved5 { get; set; }
+ //public ushort ConveyorLineAlarm { get; set; }
+ //public short Reserved4 { get; set; }
+ //public short Reserved5 { get; set; }
}
//public class ConveyorLineTaskCommandWrite : DeviceCommand
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/Home.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/Home.vue
index eca390e..63c0a05 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/Home.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/Home.vue
@@ -1,59 +1,6 @@
<template>
<div class="home-contianer">
- <div class="h-top">
- <div class="h-top-left" id="h-chart1">left</div>
- <div class="h-top-center">
- <div class="n-item">
- <div
- @click="open(item)"
- class="item"
- :class="'item' + (index + 1)"
- v-for="(item, index) in center"
- :key="index"
- >
- <i
- style="font-size: 30px; padding-bottom: 10px"
- :class="item.icon"
- :size="20"
- ></i>
- <br />
- {{ item.title }}
- </div>
- </div>
- </div>
- <div class="h-top-right task-table">
- <h3 class="h3">#妗嗘灦Vue3.x鐗堟湰鍙樻洿璇存槑</h3>
- <table border="0" cellspacing="0" cellpadding="0">
- <tr v-for="(row, index) in list" :key="index">
- <td>{{ index + 1 }}</td>
- <td>{{ row.desc }}</td>
- </tr>
- </table>
- </div>
- </div>
- <div class="h-chart">
- <div class="h-left-grid">
- <div class="item" v-for="(item, index) in grid" :key="index">
- <div class="icon-text">
- <i :class="item.icon"></i>
- <span class="name">{{ item.name }}</span>
- </div>
- <div class="desc">{{ item.desc }}</div>
- </div>
- </div>
- <div id="h-chart2"></div>
- <div id="h-chart3"></div>
- </div>
- <div style="display: flex;">
- <div
- id="h-chart4"
- style="height: 350px; background: white; flex: 1;padding-top:15px;"
- ></div>
- <div
- id="h-chart5"
- style="height: 350px; background: white; flex: 1;padding-top:15px;"
- ></div>
- </div>
+
</div>
</template>
<script>
@@ -65,98 +12,9 @@
components: {},
data() {
return {
- center: [
- {
- title: 'GitHub',
- icon: 'el-icon-set-up',
- url: 'https://github.com/cq-panda/Vue.NetCore'
- },
- {
- title: 'Gitee',
- icon: 'el-icon-turn-off',
- url: 'https://gitee.com/x_discoverer/Vue.NetCore'
- },
- {
- title: '妗嗘灦Vue2鐗堟湰',
- icon: 'el-icon-reading',
- url: 'http://v2.volcore.xyz'
- },
-
- {
- title: '妗嗘灦瑙嗛',
- icon: 'el-icon-document',
- url: 'https://www.cctalk.com/m/group/90268531'
- },
-
- {
- title: '灏忕▼搴�/app/h5',
- icon: 'el-icon-chat-line-round',
- url: 'http://v2.volcore.xyz/app/guide'
- },
- {
- title: 'QQ4缇わ細959924606',
- icon: 'el-icon-chat-dot-round',
- url: 'https://qm.qq.com/cgi-bin/qm/qr?k=YRZBbf64qsUeEmh24I65u2aIZFn2C-Ha&jump_from=webapi&qr=1'
- }
- ],
+
n: 90,
value1: '1',
- applicants: {
- //鎶ュ悕淇℃伅
- day: 20, //鏈棩
- week: 150, //鏈懆
- month: 1200, //鏈湀
- totalBoy: 800,
- totalGirl: 890,
- taotal: 1690
- }, //鎶ュ悕淇℃伅
- list: [
- { desc: '妗嗘灦2.x鐗堟湰涓嶆敮鎸佺洿鎺ュ崌绾ue3鐗堟湰(浠ｇ爜鐢熸垚鍣ㄥ凡淇敼)' },
- { desc: '妗嗘灦浣跨敤鐨凟lement Plus缁勪欢锛岀Щ闄や簡Iview缁勪欢鐨勪緷璧�' },
- { desc: '妗嗘灦鍐呴儴缁勪欢鍏ㄩ儴閲嶆柊浼樺寲,鐩告瘮2.x鐗堟湰棣栧睆澶у皬鍑忓皯60%' },
- { desc: '妗嗘灦Vue2鐗堟湰浼氱户缁淮鎶�,骞朵笌Vue3鐗堟湰鍚屾鏇存柊,璇锋斁蹇冧娇鐢�' },
- { desc: '妗嗘灦Vue2銆乂ue3鐗堟湰寮�鍙戞枃妗ｄ竴鑷�(宸紓閮ㄥ垎鏂囨。浼氬娉ㄨ鏄�)' },
- //{ desc: "鑻ユ鍦ㄤ娇鐢╒ue2妗嗘灦鐗堟湰缁х画浣跨敤鍗冲彲;鍏朵粬寤鸿浣跨敤Vue3鐗堟湰" },
- {
- desc: 'vue2銆乿ue3鏂囨。鐩稿悓,寮�鏂囨。澶ч儴鍒嗘枃妗ｄ粛鐒朵娇鐢ㄧ殑vue2璇硶'
- },
- {
- desc: '鑷畾涔夐儴鍒嗘棦鍙互浣跨敤vue3璇硶涓庡彲浠ヤ娇鐢╲ue3璇硶'
- }
- //(妗嗘灦鍐呴儴缁勪欢vue2/3璇硶閮藉湪浣跨敤),浣犱篃鍙互浣跨敤vue3璇硶
- ],
- grid: [
- {
- name: '鐢ㄦ埛绠＄悊',
- desc: '绯荤粺鐢ㄦ埛绠＄悊,娉ㄥ唽鐢ㄦ埛3000000浜恒��',
- icon: 'el-icon-user'
- },
- {
- name: '绔欏唴娑堟伅',
- desc: '鎮ㄦ湁涓�鏉℃柊鐨勬秷鎭�,璇峰強鏃跺鐞嗐��',
- icon: 'el-icon-chat-dot-round'
- },
- {
- name: '绯荤粺绠＄悊',
- desc: '杩欓噷鏀剧偣浠�涔�,杩樻病鎯冲ソ銆�',
- icon: 'el-icon-setting'
- },
- {
- name: '杩樻病鎯冲ソ',
- desc: '杩欓噷涓嶇煡閬撳簲璇ユ斁鐐逛粈涔堟垨鑰呭啓鐐逛粈涔堛��',
- icon: 'el-icon-document'
- },
- {
- name: '璇煶瀵艰埅',
- desc: '楂樺痉鍦板浘鏋楀織鐜蹭负鎮ㄨ闊冲鑸��',
- icon: 'el-icon-microphone'
- },
- {
- name: '鍨冨溇鍥炴敹',
- desc: '鍒犻櫎杩囩殑鏁版嵁鍦ㄦ澶勬壘鍥炪�傘�傘�傘��',
- icon: 'el-icon-delete'
- }
- ]
};
},
setup() {
@@ -165,10 +23,6 @@
};
let interval;
onMounted(() => {
- $chart = echarts.init(document.getElementById('h-chart1'));
- $chart.setOption(chart1);
- $chart2 = echarts.init(document.getElementById('h-chart2'));
- $chart2.setOption(chart2);
// interval = setInterval(() => {
// chart2.xAxis[0].data.splice(0, 1);
@@ -183,29 +37,15 @@
// chart2.series[1].data.push(~~(Math.random() * 1000));
// $chart2.setOption(chart2);
// }, 2000);
-
- $chart3 = echarts.init(document.getElementById('h-chart3'));
- $chart3.setOption(chart3);
- let $chart4 = echarts.init(document.getElementById('h-chart4'));
- $chart4.setOption(chart4);
- let $chart5 = echarts.init(document.getElementById('h-chart5'));
- $chart5.setOption(chart2);
});
onUnmounted(() => {
- interval && clearInterval(interval);
- if ($chart) {
- $chart.dispose();
- $chart2.dispose();
- $chart3.dispose();
- }
+
});
return { open };
},
destroyed() {
- $chart2 = null;
}
};
-var $chart, $chart2, $chart3;
// window.addEventListener("resize", function () {
// $chart2.setOption(chart2);
// });
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue
index 3b04ada..9c96efd 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue
@@ -45,11 +45,11 @@
{ field: 'row', title: '琛�', type: 'string', width: 70, align: 'left' },
{ field: 'column', title: '鍒�', type: 'string', width: 70, align: 'left' },
{ field: 'layer', title: '灞�', type: 'string', width: 110, align: 'left' },
- { field: 'depth', title: '娣卞害', type: 'string', width: 110, align: 'left' },
+ { field: 'depth', title: '娣卞害', type: 'string', width: 110, align: 'left', hidden: true },
{ field: 'scNo', title: '瀵瑰簲鍫嗗灈鏈哄彿', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'locationType', title: '璐т綅绫诲瀷', type: 'int', width: 110, align: 'left', bind: { key: "locationType", data: [] } },
+ { field: 'locationType', title: '璐т綅绫诲瀷', type: 'int', width: 110, align: 'left',bind: { key: "LocationType", data: [] } },
{ field: 'locationStatus', title: '璐т綅鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "LocationState", data: [] } },
- { field: 'isLocked', title: '鏄惁閿佸畾', type: 'bool', width: 110, align: 'left', hidden: true, bind: { key: "IsLocked", data: [] } },
+ { field: 'isLocked', title: '鏄惁閿佸畾', type: 'bool', width: 110, align: 'left', bind: { key: "IsLocked", data: [] } },
{ field: 'locationDesc', title: '璐т綅鎻忚堪', type: 'string', width: 110, align: 'left', hidden: true },
{ field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left' },
{ field: 'wareAreaCode', title: '搴撳尯缂栧彿', type: 'string', width: 110, align: 'left', hidden: true },
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue
new file mode 100644
index 0000000..cf0a896
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue
@@ -0,0 +1,82 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/stock/Dt_BillGroupStock.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/widesea_wms/stock/Dt_BillGroupStock.jsx";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: '搴撳瓨淇℃伅',
+ name: 'stock/Dt_BillGroupStock',
+ url: "/StockInfo/",
+ sortName: "PalletCode"
+ });
+ const editFormFields = ref({
+ "palletCode": "",
+ "materialNo": "",
+ "state": "",
+ "groupType": ""
+ });
+ const editFormOptions = ref([
+ [
+ { "title": "鎵樼洏鏉＄爜", "field": "palletCode", type: "text" },
+ { "title": "鐗╂枡缂栧彿", "field": "materialNo", type: "text" },
+ { "title": "搴撳瓨鐘舵��", "field": "state", type: "select", dataKey: "StockState", data: [] },
+ { "title": "缁勭洏绫诲瀷", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
+ ]
+ ]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([
+ [
+ { "title": "鎵樼洏鏉＄爜", "field": "palletCode", type: "text" },
+ { "title": "鐗╂枡缂栧彿", "field": "materialNo", type: "text" },
+ { "title": "搴撳瓨鐘舵��", "field": "state", type: "select", dataKey: "StockState", data: [] },
+ { "title": "缁勭洏绫诲瀷", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
+ ]
+ ]);
+ const columns = ref([{ field: 'id', title: '搴撳瓨ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
+ { field: 'locationCode', title: '搴撲綅', type: 'string', width: 110, align: 'left' },
+ { field: 'palletCode', title: '鎵樼洏鏉＄爜', type: 'string', width: 110, align: 'left', sort: true },
+ { field: 'isFull', title: '鏄惁婊＄洏', type: 'bool', width: 110, align: 'left' },
+ // { field: 'state', title: '搴撳瓨鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "StockState", data: [] } },
+ { field: 'LinedProcessFeedbackTime', title: '宸ヨ壓寮�濮嬫椂闂�', type: 'string', width: 110, align: 'left', sort: true },
+ { field: 'SpecialParameterDuration', title: '宸ヨ壓鏃堕暱', type: 'string', width: 110, align: 'left', sort: true },
+ { field: 'remark', title: '澶囨敞', type: 'string', width: 120, hidden: true, align: 'left' },
+ { field: 'createID', title: '鍒涘缓ID', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ { field: 'modifyID', title: '淇敼浜篒D', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },
+ { field: 'modifier', title: '鏈�鍚庝慨鏀逛汉', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'modifyDate', title: '鏈�鍚庝慨鏀规椂闂�', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs
index 66feb1b..17bbbdb 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs
@@ -27,6 +27,7 @@
public WebResponseContent OK()
{
+ Code = 1;
Status = true;
return this;
}
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs
index 77224e9..394f9de 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs
@@ -87,9 +87,11 @@
using HttpClient httpClient = new HttpClient();
httpClient.Timeout = new TimeSpan(0, 0, 60);
- foreach (var header in headers)
- httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
-
+ if (headers != null)
+ {
+ foreach (var header in headers)
+ httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
+ }
result = httpClient.PostAsync(serviceAddress, httpContent).Result.Content.ReadAsStringAsync().Result;
}
return result;
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/MCS/IMCSService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/MCS/IMCSService.cs
index 823bd3b..db2c587 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/MCS/IMCSService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/MCS/IMCSService.cs
@@ -15,6 +15,6 @@
WebResponseContent ModifyAccessStatus(object json);
- WebResponseContent RequsetCellInfo(object json);
+ object RequsetCellInfo(object json);
}
}
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs
index bd089e8..77eeab7 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs
@@ -58,6 +58,12 @@
public string AreaCode { get; set; }
/// <summary>
+ /// 搴斿嚭搴撴椂闂�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "搴斿嚭搴撴椂闂�")]
+ public DateTime? OutboundTime { get; set; }
+
+ /// <summary>
/// 搴撳瓨鏄庣粏
/// </summary>
[SugarColumn(ColumnName = "StockInfoDetails")]
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs
index 22c7dfd..77aa37e 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs
@@ -25,9 +25,9 @@
if (locationinfo != null)
{
//妫�娴嬫煖鎻愪緵鐨勮揣浣嶇姸鎬侊紝鍙湁wms鏈攣瀹氫笖鎻愪緵鐨勭姸鎬佷负鍏佽鎵嶅厑璁告斁璐�
- if (locationinfo.Remark != LocationStatusByCode(result.StateCode))
+ if (locationinfo.Remark != result.StateCode.ToString())
{
- locationinfo.Remark = LocationStatusByCode(result.StateCode);
+ locationinfo.Remark = result.StateCode.ToString();
_locationRepository.UpdateData(locationinfo);
}
}
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 01ba41e..66da6c9 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
@@ -59,17 +59,21 @@
PalletCode = result.PalletBarcode,
RoadWay = location.RoadwayNo,
SourceAddress = result.LocationID,
- TargetAddress = result.LocationID,
+ TargetAddress = "",
TaskNum = taskNum, //_taskRepository.GetTaskNo().Result,
TaskState = (int)TaskOutStatusEnum.OutNew,
TaskType = result.IsNG == 1 ? (int)TaskOutboundTypeEnum.OutNG : (int)TaskOutboundTypeEnum.Outbound,
};
- var respon = HttpHelper.Post("http://localhost:9291/api/Task/ReceiveTask", JsonConvert.SerializeObject(taskDTO));
- if (respon != null)
- {
+ //var respon = HttpHelper.Post("http://localhost:9291/api/Task/ReceiveTask", JsonConvert.SerializeObject(taskDTO));
+ //if (respon != null)
+ //{
- }
+ //}
+ //else
+ //{
+ // throw new Exception("WCS澶勭悊澶辫触");
+ //}
return content.OK();
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs
index 340e770..e7efc9c 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs
@@ -16,7 +16,7 @@
/// </summary>
/// <param name="json"></param>
/// <returns></returns>
- public WebResponseContent RequsetCellInfo(object json)
+ public object RequsetCellInfo(object json)
{
WebResponseContent content = new WebResponseContent();
try
@@ -25,14 +25,21 @@
var result = JsonConvert.DeserializeObject<RequsetCellInfo>(json.ToString());
- //_stockInfoRepository.QueryFirst(x=>x.LocationCode == result.LocationID && x)
+ var info = _stockInfoRepository.QueryFirst(x => x.LocationCode == result.LocationID);
//todo
+ if (info != null)
+ {
+ return new { code = 1, palletBarcode = info.PalletCode };
+ }
+ else
+ {
+ return new { code = 0, palletBarcode = "",message="搴撲綅鏃犲簱瀛樿褰�" };
+ }
- return content.OK();
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ return new { code = 0, palletBarcode = "", message = ex.Message };
}
}
}
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs
index 389c5f1..dbd507b 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs
@@ -135,7 +135,7 @@
LocationType = locType,
Remark = "",
Depth = locType > 1 ? (((line - 1) % 4) + 1) == 2 || (((line - 1) % 4) + 1) == 3 ? 1 : 2 : 1,
- RoadwayNo = locType > 1 ? $"CHSC{((line - 1) / 4) + 1}" : $"CHSC{((line - 1) / 2) + 1}",
+ RoadwayNo = locType > 1 ? $"FRSC{((line - 1) / 4) + 1}" : $"FRSC{((line - 1) / 2) + 1}",
LocationStatus = LocationEnum.Free.ObjToInt(),
AreaId = areaId,
Creater = "systeam",
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index dbe3053..5eca4bd 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -144,7 +144,7 @@
ParameterCode = y.ParameterCode,
ParameterDesc = y.Description,
TargetValue = y.TargetValue,
- Value = ( DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
+ Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
DefectCode = y.UOMCode
}).ToList()
}).ToList()
@@ -433,6 +433,8 @@
var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
stock.SpecialParameterDuration = respone.SpecialParameterDuration;
+ //2024骞�11鏈�16鏃ワ細鏂板瀛楁璁＄畻搴斿嚭搴撴椂闂�
+ stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
// 璁板綍鏃ュ織
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庤揣浣嶆暟鎹細{locationInf}");
@@ -570,7 +572,7 @@
List<string> strings = input.Position == "1088" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
- content = await CreateNewTask(input, strings);
+ content = await CreateNewTask(input, strings);
if (content.Status)
{
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -1355,13 +1357,22 @@
/// <param name="areaId">鍖哄煙涓婚敭</param>
/// <param name="roadWay">宸烽亾</param>
/// <returns></returns>
- public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay)
+ public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay, bool IsFull = true)
{
#region 鑾峰彇璐т綅
try
{
- var locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+ List<DtLocationInfo> locations;
+ if (IsFull)
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+ }
+ else
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
+ }
+
if (locations == null)
{
return null;
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs
index 636959b..acf1877 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs
@@ -31,8 +31,8 @@
return _MCSService.ModifyAccessStatus(input);
}
- [HttpPost("RequsetCellInfo")]
- public WebResponseContent RequsetCellInfo([FromBody] object input)
+ [HttpPost("RequestCellInfo")]
+ public object RequsetCellInfo([FromBody] object input)
{
return _MCSService.RequsetCellInfo(input);
}
--
Gitblit v1.9.3