From 94da496a424726778aca11a0efc3358202dc8b17 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期二, 11 二月 2025 14:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxing.vue | 33 ++++++++---
Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js | 18 +++---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs | 4
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue | 77 +++++++++++++++++++++++++
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 10 +-
Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js | 2
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue | 1
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs | 11 +++
8 files changed, 128 insertions(+), 28 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/router/tables.js b/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js
index 03e27d3..6ae8d29 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js
@@ -214,7 +214,7 @@
{
path: '/DtBoxing',
name: 'DtBoxing',
- component: () => import('@/views/widesea_wms/stock/DtBoxing.vue'),
+ component: () => import('@/views/widesea_wms/stock/DtBoxingInfo.vue'),
meta: {
keepAlive: false
}
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
index e1e9cf8..b4c1850 100644
--- 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
@@ -28,6 +28,7 @@
{ 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" },
@@ -60,17 +61,31 @@
}
};
},
+
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 () {
- // this.$Message.success('鐐瑰嚮浜嗘寜閽�');
- // }
- // });
+ 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() {
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
new file mode 100644
index 0000000..ab853a1
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue
@@ -0,0 +1,77 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_InboundOrder.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/DtBoxingInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: '缁勭洏淇℃伅',
+ name: 'stock/DtBoxingInfo',
+ url: "/BoxingInfo/",
+ sortName: "id"
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([
+ [
+ { "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: [] },
+ ]
+ ]);
+ const columns = ref([
+ { field: 'id', title: '搴撳瓨ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
+ { field: 'palletCode', title: '鎵樼洏鏉＄爜', type: 'string', width: 110, align: 'left', sort: true, link: 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, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'int', sort: true, width: 100, align: 'left' },
+ ]);
+
+ const detail = ref({
+ cnName: "缁勭洏鏄庣粏淇℃伅",
+ table: "DtBoxingInfoDetail",
+ columns: [
+ { 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" },
+ ],
+ sortName: "id",
+ key: "BoxingInfoId"
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
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 8344262..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,6 +47,7 @@
{ "title": "搴撳瓨绫诲瀷", "field": "isFull", type: "select", dataKey: "isFull", data: [] },
],[
{ "title": "搴撲綅鍙�", "field": "locationCode", 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