From f104d52506663454f66cc2d06e5c391366bd4a0c Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 25 十二月 2025 15:36:19 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WMSClient/src/extension/stock/stockView.js | 8 +---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue | 26 ++++++-------
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 4 +
项目代码/WIDESEA_WMSClient/src/views/outbound/printForm.vue | 44 +++++++++++-----------
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue | 1
5 files changed, 39 insertions(+), 44 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue"
index 5f1f0be..aa90c8e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue"
@@ -185,7 +185,6 @@
<script setup>
import { ref, reactive, onMounted, nextTick, watch, defineEmits, computed } from "vue";
import { ElMessage, ElTag, ElMessageBox } from "element-plus";
-import { Search, Check, Return } from "@element-plus/icons-vue";
import VolBox from "@/components/basic/VolBox.vue";
import http from "@/api/http";
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
index d5e94f0..4c584fb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
@@ -19,6 +19,10 @@
<span class="label">渚涘簲鍟嗙紪鐮�</span>
<span class="value full-width">{{ item.suplierCode }}</span>
</div>
+ <div class="column">
+ <span class="label">鏁伴噺/鎬绘暟</span>
+ <span class="value full-width">{{ item.quantity }}</span>
+ </div>
</div>
<div class="row dual-column">
@@ -37,10 +41,7 @@
<span class="label">瑙勬牸</span>
<span class="value full-width">{{ item.materialSpec }}</span>
</div>
- <div class="column">
- <span class="label">鏁伴噺/鎬绘暟</span>
- <span class="value full-width">{{ item.quantity }}</span>
- </div>
+
</div>
<div class="row dual-column">
@@ -89,6 +90,10 @@
<span class="label-preview">渚涘簲鍟嗙紪鐮�</span>
<span class="value-preview full-width">{{ item.suplierCode }}</span>
</div>
+ <div class="column-preview">
+ <span class="label-preview">鏁伴噺/鎬绘暟</span>
+ <span class="value-preview full-width">{{ item.quantity }}</span>
+ </div>
</div>
<div class="row-preview dual-column">
@@ -107,10 +112,7 @@
<span class="label-preview">瑙勬牸</span>
<span class="value-preview full-width">{{ item.materialSpec }}</span>
</div>
- <div class="column-preview">
- <span class="label-preview">鏁伴噺/鎬绘暟</span>
- <span class="value-preview full-width">{{ item.quantity }}</span>
- </div>
+
</div>
<div class="row-preview dual-column">
@@ -305,7 +307,7 @@
.row {
display: flex !important;
margin-bottom: 1.2mm !important;
- min-height: 6.5mm !important;
+ min-height: 5.5mm !important;
align-items: stretch !important;
}
@@ -318,15 +320,11 @@
flex: 1 !important;
display: flex !important;
align-items: center !important;
- min-height: 5mm !important;
+ min-height: 4mm !important;
}
- .column:first-child {
- margin-right: 2.5mm !important;
- }
.label {
- flex: 0 0 8mm !important;
white-space: nowrap !important;
font-size: 2.5mm !important;
line-height: 1.3 !important;
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 62c338f..f786268 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"
@@ -281,15 +281,11 @@
return;
}
- // 鏋勯�犺姹傚弬鏁帮細
- // 1. 璇锋眰浣擄細鐩存帴浼犻�抯tockViews鏁扮粍锛堝搴斿悗绔疞ist<StockViewDTO>锛�
- // 2. outStation锛氶�氳繃鏌ヨ鍙傛暟浼犻�掞紙鍥犲悗绔湭鎸囧畾[FromBody]鎺ユ敹璇ュ弬鏁帮級
- const requestBody = stockViews; // 鐩存帴浼犻�掗�変腑鏁扮粍锛堢‘淇濇暟缁勫唴瀵硅薄缁撴瀯涓嶴tockViewDTO涓�鑷达級
+ const requestBody = stockViews;
const outStation = formData.outStation;
- // 鎺ュ彛璇锋眰锛歅ost鏂瑰紡锛岃姹備綋浼爏tockViews鏁扮粍锛宱utStation鎷煎埌URL鏌ヨ鍙傛暟
try {
- // 鎷兼帴鏌ヨ鍙傛暟锛堝鏋渙utStation鏈夌壒娈婂瓧绗︼紝鍙娇鐢╡ncodeURIComponent澶勭悊锛�
+
const url = `api/Task/TakeOutbound?outStation=${encodeURIComponent(outStation)}`;
const x = await this.http.post(
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/printForm.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/printForm.vue"
index 540435a..9490e6a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/printForm.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/printForm.vue"
@@ -32,25 +32,25 @@
/>
</el-form-item>
- <el-form-item label="瑙勬牸" prop="specification">
+ <el-form-item label="瑙勬牸" prop="materialSpec">
<el-input
- v-model="printForm.specification"
+ v-model="printForm.materialSpec"
placeholder="璇疯緭鍏ョ墿鏂欒鏍�"
clearable
/>
</el-form-item>
- <el-form-item label="鎵瑰彿" prop="batchNumber">
+ <el-form-item label="鎵瑰彿" prop="barcode">
<el-input
- v-model="printForm.batchNumber"
+ v-model="printForm.barcode"
placeholder="璇疯緭鍏ユ壒鍙凤紙鐢熸垚浜岀淮鐮佺敤锛�"
clearable
/>
</el-form-item>
- <el-form-item label="鍘傚尯" prop="factory">
+ <el-form-item label="鍘傚尯" prop="factoryArea">
<el-input
- v-model="printForm.factory"
+ v-model="printForm.factoryArea"
placeholder="璇疯緭鍏ュ巶鍖哄悕绉�"
clearable
/>
@@ -59,33 +59,33 @@
<!-- 绗簩鍒� -->
<el-col :span="12">
- <el-form-item label="渚涘簲鍟嗙紪鐮�" prop="supplierCode">
+ <el-form-item label="渚涘簲鍟嗙紪鐮�" prop="suplierCode">
<el-input
- v-model="printForm.supplierCode"
+ v-model="printForm.suplierCode"
placeholder="璇疯緭鍏ヤ緵搴斿晢缂栫爜"
clearable
/>
</el-form-item>
- <el-form-item label="閲囪喘鍗曞彿" prop="purchaseOrderNo">
+ <el-form-item label="閲囪喘鍗曞彿" prop="pruchaseOrderNo">
<el-input
- v-model="printForm.purchaseOrderNo"
+ v-model="printForm.pruchaseOrderNo"
placeholder="璇疯緭鍏ラ噰璐崟鍙�"
clearable
/>
</el-form-item>
- <el-form-item label="鏁伴噺/鎬绘暟" prop="quantityTotal">
+ <el-form-item label="鏁伴噺/鎬绘暟" prop="quantity">
<el-input
- v-model="printForm.quantityTotal"
+ v-model="printForm.quantity"
placeholder="渚嬶細100/5000"
clearable
/>
</el-form-item>
- <el-form-item label="鎵规" prop="batch">
+ <el-form-item label="鎵规" prop="batchNo">
<el-input
- v-model="printForm.batch"
+ v-model="printForm.batchNo"
placeholder="璇疯緭鍏ユ壒娆″彿"
clearable
/>
@@ -141,14 +141,14 @@
// 琛ㄥ崟鏁版嵁锛堝搴攑rintView鎵�闇�鐨勫弬鏁帮級
printForm: {
materialCode: "", // 鏂欏彿
- supplierCode: "", // 渚涘簲鍟嗙紪鐮�
+ suplierCode: "", // 渚涘簲鍟嗙紪鐮�
materialName: "", // 鍝佸悕
- purchaseOrderNo: "", // 閲囪喘鍗曞彿
- specification: "", // 瑙勬牸
- quantityTotal: "", // 鏁伴噺/鎬绘暟
- batchNumber: "", // 鎵瑰彿锛堜簩缁寸爜鍐呭锛�
- batch: "", // 鎵规
- factory: "", // 鍘傚尯
+ pruchaseOrderNo: "", // 閲囪喘鍗曞彿
+ materialSpec: "", // 瑙勬牸
+ quantity: "", // 鏁伴噺/鎬绘暟
+ barcode: "", // 鎵瑰彿锛堜簩缁寸爜鍐呭锛�
+ batchNo: "", // 鎵规
+ factoryArea: "", // 鍘傚尯
date: "", // 鏃ユ湡锛堥粯璁ゅ綋鍓嶆棩鏈燂級
},
// 鎵撳嵃浠芥暟锛堟敮鎸佹壒閲忕敓鎴愬鏉＄浉鍚屾暟鎹級
@@ -157,7 +157,7 @@
formRules: {
materialCode: [{ required: true, message: "璇疯緭鍏ユ枡鍙�", trigger: "blur" }],
materialName: [{ required: true, message: "璇疯緭鍏ュ搧鍚�", trigger: "blur" }],
- batchNumber: [{ required: true, message: "璇疯緭鍏ユ壒鍙�", trigger: "blur" }],
+ barcode: [{ required: true, message: "璇疯緭鍏ユ壒鍙�", trigger: "blur" }],
date: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
},
};
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_OutboundService/OutboundPickingService.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_OutboundService/OutboundPickingService.cs"
index 19550fb..d244dd5 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_OutboundService/OutboundPickingService.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_OutboundService/OutboundPickingService.cs"
@@ -2483,7 +2483,7 @@
Operator = App.User.UserName,
lineNo = outboundOrderDetail.lineNo,
WarehouseCode = outboundOrderDetail.WarehouseCode ?? "鏃�",
- BarcodeQty = outboundOrderDetail.NoStockOutQty,
+ BarcodeQty = outboundOrderDetail.BarcodeQty,
BarcodeUnit = outboundOrderDetail.BarcodeUnit,
BatchNo = outboundOrderDetail.BatchNo
};
@@ -2618,6 +2618,8 @@
}).ToList()
}).ToList();
outfeedmodel.details.AddRange(groupdata);
+
+ _outStockLockInfoService.DeleteData(detailLocks);
}
//瀛樺偍鍥炰紶鍙傛暟锛屼繚璇佸紓甯告墜鍔ㄥ洖浼�
Dt_InterfaceLog interfaceLog = new Dt_InterfaceLog
--
Gitblit v1.9.3