From 68dba27a19bdc097f5726095115769709638d7eb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 22 十一月 2025 20:44:35 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs | 6
项目代码/WIDESEA_WMSClient/src/extension/stock/stockView.js | 116 ++++----
项目代码/WIDESEA_WMSClient/src/views/stock/stockView.vue | 228 -----------------
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue | 5
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 20 +
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/NoStockOut.vue | 380 +++++++++++++++++++++++++++++
6 files changed, 465 insertions(+), 290 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
index 148e7f4..87f3dbc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
@@ -1,9 +1,10 @@
<template>
- <div>
+ <div>
<vol-box
v-model="showDetialBox"
:lazy="true"
width="75%"
+ height="80%"
title="鍗曟嵁鏄庣粏淇℃伅"
>
<div class="box-head">
@@ -362,7 +363,7 @@
}
}, {
default: () => h(ElForm, {
- model: formData,
+ model: formData00,
rules: {
selectedPlatform: [
{ required: true, message: '璇烽�夋嫨鍑哄簱绔欏彴', trigger: 'change' }
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/NoStockOut.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/NoStockOut.vue"
new file mode 100644
index 0000000..252da58
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/NoStockOut.vue"
@@ -0,0 +1,380 @@
+<template>
+ <div>
+ <vol-box
+ v-model="showDetailBox"
+ :lazy="true"
+ width="65%"
+ :padding="20"
+ title="鏃犲簱瀛樺嚭搴�"
+ class="custom-vol-box"
+ >
+ <div>
+ <!-- 涓婃柟杈撳叆妗� -->
+ <el-form :inline="true" :model="formData" ref="formData" style="margin-bottom: 20px; align-items: flex-end;">
+ <el-form-item
+ label="鎵弿鏉＄爜:"
+ style="width: 80%"
+ prop="barcode"
+ >
+ <el-input
+ ref="barcodeInput"
+ v-model="formData.barcode"
+ placeholder="璇蜂娇鐢ㄦ壂鐮佹灙鎵弿鏉＄爜锛屾垨鎵嬪姩杈撳叆"
+ @keyup.enter="handleScan"
+ autofocus
+ class="custom-input"
+ ></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="small" @click="handleScan" class="custom-button">
+ <i class="el-icon-search"></i> 纭鎵弿
+ </el-button>
+ </el-form-item>
+ </el-form>
+
+ <!-- 涓嬫柟鏄剧ず妗� -->
+ <div class="scan-list">
+ <el-card shadow="hover" style="margin-bottom: 10px; border: none;" class="custom-card">
+ <div class="card-header">
+ <span class="header-title">宸叉壂鎻忔潯鐮佸垪琛紙鍏眥{ scannedBarcodes.length }}鏉★級</span>
+ <el-button
+ class="clear-all-btn"
+ @click="clearAll"
+ :disabled="scannedBarcodes.length === 0"
+ >娓呯┖鎵�鏈�</el-button>
+ </div>
+ <div class="card-body">
+ <el-scrollbar height="400px" class="custom-scrollbar">
+ <!-- 浣跨敤 transition-group 鍖呰９浠ュ疄鐜板姩鐢� -->
+ <transition-group name="barcode-item-transition">
+ <div class="barcode-item" v-for="(barcode, index) in scannedBarcodes" :key="barcode" :data-index="index">
+ <span class="barcode-text">{{ index + 1 }}. {{ barcode }}</span>
+ <el-button
+ class="delete-btn"
+ @click="removeItem(index)"
+ >鍒犻櫎</el-button>
+ </div>
+ </transition-group>
+ <div class="empty-tip" v-if="scannedBarcodes.length === 0">
+ <i class="el-icon-information"></i>
+ <span>鏆傛棤鎵弿璁板綍锛岃鎵弿鏉＄爜</span>
+ </div>
+ </el-scrollbar>
+ </div>
+ </el-card>
+ </div>
+ </div>
+
+ <template #footer>
+ <div class="footer-actions">
+ <el-button type="primary" size="small" @click="submit" :disabled="scannedBarcodes.length === 0" class="submit-btn">
+ <i class="el-icon-check"></i> 鎻愪氦鍑哄簱
+ </el-button>
+ <el-button type="text" size="small" @click="showDetailBox = false" class="cancel-btn">
+ 鍙栨秷
+ </el-button>
+ </div>
+ </template>
+ </vol-box>
+ </div>
+</template>
+
+<script>
+import VolBox from "@/components/basic/VolBox.vue";
+
+export default {
+ components: { VolBox },
+ data() {
+ return {
+ showDetailBox: false,
+ formData: {
+ barcode: "",
+ },
+ scannedBarcodes: [],
+ };
+ },
+ methods: {
+ open() {
+ this.showDetailBox = true;
+ this.scannedBarcodes = [];
+ this.formData.barcode = "";
+ this.$nextTick(() => {
+ this.$refs.barcodeInput.focus();
+ });
+ },
+
+ handleScan() {
+ const barcode = this.formData.barcode.trim();
+ if (!barcode) {
+ this.$refs.barcodeInput.focus();
+ return;
+ }
+ if (this.scannedBarcodes.includes(barcode)) {
+ this.$message.warning(`鏉＄爜 ${barcode} 宸叉壂鎻忚繃锛岃鍕块噸澶嶆壂鎻廯);
+ this.formData.barcode = "";
+ this.$refs.barcodeInput.focus();
+ return;
+ }
+
+ this.scannedBarcodes.push(barcode);
+ this.formData.barcode = "";
+
+ this.$nextTick(() => {
+ this.$refs.barcodeInput.focus();
+ });
+ },
+
+ removeItem(index) {
+ this.scannedBarcodes.splice(index, 1);
+ },
+
+ clearAll() {
+ this.$confirm("纭畾瑕佹竻绌烘墍鏈夋壂鎻忚褰曞悧锛�", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }).then(() => {
+ this.scannedBarcodes = [];
+ }).catch(() => {
+ this.$refs.barcodeInput.focus();
+ });
+ },
+
+ submit() {
+ if (this.scannedBarcodes.length === 0) {
+ this.$message.warning("璇峰厛鎵弿鑷冲皯涓�鏉℃潯鐮�");
+ this.$refs.barcodeInput.focus();
+ return;
+ }
+
+ const params = {
+ barcodes: this.scannedBarcodes,
+ };
+
+ this.http
+ .post("/api/OutboundOrder/NoStockOut", params, "鏁版嵁澶勭悊涓�...")
+ .then((res) => {
+ if (!res.status) {
+ this.$message.error(res.message);
+ this.$refs.barcodeInput.focus();
+ return;
+ }
+ this.$message.success("鍑哄簱鎴愬姛");
+ this.showDetailBox = false;
+ this.$emit("parentCall", ($vue) => {
+ $vue.refresh();
+ });
+ })
+ .catch((err) => {
+ this.$message.error(`璇锋眰澶辫触锛�${err.message || "鏈煡閿欒"}`);
+ this.$refs.barcodeInput.focus();
+ });
+ },
+ },
+};
+</script>
+
+<style scoped>
+/* 鍏抽敭锛氬畾涔夊垪琛ㄩ」鐨勮繃娓″姩鐢� */
+.barcode-item-transition-enter-active,
+.barcode-item-transition-leave-active {
+ transition: all 0.3s ease;
+}
+.barcode-item-transition-enter-from {
+ opacity: 0;
+ transform: translateY(10px);
+}
+.barcode-item-transition-leave-to {
+ opacity: 0;
+ transform: translateX(30px);
+}
+/* 纭繚鍒犻櫎鏃跺叾浠栧厓绱犲钩婊戜笂绉� */
+.barcode-item-transition-move {
+ transition: transform 1s ease;
+}
+
+.scan-list {
+ width: 100%;
+}
+
+.custom-card {
+ border-radius: 12px;
+ box-shadow: 0 4px 20px rgba(0, 0, 0, 0.08) !important;
+ transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
+}
+.custom-card:hover {
+ box-shadow: 0 10px 30px rgba(0, 0, 0, 0.12) !important;
+}
+
+.card-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 15px;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #f0f0f0;
+}
+.header-title {
+ font-weight: 600;
+ font-size: 15px;
+ color: #333;
+}
+.clear-all-btn {
+ color: #f56c6c;
+ font-size: 13px;
+ transition: color 0.2s;
+}
+.clear-all-btn:hover {
+ color: #e53e3e;
+ background: rgba(245, 108, 108, 0.1);
+}
+
+.card-body {
+ padding: 0;
+}
+
+/* 鑷畾涔夋粴鍔ㄦ潯 */
+.custom-scrollbar ::v-deep .el-scrollbar__thumb {
+ background: rgba(0, 0, 0, 0.2);
+ border-radius: 4px;
+ width: 4px;
+}
+.custom-scrollbar ::v-deep .el-scrollbar__bar:hover .el-scrollbar__thumb {
+ background: rgba(0, 0, 0, 0.3);
+ width: 6px;
+}
+.custom-scrollbar ::v-deep .el-scrollbar__wrap {
+ overflow-x: hidden;
+}
+
+.barcode-item {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 10px 15px;
+ border-bottom: 1px solid #f7f7f7;
+ transition: background-color 0.2s ease;
+}
+.barcode-item:hover {
+ background-color: #fafafa;
+}
+/* 涓哄鏁拌娣诲姞杞诲井鐨勮儗鏅壊锛屽寮哄彲璇绘�� */
+.barcode-item:nth-child(odd) {
+ background-color: #e1e1e1;
+}
+.barcode-text {
+ flex: 1;
+ font-size: 14px;
+ color: #666;
+ transition: color 0.2s;
+}
+.barcode-item:hover .barcode-text {
+ color: #409eff;
+}
+
+.delete-btn {
+ color: #ea1919;
+ font-size: 20px;
+ transition: all 0.2s;
+ transform: scale(0.8);
+}
+.barcode-item:hover .delete-btn {
+ opacity: 1;
+ transform: scale(1);
+}
+.delete-btn:hover {
+ color: #f56c6c !important; /* 浣跨敤 !important 瑕嗙洊 Element UI 榛樿鏍峰紡 */
+ background: rgba(245, 108, 108, 0.1);
+}
+
+.empty-tip {
+ text-align: center;
+ padding: 80px 0;
+ color: #999;
+ font-size: 14px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+}
+.empty-tip i {
+ font-size: 40px;
+ margin-bottom: 15px;
+ color: #dcdfe6;
+}
+
+/* 鑷畾涔夎緭鍏ユ */
+.custom-input ::v-deep .el-input__inner {
+ border-radius: 6px;
+ border-color: #e4e7ed;
+ transition: all 0.3s;
+ height: 36px;
+ line-height: 36px;
+}
+.custom-input ::v-deep .el-input__inner:focus {
+ border-color: #409eff;
+ box-shadow: 0 0 0 3px rgba(64, 158, 255, 0.1);
+}
+
+/* 鑷畾涔夋寜閽� */
+.custom-button {
+ border-radius: 6px;
+ height: 36px;
+ line-height: 36px;
+ font-size: 13px;
+ font-weight: 500;
+ transition: all 0.2s;
+}
+.custom-button:hover {
+ transform: translateY(-1px);
+ box-shadow: 0 4px 12px rgba(64, 158, 255, 0.2);
+}
+
+.footer-actions {
+ text-align: right;
+}
+.submit-btn {
+ border-radius: 6px;
+ font-weight: 500;
+ padding: 10px 20px;
+ transition: all 0.2s;
+}
+.submit-btn:hover {
+ transform: translateY(-1px);
+ box-shadow: 0 4px 12px rgba(46, 164, 79, 0.2);
+}
+.cancel-btn {
+ color: #666;
+ margin-right: 10px;
+ transition: color 0.2s;
+}
+.cancel-btn:hover {
+ color: #333;
+ background: #f5f5f5;
+}
+</style>
+
+<style>
+/* ... (鍏ㄥ眬鏍峰紡閮ㄥ垎淇濇寔涓嶅彉) ... */
+.text-button:hover {
+ background-color: #f0f9eb !important;
+}
+.el-table .warning-row {
+ background: oldlace;
+}
+.box-table .el-table tbody tr:hover > td {
+ background-color: #d8e0d4 !important;
+}
+.box-table .el-table tbody tr.current-row > td {
+ background-color: #f0f9eb !important;
+}
+.el-table .success-row {
+ background: #f0f9eb;
+}
+.box-table .el-table {
+ border: 1px solid #ebeef5;
+}
+.box-head .el-alert__content {
+ width: 100%;
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
index 890b066..b1630d8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
@@ -103,6 +103,7 @@
ref="selectedStock"
@parentCall="parentCall"
></selected-stock>
+ <NoStockOut ref="NoStockOut" @parentCall="parentCall"></NoStockOut>
</div>
</template>
<script>
@@ -110,10 +111,12 @@
import VolForm from "@/components/basic/VolForm.vue";
import StockSelect from "./StockSelect.vue";
import SelectedStock from "./SelectedStock.vue";
+import NoStockOut from "./NoStockOut.vue";
import { h,createVNode, render,reactive } from 'vue';
import { ElDialog , ElForm, ElFormItem, ElSelect,ElOption, ElButton, ElMessage } from 'element-plus';
+import { th } from 'element-plus/es/locale';
export default {
- components: { VolBox, VolForm, StockSelect, SelectedStock },
+ components: { VolBox, VolForm, StockSelect, SelectedStock,NoStockOut},
data() {
return {
row: null,
@@ -189,7 +192,7 @@
prop: "orderDetailStatus",
title: "璁㈠崟鏄庣粏鐘舵��",
type: "tag",
- width: 180,
+ width: 90,
bindKey: "orderDetailStatusEnum",
},
{
@@ -198,6 +201,13 @@
type: "icon",
width: 90,
icon: "el-icon-s-grid",
+ },
+ {
+ prop: "NoStockOut",
+ title: "鏃犲簱瀛樺嚭搴�",
+ type: "icon",
+ width: 100,
+ icon: "el-icon-setting",
},
{
prop: "viewDetail",
@@ -304,8 +314,10 @@
tableButtonClick(row, column) {
if (column.prop == "assignStock") {
this.$refs.child.open(row);
- } else {
- //鐐瑰嚮鎵撳紑鍑哄簱璇︽儏
+ } else if (column.prop == "NoStockOut") {
+ this.$refs.NoStockOut.open(row);
+ }else{
+ //鐐瑰嚮鎵撳紑鍑哄簱璇︽儏
this.$refs.selectedStock.open(row);
}
},
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js"
index 92ad623..047c354 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js"
@@ -1,8 +1,4 @@
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-import { el } from "element-plus/es/locales.mjs";
-
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
@@ -35,65 +31,65 @@
// });
// }
// }
- this.columns.forEach(column => {
- if (column.field == 'materielCode') {
- column.formatter = (row) => {
- var str = '';
- var list = row.materielCode.split(',');
- for (let index = 0; index < list.length; index++) {
- str += list[index] + '<br>';
- }
- return str = list[0] == "" ? "绌虹" : str;
- }
- }
- if (column.field == 'batchNo') {
- column.formatter = (row) => {
- var str = '';
- var list = row.batchNo.split(',');
- for (let index = 0; index < list.length; index++) {
- str += list[index] + '<br>';
- }
- return str = list[0] == "" ? "鏃�" : str;
- }
- }
- if (column.field == 'materielInfo') {
- const today = new Date()
- column.formatter = (row) => {
- if (row.details.length > 0) {
- const today = new Date();
- const closestDate = row.details
- .map(x => {
- const date = new Date(x.effectiveDate);
- const diffInDays = Math.ceil(Math.abs((today - date) / (1000 * 60 * 60 * 24)));
- return { date, diffInDays };
- })
- .reduce((closest, current) => (current.diffInDays < closest.diffInDays ? current : closest))
- .date;
+ // this.columns.forEach(column => {
+ // if (column.field == 'materielCode') {
+ // column.formatter = (row) => {
+ // var str = '';
+ // var list = row.materielCode.split(',');
+ // for (let index = 0; index < list.length; index++) {
+ // str += list[index] + '<br>';
+ // }
+ // return str = list[0] == "" ? "绌虹" : str;
+ // }
+ // }
+ // if (column.field == 'batchNo') {
+ // column.formatter = (row) => {
+ // var str = '';
+ // var list = row.batchNo.split(',');
+ // for (let index = 0; index < list.length; index++) {
+ // str += list[index] + '<br>';
+ // }
+ // return str = list[0] == "" ? "鏃�" : str;
+ // }
+ // }
+ // if (column.field == 'materielInfo') {
+ // const today = new Date()
+ // column.formatter = (row) => {
+ // if (row.details.length > 0) {
+ // const today = new Date();
+ // const closestDate = row.details
+ // .map(x => {
+ // const date = new Date(x.effectiveDate);
+ // const diffInDays = Math.ceil(Math.abs((today - date) / (1000 * 60 * 60 * 24)));
+ // return { date, diffInDays };
+ // })
+ // .reduce((closest, current) => (current.diffInDays < closest.diffInDays ? current : closest))
+ // .date;
- const daysSinceClosest = Math.ceil(Math.abs((today - closestDate) / (1000 * 60 * 60 * 24)));
- return '<span style="color: #F56C6C">' + daysSinceClosest + "澶�" + '</span>';
- } else {
- return '<span style="color: #F56C6C">' + "鏃犱繚璐ㄦ湡" + '</span>';
- }
+ // const daysSinceClosest = Math.ceil(Math.abs((today - closestDate) / (1000 * 60 * 60 * 24)));
+ // return '<span style="color: #F56C6C">' + daysSinceClosest + "澶�" + '</span>';
+ // } else {
+ // return '<span style="color: #F56C6C">' + "鏃犱繚璐ㄦ湡" + '</span>';
+ // }
- }
- }
- if (column.field == 'sumStock') {
- column.formatter = (row) => {
- if (row.details.length > 0) {
- var sum = 0;
- const closestDate = row.details
- .map(x => {
- sum += (x.stockQuantity)
- })
- return '<span style="color: #F56C6C">' + sum + row.details[0].unit + '</span>';
- } else {
- return '<span style="color: #F56C6C">' + "1涓�" + '</span>';
- }
+ // }
+ // }
+ // if (column.field == 'sumStock') {
+ // column.formatter = (row) => {
+ // if (row.details.length > 0) {
+ // var sum = 0;
+ // const closestDate = row.details
+ // .map(x => {
+ // sum += (x.stockQuantity)
+ // })
+ // return '<span style="color: #F56C6C">' + sum + row.details[0].unit + '</span>';
+ // } else {
+ // return '<span style="color: #F56C6C">' + "1涓�" + '</span>';
+ // }
- }
- }
- })
+ // }
+ // }
+ // })
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue"
index fc8b569..13ce26a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue"
@@ -27,18 +27,12 @@
sortName: "stockId",
});
const editFormFields = ref({
- palletCode: "",
- locationCode: "",
- locationName: "",
+
});
const editFormOptions = ref([
]);
const searchFormFields = ref({
- palletCode: "",
- // locationCode: "",
- materielCode:"",
- batchNo:""
});
const searchFormOptions = ref([
[
@@ -69,7 +63,7 @@
title: "鎵樼洏缂栧彿",
type: "string",
width: 150,
- link: true,
+ // link: true,
align: "left",
},
{
@@ -92,7 +86,6 @@
type: "string",
width: 80,
align: "left",
- bind: { key: "warehouses", data: [] },
},
{
field: "roadwayNo",
@@ -110,90 +103,13 @@
align: "left",
},
{
- field: "batchNo",
- title: "鎵�鍚墿鏂欐壒娆�",
- type: "string",
- width: 200,
- align: "left"
- },
- {
- field: "materielInfo",
- title: "鎵�鍚墿鏂欐渶鏃╀复鏈�",
- type: "string",
- width: 140,
- align: "left",
- },
- {
field: "sumStock",
title: "鎬诲簱瀛�",
type: "string",
width: 140,
align: "left",
},
- {
- field: "row",
- title: "璐т綅琛�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "column",
- title: "璐т綅鍒�",
- type: "int",
- width: 120,
- align: "left",
- hidden: true,
- },
- {
- field: "layer",
- title: "璐т綅灞�",
- type: "string",
- width: 200,
- align: "left",
- hidden: true,
- },
- {
- field: "depth",
- title: "璐т綅娣卞害",
- type: "string",
- width: 180,
- align: "left",
- hidden: true,
- },
- {
- field: "stockStatus",
- title: "搴撳瓨鐘舵��",
- type: "string",
- width: 200,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] },
- },
- {
- field: "locationType",
- title: "璐т綅绫诲瀷",
- type: "string",
- width: 100,
- align: "left",
- bind:{key: "locationTypeEnum", data: []}
- },
- {
- field: "locationStatus",
- title: "璐т綅鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "locationStatusEnum", data: [] },
- },
- {
- field: "enalbeStatus",
- title: "绂佺敤鐘舵��",
- type: "string",
- width: 80,
- align: "left",
- bind: { key: "enableStatusEnum", data: [] },
- },
+
{
field: "creater",
title: "鍒涘缓浜�",
@@ -235,143 +151,7 @@
cnName: "搴撳瓨鏄庣粏淇℃伅",
table: "StockInfoDetail",
columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "stockId",
- title: "搴撳瓨淇℃伅涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- hidden: true
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 130,
- align: "left",
- },
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "decimal",
- width: 130,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "serialNumber",
- title: "搴忓垪鍙�",
- type: "int",
- width: 120,
- align: "left",
- hidden: true,
- },
- {
- field: "stockQuantity",
- title: "搴撳瓨鏁伴噺",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "outboundQuantity",
- title: "鍑哄簱鏁伴噺",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 50,
- align: "left",
- },
- {
- field: "productionDate",
- title: "鐢熶骇鏃ユ湡",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "effectiveDate",
- title: "鏈夋晥鏃ユ湡",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "status",
- title: "搴撳瓨鏄庣粏鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] }
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden: true
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden: true
- },
+
],
sortName: "id",
key: "id",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
index 39e46e9..9ed7598 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs"
@@ -22,11 +22,13 @@
/// <summary>
/// 璐т綅缂栧彿
/// </summary>
+ [SugarColumn(Length = 255, ColumnDescription = "璐т綅缂栧彿")]
public string LocationCode { get; set; }
/// <summary>
/// 璐т綅鍚嶇О
/// </summary>
+ [SugarColumn(Length = 255, ColumnDescription = "璐т綅鍚嶇О")]
public string LocationName { get; set; }
/// <summary>
@@ -62,6 +64,7 @@
/// <summary>
/// 宸烽亾缂栧彿
/// </summary>
+ [SugarColumn(Length = 255, ColumnDescription = "宸烽亾缂栧彿")]
public string RoadwayNo { get; set; }
/// <summary>
@@ -77,6 +80,7 @@
/// <summary>
/// 鎵樼洏鍙�
/// </summary>
+ [SugarColumn(Length = 255, ColumnDescription = "鎵樼洏鍙�")]
public string PalletCode { get; set; }
/// <summary>
@@ -87,11 +91,13 @@
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
+ [SugarColumn(Length = 255, ColumnDescription = "鐗╂枡缂栫爜")]
public string MaterielCode { get; set; }
/// <summary>
/// 鐗╂枡鎵瑰彿
/// </summary>
+ [SugarColumn(Length = 255, ColumnDescription = "鐗╂枡鎵瑰彿")]
public string BatchNo { get; set; }
/// <summary>
--
Gitblit v1.9.3