From ab205a55b008fe73696073b2a141e618b13fb271 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 16 十二月 2024 09:26:33 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/BasicRepository.cs | 14
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/PurchaseOrderDetailRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/IStockInfoRepository.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/719780bf-fe87-4572-8100-bc81ec4f7f74.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IWarehouseRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs | 44 +++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderDetailRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/SupplierInfoRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ICheckRepository/ICheckOrderResultRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderDetailRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/WIDESEA_StockService.csproj | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IPurchaseOrderDetailRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/PurchaseOrderRepository.cs | 3
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue | 327 +++++++++++++++++++++++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/WarehouseRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReceiveOrderDetailRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IPurchaseOrderRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/LocationInfoRepository.cs | 35 ++
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7f936e8e-287c-47e4-a8cd-003d0971fc1d.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrder_HtyRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c1efb1e4-a109-49ce-9975-1c6c4061c161.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderDetailRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderDetail_HtyRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderDetail_HtyRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReceiveOrderRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/5b6089c5-1619-43fe-9608-d5b598449936.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ILocationInfoRepository.cs | 8
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrder_HtyRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReceiveOrderDetailRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrder_HtyRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderDetail_HtyRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockInfoService.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_CheckRepository/CheckOrderRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutStockLockInfoRepository.cs | 3
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 16
代码管理/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue | 97 +++++-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutStockLockInfoRepository.cs | 3
代码管理/WMS/WIDESEA_WMSClient/src/router/viewGird.js | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/MaterielInfoRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_CheckRepository/CheckOrderResultRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs | 3
/dev/null | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderDetail_HtyRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReceiveOrderRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ISupplierInfoRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrder_HtyRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderDetailRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs | 17 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ICheckRepository/ICheckOrderRepository.cs | 3
代码管理/WMS/WIDESEA_WMSClient/src/extension/inbound/purchaseOrder.js | 58 ++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IMaterielInfoRepository.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs | 5
61 files changed, 708 insertions(+), 50 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/inbound/purchaseOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/inbound/purchaseOrder.js"
new file mode 100644
index 0000000..24e1d94
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/inbound/purchaseOrder.js"
@@ -0,0 +1,58 @@
+
+//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+
+let extension = {
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
+ },
+ onInited() {
+ //妗嗘灦鍒濆鍖栭厤缃悗
+ //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
+ //this.detailOptions.columns.forEach(column=>{ });
+ },
+ searchBefore(param) {
+ //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
+ //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+ return true;
+ },
+ searchAfter(result) {
+ //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
+ return true;
+ },
+ addBefore(formData) {
+ //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
+ return true;
+ },
+ updateBefore(formData) {
+ //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
+ return true;
+ },
+ rowClick({ row, column, event }) {
+ //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
+ this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+ },
+ modelOpenAfter(row) {
+ //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
+ //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
+ //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
+ //(3)this.editFormFields.瀛楁='xxx';
+ //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
+ //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+ }
+ }
+ };
+ export default extension;
+
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue"
index 1a2ce9d..35b3d5e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue"
@@ -1,6 +1,12 @@
<template>
<div>
- <vol-box v-model="showDetialBox" :lazy="true" width="60%" :padding="15" title="鎸囧畾搴撳瓨">
+ <vol-box
+ v-model="showDetialBox"
+ :lazy="true"
+ width="60%"
+ :padding="15"
+ title="鎸囧畾搴撳瓨"
+ >
<div class="box-head">
<el-alert :closable="false" style="width: 100%">
<el-row>
@@ -9,41 +15,87 @@
<el-divider direction="vertical"></el-divider>
<span class="less-style">鐗╂枡缂栧彿锛� {{ row.materielCode }} </span>
<el-divider direction="vertical"></el-divider>
- <span class="less-style">闇�姹傛暟閲忥細 {{ row.orderQuantity }}
+ <span class="less-style"
+ >闇�姹傛暟閲忥細 {{ row.orderQuantity }}
</span>
<el-divider direction="vertical"></el-divider>
- <span :class="selectionClass">宸查�夋暟閲忥細 {{ selectionSum }}
+ <span :class="selectionClass"
+ >宸查�夋暟閲忥細 {{ selectionSum }}
</span>
</el-col>
<el-col :span="2">
- <el-link type="primary" size="small" style="float: right; height: 20px"
- @click="getData">鍒锋柊</el-link></el-col>
+ <el-link
+ type="primary"
+ size="small"
+ style="float: right; height: 20px"
+ @click="getData"
+ >鍒锋柊</el-link
+ ></el-col
+ >
<el-col :span="2">
- <el-link type="primary" size="small" style="float: right; height: 20px"
- @click="revokeAssign">鎾ら攢鍒嗛厤</el-link></el-col>
+ <el-link
+ type="primary"
+ size="small"
+ style="float: right; height: 20px"
+ @click="revokeAssign"
+ >鎾ら攢鍒嗛厤</el-link
+ ></el-col
+ >
</el-row>
</el-alert>
</div>
<div class="box-table" style="margin-top: 1%">
- <el-table ref="singleTable" :data="tableData" style="width: 100%; height: 100%" highlight-current-row
- @row-click="handleRowClick" height="500px" @selection-change="handleSelectionChange">
+ <el-table
+ ref="singleTable"
+ :data="tableData"
+ style="width: 100%; height: 100%"
+ highlight-current-row
+ @row-click="handleRowClick"
+ height="500px"
+ @selection-change="handleSelectionChange"
+ >
>
<el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column label="搴忓彿" type="index" fixed="left" width="55" align="center"></el-table-column>
- <el-table-column v-for="(item, index) in tableColumns.filter((x) => !x.hidden)" :key="index" :prop="item.prop"
- :label="item.title" :width="item.width" align="center">
+ <el-table-column
+ label="搴忓彿"
+ type="index"
+ fixed="left"
+ width="55"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ v-for="(item, index) in tableColumns.filter((x) => !x.hidden)"
+ :key="index"
+ :prop="item.prop"
+ :label="item.title"
+ :width="item.width"
+ align="center"
+ >
<template #default="scoped" v-if="item.type == 'icon'">
- <el-tooltip class="item" effect="dark" :content="item.title" placement="bottom"><el-button type="text"
- @click="tableButtonClick(scoped.row, item)"><i :class="item.icon"
- style="font-size: 22px"></i></el-button></el-tooltip>
+ <el-tooltip
+ class="item"
+ effect="dark"
+ :content="item.title"
+ placement="bottom"
+ ><el-button
+ type="text"
+ @click="tableButtonClick(scoped.row, item)"
+ ><i :class="item.icon" style="font-size: 22px"></i></el-button
+ ></el-tooltip>
</template>
</el-table-column>
</el-table>
</div>
<template #footer>
- <el-button type="primary" size="small" @click="outbound">鐩存帴鍑哄簱</el-button>
- <el-button type="primary" size="small" @click="lockStock">閿佸畾搴撳瓨</el-button>
- <el-button type="danger" size="small" @click="showDetialBox = false">鍏抽棴</el-button>
+ <el-button type="primary" size="small" @click="outbound"
+ >鐩存帴鍑哄簱</el-button
+ >
+ <el-button type="primary" size="small" @click="lockStock"
+ >閿佸畾搴撳瓨</el-button
+ >
+ <el-button type="danger" size="small" @click="showDetialBox = false"
+ >鍏抽棴</el-button
+ >
</template>
</vol-box>
</div>
@@ -96,6 +148,7 @@
},
methods: {
open(row) {
+ console.log(row);
this.row = row;
this.showDetialBox = true;
this.originalQuantity = this.row.lockQuantity;
@@ -145,7 +198,9 @@
this.http
.post(
"api/StockInfo/GetStockSelectViews?materielCode=" +
- this.row.materielCode,
+ this.row.materielCode +
+ "&orderId=" +
+ this.row.orderId,
null,
"鏌ヨ涓�"
)
@@ -227,12 +282,12 @@
background: oldlace;
}
-.box-table .el-table tbody tr:hover>td {
+.box-table .el-table tbody tr:hover > td {
background-color: #d8e0d4 !important;
/* color: #ffffff; */
}
-.box-table .el-table tbody tr.current-row>td {
+.box-table .el-table tbody tr.current-row > td {
background-color: #f0f9eb !important;
/* color: #ffffff; */
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js"
index 8bc32ac..83e4281 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js"
@@ -117,6 +117,10 @@
path: '/receiveOrder',
name: 'receiveOrder',
component: () => import('@/views/inbound/receiveOrder.vue')
+ },{
+ path: '/purchaseOrder',
+ name: 'purchaseOrder',
+ component: () => import('@/views/inbound/purchaseOrder.vue')
}]
export default viewgird
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index f4929a5..e84bd89 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -28,7 +28,7 @@
});
const editFormFields = ref({
orderType: "",
- orderNo:"",
+ inboundOrderNo: "",
upperOrderNo: "",
remark: "",
});
@@ -43,10 +43,10 @@
data: [],
},
{
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- },
+ field: "inboundOrderNo",
+ title: "鍗曟嵁缂栧彿",
+ type: "string",
+ },
{
title: "涓婃父鍗曟嵁缂栧彿",
field: "upperOrderNo",
@@ -60,7 +60,7 @@
],
]);
const searchFormFields = ref({
- orderNo: "",
+ inboundOrderNo: "",
upperOrderNo: "",
orderType: "",
orderStatus: "",
@@ -70,7 +70,7 @@
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
+ { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
@@ -111,7 +111,7 @@
align: "left",
},
{
- field: "orderNo",
+ field: "inboundOrderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
width: 120,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
new file mode 100644
index 0000000..a6eeafc
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
@@ -0,0 +1,327 @@
+
+<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/inbound/purchaseOrder.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鍏ュ簱鍗�",
+ name: "purchaseOrder",
+ url: "/PurchaseOrder/",
+ sortName: "CreateDate",
+ });
+ const editFormFields = ref({
+ // orderType: "",
+ // inboundOrderNo: "",
+ // upperOrderNo: "",
+ // remark: "",
+ });
+ const editFormOptions = ref([
+ // [
+ // {
+ // title: "鍗曟嵁绫诲瀷",
+ // required: true,
+ // field: "orderType",
+ // type: "select",
+ // dataKey: "inOrderType",
+ // data: [],
+ // },
+ // {
+ // field: "inboundOrderNo",
+ // title: "鍗曟嵁缂栧彿",
+ // type: "string",
+ // },
+ // {
+ // title: "涓婃父鍗曟嵁缂栧彿",
+ // field: "upperOrderNo",
+ // type: "string",
+ // },
+ // {
+ // title: "澶囨敞",
+ // field: "remark",
+ // type: "textarea",
+ // },
+ // ],
+ ]);
+ const searchFormFields = ref({
+ inboundOrderNo: "",
+ upperOrderNo: "",
+ orderType: "",
+ orderStatus: "",
+ createType: "",
+ creater: "",
+ createDate: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
+ { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
+ {
+ title: "鍗曟嵁绫诲瀷",
+ field: "orderType",
+ type: "select",
+ dataKey: "inOrderType",
+ data: [],
+ },
+ {
+ title: "鍗曟嵁鐘舵��",
+ field: "orderStatus",
+ type: "select",
+ dataKey: "inboundState",
+ data: [],
+ },
+ ],
+ [
+ {
+ title: "鍒涘缓鏂瑰紡",
+ field: "createType",
+ type: "select",
+ dataKey: "createType",
+ data: [],
+ },
+ { title: "鍒涘缓鑰�", field: "creater", type: "like" },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "purchaseOrderNo",
+ title: "閲囪喘鍗曞彿",
+ type: "string",
+ width: 120,
+ align: "left",
+ link: true,
+ },
+ {
+ field: "purchaseOrderType",
+ title: "鍗曟嵁绫诲瀷",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "supplierCode",
+ title: "渚涘簲鍟嗙紪鍙�",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "orderQuantity",
+ title: "閲囪喘鏁伴噺",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "purchaseOrderStatus",
+ title: "閲囪喘鍗曠姸鎬�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "orderDate",
+ title: "涓嬪崟鏃ユ湡",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "鍏ュ簱鍗曟槑缁�",
+ table: "InboundOrderDetail",
+ columns: [
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "purchaseOrderId",
+ title: "閲囪喘鍗曚富閿�",
+ type: "string",
+ width: 90,
+ align: "left",
+ hidden: true,
+ },
+ {
+ field: "rowNo",
+ title: "琛屽彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materielCode",
+ title: "鐗╂枡缂栧彿",
+ type: "select",
+ width: 150,
+ align: "left",
+ edit: { type: "" },
+ required: true,
+ },
+ {
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ edit: { type: "" },
+ },
+ // {
+ // field: "batchNo",
+ // title: "鎵规鍙�",
+ // type: "decimal",
+ // width: 90,
+ // align: "left",
+ // edit: { type: "" },
+ // required: true,
+ // },
+ {
+ field: "purchaseDetailQuantity",
+ title: "鍗曟嵁鏁伴噺",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱缂栧彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "purchaseDetailStatus",
+ title: "璁㈠崟鏄庣粏鐘舵��",
+ type: "string",
+ width: 180,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ ],
+ sortName: "id",
+ key: "id",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
+
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/341739e1-48c0-452c-a5ea-3c213effa27e.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/341739e1-48c0-452c-a5ea-3c213effa27e.vsidx"
deleted file mode 100644
index b775839..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/341739e1-48c0-452c-a5ea-3c213effa27e.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4cc8f357-fc0c-4940-a3b6-b8853a50c180.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4cc8f357-fc0c-4940-a3b6-b8853a50c180.vsidx"
deleted file mode 100644
index 22b1e74..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4cc8f357-fc0c-4940-a3b6-b8853a50c180.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/5b6089c5-1619-43fe-9608-d5b598449936.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/5b6089c5-1619-43fe-9608-d5b598449936.vsidx"
new file mode 100644
index 0000000..14e5046
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/5b6089c5-1619-43fe-9608-d5b598449936.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/719780bf-fe87-4572-8100-bc81ec4f7f74.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/719780bf-fe87-4572-8100-bc81ec4f7f74.vsidx"
new file mode 100644
index 0000000..e04325d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/719780bf-fe87-4572-8100-bc81ec4f7f74.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7f936e8e-287c-47e4-a8cd-003d0971fc1d.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7f936e8e-287c-47e4-a8cd-003d0971fc1d.vsidx"
new file mode 100644
index 0000000..39f2368
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7f936e8e-287c-47e4-a8cd-003d0971fc1d.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a8d0b8fd-acc9-4a57-a8ad-394a2d0e11e0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a8d0b8fd-acc9-4a57-a8ad-394a2d0e11e0.vsidx"
deleted file mode 100644
index 972d9e2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a8d0b8fd-acc9-4a57-a8ad-394a2d0e11e0.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c1efb1e4-a109-49ce-9975-1c6c4061c161.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c1efb1e4-a109-49ce-9975-1c6c4061c161.vsidx"
new file mode 100644
index 0000000..0245253
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c1efb1e4-a109-49ce-9975-1c6c4061c161.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ea02e79b-60fd-46cb-830c-ee3a3c992700.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ea02e79b-60fd-46cb-830c-ee3a3c992700.vsidx"
deleted file mode 100644
index 0698fa9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ea02e79b-60fd-46cb-830c-ee3a3c992700.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/BasicRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/BasicRepository.cs"
index aac68af..51266df 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/BasicRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/BasicRepository.cs"
@@ -10,20 +10,26 @@
{
public class BasicRepository : IBasicRepository
{
+ /// <summary>
+ /// 璐т綅浠撳偍灞�
+ /// </summary>
public ILocationInfoRepository LocationInfoRepository { get; }
+ /// <summary>
+ /// 鐗╂枡浠撳偍灞�
+ /// </summary>
public IMaterielInfoRepository MaterielInfoRepository { get; }
+ /// <summary>
+ /// 浠撳簱浠撳偍灞�
+ /// </summary>
public IWarehouseRepository WarehouseRepository { get; }
- public IStockInfoDetailRepository StockInfoDetailServiceRepository { get; }
-
- public BasicRepository(ILocationInfoRepository locationInfoRepository, IMaterielInfoRepository materielInfoRepository, IWarehouseRepository warehouseRepository, IStockInfoDetailRepository stockInfoDetailServiceRepository)
+ public BasicRepository(ILocationInfoRepository locationInfoRepository, IMaterielInfoRepository materielInfoRepository, IWarehouseRepository warehouseRepository)
{
LocationInfoRepository = locationInfoRepository;
MaterielInfoRepository = materielInfoRepository;
WarehouseRepository = warehouseRepository;
- StockInfoDetailServiceRepository = stockInfoDetailServiceRepository;
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/LocationInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/LocationInfoRepository.cs"
index 28c4bb4..79ecbbf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/LocationInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/LocationInfoRepository.cs"
@@ -14,6 +14,9 @@
namespace WIDESEA_BasicRepository
{
+ /// <summary>
+ /// 璐т綅浠撳偍瀹炵幇灞�
+ /// </summary>
public class LocationInfoRepository : RepositoryBase<Dt_LocationInfo>, ILocationInfoRepository
{
public LocationInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
@@ -21,11 +24,23 @@
}
+ /// <summary>
+ /// 鑾峰彇鍒嗙粍鎵�鏈夎揣浣�
+ /// </summary>
+ /// <param name="roadway"></param>
+ /// <returns></returns>
public List<LocationGroupDTO> GetAllLocationGroups(string roadway)
{
return QueryTabs<Dt_LocationInfo, Dt_LocationInfo, LocationGroupDTO>((a, b) => a.Column == b.Column && a.Layer == b.Layer && a.Row != b.Row && SqlFunc.Abs(a.Row - b.Row) == 1, (a, b) => new LocationGroupDTO { DepthA = a.Depth, DepthB = b.Depth, EnableStatusA = a.EnableStatus, EnableStatusB = b.EnableStatus, IdA = a.Id, IdB = b.Id, LocationCodeA = a.LocationCode, LocationCodeB = b.LocationCode, LocationStatusA = a.LocationStatus, LocationStatusB = b.LocationStatus, LocationTypeA = a.LocationType, LocationTypeB = b.LocationType }, a => a.Depth == 1 && a.RoadwayNo == roadway, b => b.Depth == 2 && b.RoadwayNo == roadway, x => true);
}
+ /// <summary>
+ /// 鏍规嵁鐘舵�佽幏鍙栧垎缁勮揣浣�
+ /// </summary>
+ /// <param name="roadway"></param>
+ /// <param name="locationAStatus"></param>
+ /// <param name="locationBStatus"></param>
+ /// <returns></returns>
public List<LocationGroupDTO> GetLocationGroups(string roadway, LocationStatusEnum locationAStatus, LocationStatusEnum locationBStatus)
{
return QueryTabs<Dt_LocationInfo, Dt_LocationInfo, LocationGroupDTO>(
@@ -36,16 +51,21 @@
x => true);
}
- public override bool UpdateData(Dt_LocationInfo entity)
- {
- return base.UpdateData(entity);
- }
-
+ /// <summary>
+ /// 鏍规嵁璐т綅缂栧彿闆嗗悎鑾峰彇璐т綅淇℃伅
+ /// </summary>
+ /// <param name="locationCodes"></param>
+ /// <returns></returns>
public List<Dt_LocationInfo> GetLocationInfos(List<string> locationCodes)
{
return QueryData(x => locationCodes.Contains(x.LocationCode));
}
+ /// <summary>
+ /// 鎵归噺淇敼璐т綅鐘舵��
+ /// </summary>
+ /// <param name="locationInfos"></param>
+ /// <param name="locationStatus"></param>
public void UpdateLocationStatus(List<Dt_LocationInfo> locationInfos, LocationStatusEnum locationStatus)
{
locationInfos.ForEach(x =>
@@ -55,6 +75,11 @@
UpdateData(locationInfos);
}
+ /// <summary>
+ /// 鑾峰彇鍙嚭搴撹揣浣嶇紪鍙�
+ /// </summary>
+ /// <param name="warehouseId"></param>
+ /// <returns></returns>
public List<string> GetCanOutLocationCodes(int warehouseId)
{
return QueryData(x => x.LocationCode, x => x.WarehouseId == warehouseId && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt())).Distinct().ToList();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/MaterielInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/MaterielInfoRepository.cs"
index 8866a25..457a465 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/MaterielInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/MaterielInfoRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_BasicRepository
{
+ /// <summary>
+ /// 鐗╂枡淇℃伅浠撳偍瀹炵幇灞�
+ /// </summary>
public class MaterielInfoRepository : RepositoryBase<Dt_MaterielInfo>, IMaterielInfoRepository
{
public MaterielInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/SupplierInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/SupplierInfoRepository.cs"
index c774ecf..eb04802 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/SupplierInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/SupplierInfoRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_BasicRepository
{
+ /// <summary>
+ /// 渚涘簲鍟嗕俊鎭粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class SupplierInfoRepository : RepositoryBase<Dt_SupplierInfo>, ISupplierInfoRepository
{
public SupplierInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/WarehouseRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/WarehouseRepository.cs"
index 4e20a81..34cd13d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/WarehouseRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/WarehouseRepository.cs"
@@ -12,6 +12,9 @@
namespace WIDESEA_BasicRepository
{
+ /// <summary>
+ /// 浠撳簱淇℃伅瀹炵幇灞�
+ /// </summary>
public class WarehouseRepository : RepositoryBase<Dt_Warehouse>, IWarehouseRepository
{
public WarehouseRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckRepository/CheckOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckRepository/CheckOrderRepository.cs"
index adc22ff..150f5b6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckRepository/CheckOrderRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckRepository/CheckOrderRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_CheckRepository
{
+ /// <summary>
+ /// 璐ㄦ鍗曚粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class CheckOrderRepository : RepositoryBase<Dt_CheckOrder>, ICheckOrderRepository
{
public CheckOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckRepository/CheckOrderResultRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckRepository/CheckOrderResultRepository.cs"
index 42fd3b8..f9d9649 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckRepository/CheckOrderResultRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckRepository/CheckOrderResultRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_CheckRepository
{
+ /// <summary>
+ /// 璐ㄦ缁撴灉浠撳偍瀹炵幇灞�
+ /// </summary>
public class CheckOrderResultRepository : RepositoryBase<Dt_CheckOrderResult>, ICheckOrderResultRepository
{
public CheckOrderResultRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs"
index d03fb56..785290a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs"
@@ -207,7 +207,7 @@
}
else
{
- return "";
+ return "1 = 1";
}
//UserRole? userRole = PermissionDataHostService.UserRoles.FirstOrDefault(x => x.UserId == App.User.UserId);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ILocationInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ILocationInfoRepository.cs"
index 85c9a04..1b9937c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ILocationInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ILocationInfoRepository.cs"
@@ -11,6 +11,9 @@
namespace WIDESEA_IBasicRepository
{
+ /// <summary>
+ /// 璐т綅淇℃伅浠撳偍鎺ュ彛灞�
+ /// </summary>
public interface ILocationInfoRepository : IRepository<Dt_LocationInfo>
{
/// <summary>
@@ -43,6 +46,11 @@
/// <param name="locationStatus">璐т綅鐘舵��</param>
void UpdateLocationStatus(List<Dt_LocationInfo> locationInfos, LocationStatusEnum locationStatus);
+ /// <summary>
+ /// 鑾峰彇鍙嚭搴撹揣浣嶇紪鍙�
+ /// </summary>
+ /// <param name="warehouseId"></param>
+ /// <returns></returns>
List<string> GetCanOutLocationCodes(int warehouseId);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IMaterielInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IMaterielInfoRepository.cs"
index ad65a05..ac38d73 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IMaterielInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IMaterielInfoRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IBasicRepository
{
+ /// <summary>
+ /// 鐗╂枡淇℃伅浠撳偍鎺ュ彛灞�
+ /// </summary>
public interface IMaterielInfoRepository : IRepository<Dt_MaterielInfo>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ISupplierInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ISupplierInfoRepository.cs"
index f813d2e..bd20303 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ISupplierInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ISupplierInfoRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IBasicRepository
{
+ /// <summary>
+ /// 渚涘簲鍟嗕俊鎭粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface ISupplierInfoRepository : IRepository<Dt_SupplierInfo>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IWarehouseRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IWarehouseRepository.cs"
index 508ec8f..cb0c98a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IWarehouseRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IWarehouseRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IBasicRepository
{
+ /// <summary>
+ /// 浠撳簱淇℃伅浠撳偍鎺ュ彛灞�
+ /// </summary>
public interface IWarehouseRepository : IRepository<Dt_Warehouse>
{
/// <summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ICheckRepository/ICheckOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ICheckRepository/ICheckOrderRepository.cs"
index bb67159..1a9a50e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ICheckRepository/ICheckOrderRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ICheckRepository/ICheckOrderRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_ICheckRepository
{
+ /// <summary>
+ /// 璐ㄦ鍗曚粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface ICheckOrderRepository : IRepository<Dt_CheckOrder>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ICheckRepository/ICheckOrderResultRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ICheckRepository/ICheckOrderResultRepository.cs"
index e6da58d..95fd939 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ICheckRepository/ICheckOrderResultRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ICheckRepository/ICheckOrderResultRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_ICheckRepository
{
+ /// <summary>
+ /// 璐ㄦ缁撴灉浠撳偍鎺ュ彛灞�
+ /// </summary>
public interface ICheckOrderResultRepository : IRepository<Dt_CheckOrderResult>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderDetailRepository.cs"
index 1717f4c..199dd3b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderDetailRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderDetailRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IInboundRepository
{
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁嗕粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IInboundOrderDetailRepository : IRepository<Dt_InboundOrderDetail>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderDetail_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderDetail_HtyRepository.cs"
index aeb50e4..6491007 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderDetail_HtyRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderDetail_HtyRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IInboundRepository
{
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁嗗巻鍙蹭粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IInboundOrderDetail_HtyRepository : IRepository<Dt_InboundOrderDetail_Hty>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderRepository.cs"
index 1b12f58..3cada14 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrderRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IInboundRepository
{
+ /// <summary>
+ /// 鍏ュ簱鍗曚粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IInboundOrderRepository : IRepository<Dt_InboundOrder>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrder_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrder_HtyRepository.cs"
index 465c43e..a5409d9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrder_HtyRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IInboundOrder_HtyRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IInboundRepository
{
+ /// <summary>
+ /// 鍏ュ簱鍗曞巻鍙蹭粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IInboundOrder_HtyRepository : IRepository<Dt_InboundOrder_Hty>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IPurchaseOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IPurchaseOrderDetailRepository.cs"
index 6080ba3..772ca96 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IPurchaseOrderDetailRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IPurchaseOrderDetailRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IInboundRepository
{
+ /// <summary>
+ /// 閲囪喘鍗曟槑缁嗕粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IPurchaseOrderDetailRepository : IRepository<Dt_PurchaseOrderDetail>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IPurchaseOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IPurchaseOrderRepository.cs"
index 70adcf0..442d3e4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IPurchaseOrderRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IPurchaseOrderRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IInboundRepository
{
+ /// <summary>
+ /// 閲囪喘鍗曚粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IPurchaseOrderRepository : IRepository<Dt_PurchaseOrder>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReceiveOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReceiveOrderDetailRepository.cs"
index da9f0cf..44644fb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReceiveOrderDetailRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReceiveOrderDetailRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IInboundRepository
{
+ /// <summary>
+ /// 鏀惰揣鍗曟槑缁嗕粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IReceiveOrderDetailRepository : IRepository<Dt_ReceiveOrderDetail>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReceiveOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReceiveOrderRepository.cs"
index ba12796..dd5570e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReceiveOrderRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/IReceiveOrderRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IInboundRepository
{
+ /// <summary>
+ /// 鏀惰揣鍗曚粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IReceiveOrderRepository : IRepository<Dt_ReceiveOrder>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutStockLockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutStockLockInfoRepository.cs"
index 1ca52c8..644b08d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutStockLockInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutStockLockInfoRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IOutboundRepository
{
+ /// <summary>
+ /// 鍑哄簱璇︽儏淇℃伅浠撳偍鎺ュ彛灞�
+ /// </summary>
public interface IOutStockLockInfoRepository : IRepository<Dt_OutStockLockInfo>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderDetailRepository.cs"
index 83b83a7..5dddddc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderDetailRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderDetailRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IOutboundRepository
{
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁嗕粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IOutboundOrderDetailRepository : IRepository<Dt_OutboundOrderDetail>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderDetail_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderDetail_HtyRepository.cs"
index e7404fc..98d38bc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderDetail_HtyRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderDetail_HtyRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IOutboundRepository
{
+ /// <summary>
+ /// 鍑哄簱鍗曟槑缁嗗巻鍙蹭粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IOutboundOrderDetail_HtyRepository : IRepository<Dt_OutboundOrderDetail_Hty>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderRepository.cs"
index 659a754..f8c62d9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrderRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IOutboundRepository
{
+ /// <summary>
+ /// 鍏ュ簱鍗曚粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IOutboundOrderRepository : IRepository<Dt_OutboundOrder>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrder_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrder_HtyRepository.cs"
index c69f3e0..415a955 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrder_HtyRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/IOutboundOrder_HtyRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IOutboundRepository
{
+ /// <summary>
+ /// 鍑哄簱鍗曞巻鍙蹭粨鍌ㄦ帴鍙ｅ眰
+ /// </summary>
public interface IOutboundOrder_HtyRepository : IRepository<Dt_OutboundOrder_Hty>
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/IStockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/IStockInfoRepository.cs"
index 2cdd70c..6b542d0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/IStockInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/IStockInfoRepository.cs"
@@ -17,7 +17,7 @@
List<Dt_StockInfo> GetStockInfos(string materielCode);
- List<Dt_StockInfo> GetStockInfos(string materielCode, List<string> locationCodes);
+ List<Dt_StockInfo> GetStockInfos(string materielCode, string lotNo, List<string> locationCodes);
List<Dt_StockInfo> GetStockInfosByIds(List<int> ids);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockInfoService.cs"
index 5ec7435..8ed19f0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockInfoService.cs"
@@ -14,8 +14,10 @@
{
IStockInfoRepository Repository { get; }
+ List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode);
+
List<Dt_StockInfo> GetOutboundStocks(List<Dt_StockInfo> stockInfos, string materielCode, float needQuantity, out float residueQuantity);
- List<Dt_StockInfo> GetUseableStocks(string materielCode, int warehoseId);
+ List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, int warehoseId);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderDetailRepository.cs"
index 905d537..46a9294 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderDetailRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderDetailRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_InboundRepository
{
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁嗕粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class InboundOrderDetailRepository : RepositoryBase<Dt_InboundOrderDetail>, IInboundOrderDetailRepository
{
public InboundOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderDetail_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderDetail_HtyRepository.cs"
index 6c4e501..1266b73 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderDetail_HtyRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderDetail_HtyRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_InboundRepository
{
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁嗗巻鍙蹭粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class InboundOrderDetail_HtyRepository : RepositoryBase<Dt_InboundOrderDetail_Hty>, IInboundOrderDetail_HtyRepository
{
public InboundOrderDetail_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderRepository.cs"
index 9cb687c..371a492 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrderRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_InboundRepository
{
+ /// <summary>
+ /// 鍏ュ簱鍗曚粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class InboundOrderRepository : RepositoryBase<Dt_InboundOrder>, IInboundOrderRepository
{
private readonly IUnitOfWorkManage _unitOfWorkManage;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrder_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrder_HtyRepository.cs"
index d46fa54..f81ab2f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrder_HtyRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/InboundOrder_HtyRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_InboundRepository
{
+ /// <summary>
+ /// 鍏ュ簱鍗曞巻鍙蹭粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class InboundOrder_HtyRepository : RepositoryBase<Dt_InboundOrder_Hty>, IInboundOrder_HtyRepository
{
private readonly IUnitOfWorkManage _unitOfWorkManage;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/PurchaseOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/PurchaseOrderDetailRepository.cs"
index cf09843..b04d125 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/PurchaseOrderDetailRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/PurchaseOrderDetailRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_InboundRepository
{
+ /// <summary>
+ /// 閲囪喘鍗曟槑缁嗕粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class PurchaseOrderDetailRepository : RepositoryBase<Dt_PurchaseOrderDetail>, IPurchaseOrderDetailRepository
{
public PurchaseOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/PurchaseOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/PurchaseOrderRepository.cs"
index 0dc7e6a..2156a34 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/PurchaseOrderRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/PurchaseOrderRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_InboundRepository
{
+ /// <summary>
+ /// 閲囪喘鍗曚粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class PurchaseOrderRepository : RepositoryBase<Dt_PurchaseOrder>, IPurchaseOrderRepository
{
public PurchaseOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReceiveOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReceiveOrderDetailRepository.cs"
index 2ef674c..e3bfaa4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReceiveOrderDetailRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReceiveOrderDetailRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_InboundRepository
{
+ /// <summary>
+ /// 鏀惰揣鍗曟槑缁嗕粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class ReceiveOrderDetailRepository : RepositoryBase<Dt_ReceiveOrderDetail>, IReceiveOrderDetailRepository
{
public ReceiveOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReceiveOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReceiveOrderRepository.cs"
index ab1cd7b..f8cc367 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReceiveOrderRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/ReceiveOrderRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_InboundRepository
{
+ /// <summary>
+ /// 鏀惰揣鍗曚粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class ReceiveOrderRepository : RepositoryBase<Dt_ReceiveOrder>, IReceiveOrderRepository
{
public ReceiveOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
index 9f09eff..ab95005 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
@@ -125,7 +125,8 @@
OverInQuantity = 0,
ReceiptQuantity = 0,
RowNo = item.RowNo,
- Unit = item.Unit
+ Unit = item.Unit,
+ BatchNo = item.LotNo
};
inboundOrder.Details.Add(detail);
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs"
index 217765a..90d48d5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs"
@@ -20,6 +20,9 @@
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
public string MaterielCode { get; set; }
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵规鍙�")]
+ public string BatchNo { get; set; }
+
[SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
public float OrderQuantity { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutStockLockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutStockLockInfoRepository.cs"
index 2bfc69a..dadc43c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutStockLockInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutStockLockInfoRepository.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_IOutboundRepository
{
+ /// <summary>
+ /// 鍑哄簱璇︽儏淇℃伅浠撳偍瀹炵幇灞�
+ /// </summary>
public class OutStockLockInfoRepository : RepositoryBase<Dt_OutStockLockInfo>, IOutStockLockInfoRepository
{
public OutStockLockInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderDetailRepository.cs"
index 90a316c..d1ce7ba 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderDetailRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderDetailRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_OutboundRepository
{
+ /// <summary>
+ /// 鍑哄簱鍗曟槑缁嗕粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class OutboundOrderDetailRepository : RepositoryBase<Dt_OutboundOrderDetail>, IOutboundOrderDetailRepository
{
public OutboundOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderDetail_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderDetail_HtyRepository.cs"
index 975028e..7e046c0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderDetail_HtyRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderDetail_HtyRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_OutboundRepository
{
+ /// <summary>
+ /// 鍑哄簱鍗曟槑缁嗗巻鍙蹭粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class OutboundOrderDetail_HtyRepository : RepositoryBase<Dt_OutboundOrderDetail_Hty>, IOutboundOrderDetail_HtyRepository
{
public OutboundOrderDetail_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderRepository.cs"
index 03ae168..a3e437d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrderRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_OutboundRepository
{
+ /// <summary>
+ /// 鍑哄簱鍗曚粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class OutboundOrderRepository : RepositoryBase<Dt_OutboundOrder>, IOutboundOrderRepository
{
public OutboundOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrder_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrder_HtyRepository.cs"
index 82c99dd..044e4d9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrder_HtyRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/OutboundOrder_HtyRepository.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_OutboundRepository
{
+ /// <summary>
+ /// 鍑哄簱鍗曞巻鍙蹭粨鍌ㄥ疄鐜板眰
+ /// </summary>
public class OutboundOrder_HtyRepository : RepositoryBase<Dt_OutboundOrder_Hty>, IOutboundOrder_HtyRepository
{
public OutboundOrder_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
index 60c1462..330d4d8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
@@ -59,7 +59,7 @@
List<Dt_StockInfo> outStock = new List<Dt_StockInfo>();
- List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(outboundOrderDetail.MaterielCode, outboundOrder.WarehouseId);
+ List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(outboundOrderDetail.MaterielCode, outboundOrderDetail.BatchNo, outboundOrder.WarehouseId);
float stockTotalQuantity = stockInfos.Select(x => x.Details.Sum(v => v.StockQuantity - v.OutboundQuantity)).Sum(x => x);
if (stockTotalQuantity >= needQuantity)//搴撳瓨澶�
{
@@ -181,7 +181,7 @@
needQuantity -= assignQuantity;
if (outboundOrderDetail.OrderQuantity > outboundOrderDetail.LockQuantity)
{
- List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(outboundOrderDetail.MaterielCode, outboundOrder.WarehouseId);
+ List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(outboundOrderDetail.MaterielCode, outboundOrderDetail.BatchNo, outboundOrder.WarehouseId);
stockInfos = stockInfos.Where(x => !stockSelectViews.Select(v => v.PalletCode).Contains(x.PalletCode)).ToList();
List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, outboundOrderDetail.MaterielCode, needQuantity, out float residueQuantity);
outboundOrderDetail.LockQuantity += needQuantity - residueQuantity;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs"
index a8c6814..2dbdad0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs"
@@ -65,9 +65,9 @@
//return sugarQueryable.InnerJoin(sugarQueryable1, (a, b) => a.LocationCode == b.LocationCode).Select((a, b) => b).Includes(x => x.Details).ToList();
}
- public List<Dt_StockInfo> GetStockInfos(string materielCode, List<string> locationCodes)
+ public List<Dt_StockInfo> GetStockInfos(string materielCode, string lotNo, List<string> locationCodes)
{
- return Db.Queryable<Dt_StockInfo>().Where(x => locationCodes.Contains(x.LocationCode)).Includes(x => x.Details).Where(x => x.Details.Any(v => v.MaterielCode == materielCode)).ToList();
+ return Db.Queryable<Dt_StockInfo>().Where(x => locationCodes.Contains(x.LocationCode)).Includes(x => x.Details).Where(x => x.Details.Any(v => v.MaterielCode == materielCode && v.BatchNo == lotNo)).ToList();
//ISugarQueryable<Dt_LocationInfo> sugarQueryable = Db.Queryable<Dt_LocationInfo>().Where(x => locationCodes.Contains(x.LocationCode));
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
index 37f7521..5c4209b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs"
@@ -12,6 +12,7 @@
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicRepository;
+using WIDESEA_IOutboundRepository;
using WIDESEA_IRecordRepository;
using WIDESEA_IRecordService;
using WIDESEA_IStockRepository;
@@ -24,13 +25,50 @@
{
private readonly IMapper _mapper;
private readonly IBasicRepository _basicRepository;
+ private readonly IOutboundRepository _outboundRepository;
public IStockInfoRepository Repository => BaseDal;
- public StockInfoService(IStockInfoRepository BaseDal, IMapper mapper, IBasicRepository basicRepository) : base(BaseDal)
+ public StockInfoService(IStockInfoRepository BaseDal, IMapper mapper, IBasicRepository basicRepository, IOutboundRepository outboundRepository) : base(BaseDal)
{
_mapper = mapper;
_basicRepository = basicRepository;
+ _outboundRepository = outboundRepository;
+ }
+
+ public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
+ {
+ try
+ {
+ Dt_OutboundOrder outboundOrder = _outboundRepository.OutboundOrderRepository.QueryFirst(x => x.Id == orderId);
+ if (outboundOrder == null)
+ {
+ throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
+ }
+
+ List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(outboundOrder.WarehouseId);
+
+ return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO
+ {
+ LocationCode = a.LocationCode,
+ MaterielCode = b.MaterielCode,
+ MaterielName = b.MaterielName,
+ PalletCode = a.PalletCode,
+ UseableQuantity = b.StockQuantity - b.OutboundQuantity
+ }, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO
+ {
+ LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
+ MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
+ MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
+ PalletCode = x.Key,
+ UseableQuantity = x.Sum(x => x.UseableQuantity)
+ }).ToList();
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+
}
public List<Dt_StockInfo> GetOutboundStocks(List<Dt_StockInfo> stockInfos, string materielCode, float needQuantity, out float residueQuantity)
@@ -110,11 +148,11 @@
return outStocks;
}
- public List<Dt_StockInfo> GetUseableStocks(string materielCode, int warehoseId)
+ public List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, int warehoseId)
{
List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
- return BaseDal.GetStockInfos(materielCode, locationCodes);
+ return BaseDal.GetStockInfos(materielCode, batchNo, locationCodes);
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/WIDESEA_StockService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/WIDESEA_StockService.csproj"
index 0ce2805..c08afd6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/WIDESEA_StockService.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/WIDESEA_StockService.csproj"
@@ -8,6 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\WIDESEA_IBasicRepository\WIDESEA_IBasicRepository.csproj" />
+ <ProjectReference Include="..\WIDESEA_IOutboundRepository\WIDESEA_IOutboundRepository.csproj" />
<ProjectReference Include="..\WIDESEA_IRecordRepository\WIDESEA_IRecordRepository.csproj" />
<ProjectReference Include="..\WIDESEA_IRecordService\WIDESEA_IRecordService.csproj" />
<ProjectReference Include="..\WIDESEA_IStockService\WIDESEA_IStockService.csproj" />
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs"
new file mode 100644
index 0000000..abdabac
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs"
@@ -0,0 +1,17 @@
+锘縰sing Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_IInboundService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.Inbound
+{
+ [Route("api/PurchaseOrder")]
+ [ApiController]
+ public class PurchaseOrderController : ApiBaseController<IPurchaseOrderService, Dt_PurchaseOrder>
+ {
+ public PurchaseOrderController(IPurchaseOrderService service) : base(service)
+ {
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
index 2fe7a2f..49837c9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
@@ -18,5 +18,10 @@
{
}
+ [HttpPost, HttpGet, Route("GetStockSelectViews")]
+ public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
+ {
+ return Service.GetStockSelectViews(orderId, materielCode);
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
index 671db48..2a23123 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
@@ -43,7 +43,7 @@
builder.Services.AddWebSocketSetup();
builder.Services.AddSqlsugarSetup();//SqlSugar 启动服务
builder.Services.AddDbSetup();//Db 启动服务
-builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入
+//builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入
builder.Services.AddHostedService<PermissionDataHostService>();//应用初始化服务注入
builder.Services.AddAutoMapperSetup();
--
Gitblit v1.9.3