From 8378915638d6692b57f36620a752ab1fe59a2e4c Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 10 二月 2025 16:50:22 +0800
Subject: [PATCH] 分容获取库存接口更新
---
Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js | 18 +++++++++---------
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs | 4 ++--
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 10 +++++-----
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue | 2 +-
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs | 11 +++++++++--
5 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js b/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js
index d882861..54d708c 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js
@@ -25,15 +25,15 @@
this.$refs.gridBody.open();
};
}
- this.buttons.unshift({
- //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
- name: "寮�鍚湇鍔�", //鎸夐挳鍚嶇О
- icon: "el-icon-document", //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
- type: "primary", //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
- onClick: function () {
- this.$Message.success("寮�鍚湇鍔�");
- },
- });
+ // this.buttons.unshift({
+ // //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
+ // name: "寮�鍚湇鍔�", //鎸夐挳鍚嶇О
+ // icon: "el-icon-document", //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
+ // type: "primary", //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
+ // onClick: function () {
+ // this.$Message.success("寮�鍚湇鍔�");
+ // },
+ // });
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
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 1c1154f..a744063 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -92,7 +92,7 @@
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
- width: 200,
+ width: 160,
align: "left",
},
{
@@ -136,14 +136,14 @@
field: "currentAddress",
title: "褰撳墠浣嶇疆",
type: "string",
- width: 120,
+ width: 110,
align: "left",
},
{
field: "nextAddress",
title: "涓嬩竴浣嶇疆",
type: "string",
- width: 120,
+ width: 110,
align: "left",
},
{
@@ -165,7 +165,7 @@
field: "dispatchertime",
title: "浠诲姟涓嬪彂鏃堕棿",
type: "datetime",
- width: 150,
+ width: 110,
align: "left",
},
{
@@ -194,7 +194,7 @@
field: "modifier",
title: "淇敼浜�",
type: "string",
- width: 100,
+ width: 90,
align: "left",
},
{
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
index aceb062..6b9ec40 100644
--- 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
@@ -47,7 +47,7 @@
{ "title": "搴撳瓨绫诲瀷", "field": "isFull", type: "select", dataKey: "isFull", data: [] },
],[
{ "title": "搴撲綅鍙�", "field": "locationCode", type: "text" },
- { "title": "宸烽亾", "field": "roadwayNo", type: "text" },
+ // { "title": "宸烽亾", "field": "roadwayNo", type: "text" },
]
]);
const columns = ref(
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 ea59c06..44cc5f3 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
@@ -29,9 +29,16 @@
var result = JsonConvert.DeserializeObject<RequsetCellInfo>(json.ToString());
- var area = _areaInfoRepository.QueryFirst(x => x.AreaID == result.LocationArea);
+ //var area = _areaInfoRepository.QueryFirst(x => x.AreaID == result.LocationArea);
- var info = _stockInfoRepository.QueryFirst(x => x.LocationCode == result.LocationID && x.AreaCode == area.AreaCode);
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == result.LocationID && x.AreaId == result.LocationArea);
+
+ if (location != null)
+ {
+ throw new Exception("璇锋眰寮傚父锛氭湭鐭ュ簱浣�");
+ }
+
+ var info = _stockInfoRepository.QueryFirst(x => x.LocationCode == result.LocationID && x.LocationId == location.Id);
//todo
if (info != null)
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 8b05bd5..dd91382 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs
@@ -182,7 +182,7 @@
{
string[] chineseNumbers = new string[] { "闆�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�" };
var locationList = new List<DtLocationInfo>();
- for (int line = 7; line <= x; line++)
+ for (int line = 3; line <= x; line++)
{
for (int column = 1; column <= y; column++)
{
@@ -198,7 +198,7 @@
LocationType = locType,
Remark = "",
Depth = locType > 1 ? (((line - 1) % 4) + 1) == 2 || (((line - 1) % 4) + 1) == 3 ? 1 : 2 : 1,
- RoadwayNo = locType > 1 ? $"JZSC{((line - 1) / 4) + 1}" : $"JZSC{((line - 1) / 2) + 1}",
+ RoadwayNo = locType > 1 ? $"GWSC{((line - 1) / 4) + 1}" : $"GWSC{((line - 1) / 2) + 1}",
LocationStatus = LocationEnum.Free.ObjToInt(),
AreaId = areaId,
Creater = "systeam",
--
Gitblit v1.9.3