From 2510ff614cd2962d2a91ec1a9eb6668009e9b671 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 12 十二月 2024 10:43:35 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs | 19
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/LocationStatusChangeRecordController.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs | 27 ++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ApprovalService/ApprovalTaskService.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs | 1
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d7105167-5efc-465c-b440-fa7c68170e72.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d98d9afe-9e7d-42bb-a74d-be4c0981ccda.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordService.cs | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/Index.vue | 7
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockInfo_HtyService.cs | 1
代码管理/WMS/WIDESEA_WMSClient/src/assets/imgs/wcs_x.png | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/BasicService.cs | 20 -
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/RecordService.cs | 4
代码管理/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue | 483 +++++++++++++++++++-----------------
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f24c70fa-e22c-4a39-92fe-e726fb794d24.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs | 45 +++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/LocationStatusChangeRecordService.cs | 5
项目资料/接口文档/MES业务流程图V1.0.xlsx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/index/Message.vue | 76 +++--
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 3
项目资料/接口文档/MES业务流程图V1.0.vsdx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/09f72f2c-b273-4279-b316-3cd115d14817.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutofacPropertityModuleReg.cs | 1
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/17995e9c-2ddd-48c7-bbd9-eada1e6c4f48.vsidx | 0
/dev/null | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockInfoService.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/IRecordService.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/ILocationStatusChangeRecordService.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IApprovalService/IApprovalTaskService.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/StockQuantityChangeRecordService.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrder_HtyService.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutStockLockInfoService.cs | 1
40 files changed, 397 insertions(+), 333 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/assets/imgs/wcs_x.png" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/assets/imgs/wcs_x.png"
new file mode 100644
index 0000000..df6e40c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/assets/imgs/wcs_x.png"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue"
index 9e14d8e..a861f7d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue"
@@ -1,261 +1,292 @@
<template>
- <div>
- <vol-box v-model="showDetialBox" :lazy="true" width="1500px" :padding="15" title="鍏ュ簱鍗曟嵁鏄庣粏">
- <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-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.field" :label="item.title" :width="item.width" align="center">
- <template #default="scoped">
- <div 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>
- </div>
- <div v-else-if="item.type == 'tag'">
- <el-tag size="small">
- {{ getDictionary(scoped.row, item) }}
- </el-tag>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </vol-box>
- </div>
+ <div>
+ <vol-box
+ v-model="showDetialBox"
+ :lazy="true"
+ width="1500px"
+ :padding="15"
+ title="璐т綅鐘舵�佸彉鍔ㄨ褰�"
+ >
+ <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-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.field"
+ :label="item.title"
+ :width="item.width"
+ align="center"
+ >
+ <template #default="scoped">
+ <div 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>
+ </div>
+ <div v-else-if="item.type == 'tag'">
+ <el-tag size="small">
+ {{ getDictionary(scoped.row, item) }}
+ </el-tag>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </vol-box>
+ </div>
</template>
<script>
import VolBox from "@/components/basic/VolBox.vue";
export default {
- components: { VolBox },
- data() {
- return {
- showDetialBox: false,
- row: null,
- tableData: [],
- tableColumns: [
- {
- field: "locationId",
- title: "璐т綅涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "locationCode",
- title: "璐т綅缂栧彿",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "beforeStatus",
- title: "鍙樺姩鍓嶈揣浣嶇姸鎬�",
- type: "tag",
- width: 150,
- align: "left",
- bindKey: "locationStatusEnum"
- },
- {
- field: "afterStatus",
- title: "鍙樺姩鍚庤揣浣嶇姸鎬�",
- type: "tag",
- width: 150,
- align: "left",
- bindKey: "locationStatusEnum"
- },
- {
- field: "changeType",
- title: "鍙樺姩绫诲瀷",
- type: "tag",
- width: 100,
- align: "left",
- bindKey: "stockChangeType",
- },
- {
- field: "orderId",
- title: "鍗曟嵁涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "int",
- width: 160,
- align: "left",
- },
- {
- field: "orderDetailId",
- title: "鍗曟嵁鏄庣粏涓婚敭",
- type: "string",
- width: 200,
- align: "left",
- hidden: true,
- },
- {
- field: "taskNum",
- 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",
- sort: true,
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden: true,
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true,
- sort: true,
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden: true,
- },
- ],
- paginations: {
- sort: "CreateDate",
- order: "desc",
- Foots: "",
- total: 0,
- // 2020.08.29澧炲姞鑷畾涔夊垎椤垫潯澶у皬
- sizes: [30, 60, 100, 120],
- size: 30, // 榛樿鍒嗛〉澶у皬
- Wheres: [],
- page: 1,
- rows: 30,
- },
- dictionaryList: null,
- };
+ components: { VolBox },
+ data() {
+ return {
+ showDetialBox: false,
+ row: null,
+ tableData: [],
+ tableColumns: [
+ {
+ field: "locationId",
+ title: "璐т綅涓婚敭",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "locationCode",
+ title: "璐т綅缂栧彿",
+ type: "string",
+ align: "left",
+ },
+ {
+ field: "beforeStatus",
+ title: "鍙樺姩鍓嶈揣浣嶇姸鎬�",
+ type: "tag",
+ width: 150,
+ align: "left",
+ bindKey: "locationStatusEnum",
+ },
+ {
+ field: "afterStatus",
+ title: "鍙樺姩鍚庤揣浣嶇姸鎬�",
+ type: "tag",
+ width: 150,
+ align: "left",
+ bindKey: "locationStatusEnum",
+ },
+ {
+ field: "changeType",
+ title: "鍙樺姩绫诲瀷",
+ type: "tag",
+ width: 100,
+ align: "left",
+ bindKey: "locationChangeType",
+ },
+ {
+ field: "orderId",
+ title: "鍗曟嵁涓婚敭",
+ type: "string",
+ width: 90,
+ align: "left",
+ hidden: true,
+ },
+ {
+ field: "orderNo",
+ title: "鍗曟嵁缂栧彿",
+ type: "int",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "orderDetailId",
+ title: "鍗曟嵁鏄庣粏涓婚敭",
+ type: "string",
+ width: 200,
+ align: "left",
+ hidden: true,
+ },
+ {
+ field: "taskNum",
+ 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",
+ sort: true,
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ hidden: true,
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ hidden: true,
+ sort: true,
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 100,
+ align: "left",
+ hidden: true,
+ },
+ ],
+ paginations: {
+ sort: "CreateDate",
+ order: "desc",
+ Foots: "",
+ total: 0,
+ // 2020.08.29澧炲姞鑷畾涔夊垎椤垫潯澶у皬
+ sizes: [30, 60, 100, 120],
+ size: 30, // 榛樿鍒嗛〉澶у皬
+ Wheres: [],
+ page: 1,
+ rows: 30,
+ },
+ dictionaryList: null,
+ };
+ },
+ methods: {
+ open(row) {
+ this.row = row;
+ this.showDetialBox = true;
+ this.getDetailData();
+ this.getDictionaryData();
},
- methods: {
- open(row) {
- this.row = row;
- this.showDetialBox = true;
- this.getDetailData();
- this.getDictionaryData();
- },
- getDetailData() {
- this.http
- .post(
- "/api/LocationStatusChangeRecord/GetLocationState?id=" + this.row.id,
- {},
- true
- )
- .then((x) => {
- if (!x.status) return this.$message.error(x.message);
- this.tableData = x.data;
- });
- },
- getDictionaryData() {
- if (this.dictionaryList) {
- return;
- }
- var param = [];
- this.tableColumns.forEach((x) => {
- if (x.type == "tag" && x.bindKey != "") {
- param.push(x.bindKey);
- }
- });
- this.http
- .post("api/Sys_Dictionary/GetVueDictionary", param, "鏌ヨ涓�")
- .then((x) => {
- if (x.length > 0) {
- this.dictionaryList = x;
- }
- });
- },
- getDictionary(row, column) {
- if (this.dictionaryList) {
- var item = this.dictionaryList.find((x) => x.dicNo == column.bindKey);
- if (item) {
- var dicItem = item.data.find((x) => x.key == row[column.field]);
- console.log(dicItem);
- if (dicItem) {
- return dicItem.value;
- }
- else {
- return row[column.field];
- }
- } else {
- return row[column.field];
- }
- }
- },
+ getDetailData() {
+ this.http
+ .post(
+ "/api/LocationStatusChangeRecord/GetLocationState?id=" + this.row.id,
+ {},
+ true
+ )
+ .then((x) => {
+ if (!x.status) return this.$message.error(x.message);
+ this.tableData = x.data;
+ });
},
+ getDictionaryData() {
+ if (this.dictionaryList) {
+ return;
+ }
+ var param = [];
+ this.tableColumns.forEach((x) => {
+ if (x.type == "tag" && x.bindKey != "") {
+ param.push(x.bindKey);
+ }
+ });
+ this.http
+ .post("api/Sys_Dictionary/GetVueDictionary", param, "鏌ヨ涓�")
+ .then((x) => {
+ if (x.length > 0) {
+ this.dictionaryList = x;
+ }
+ });
+ },
+ getDictionary(row, column) {
+ if (this.dictionaryList) {
+ var item = this.dictionaryList.find((x) => x.dicNo == column.bindKey);
+ if (item) {
+ var dicItem = item.data.find((x) => x.key == row[column.field]);
+ console.log(dicItem);
+ if (dicItem) {
+ return dicItem.value;
+ } else {
+ return row[column.field];
+ }
+ } else {
+ return row[column.field];
+ }
+ }
+ },
+ },
-
- created() { },
+ created() {},
};
</script>
<style scoped>
.el-col {
- border-radius: 4px;
+ border-radius: 4px;
}
.grid-content {
- border-radius: 4px;
- min-height: 36px;
+ border-radius: 4px;
+ min-height: 36px;
}
.content-text {
- display: flex;
- align-items: center;
- justify-content: center;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.right-text {
- display: flex;
- align-items: center;
- justify-content: flex-end;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
}
</style>
<style>
.el-table .warning-row {
- background: #e6a23c;
+ background: #e6a23c;
}
.el-table .success-row {
- background: #f0f9eb;
+ background: #f0f9eb;
}
.el-table .error-row {
- background: #f56c6c;
+ background: #f56c6c;
}
</style>
\ 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/views/Index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Index.vue"
index 1bb1051..d186352 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Index.vue"
@@ -214,7 +214,7 @@
watch,
onMounted,
getCurrentInstance,
- h
+ h,
} from "vue";
import { useRouter, useRoute } from "vue-router";
import store from "../store/index";
@@ -319,6 +319,7 @@
ElNotification({
title: data.title,
message: h("i", { style: "color: teal" }, data.message),
+ position: "bottom-right",
});
};
@@ -338,9 +339,7 @@
setTimeout(createSocket, 10000);
};
- client.onerror = function () {
-
- };
+ client.onerror = function () {};
};
const changeTheme = (name) => {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/index/Message.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/index/Message.vue"
index 136d07b..e051ab6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/index/Message.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/index/Message.vue"
@@ -4,41 +4,46 @@
<div class="title">{{ item.title }}({{ item.date }})</div>
<div class="content">
<el-row>
- <el-col :span="6">
+ <el-col :span="8">
<label>鏀惰揣鍗曞彿锛歿{ item.formData.receiveOrderNo }}</label>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<label>璐ㄦ鍗曞彿锛歿{ item.formData.checkOrderNo }}</label>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<label>鏀惰揣鏄庣粏琛屽彿锛歿{ item.formData.receiveDetailRowNo }}</label>
</el-col>
- <el-col :span="6">
+ </el-row>
+
+ <el-row>
+ <el-col :span="8">
<label>鐗╂枡缂栧彿锛歿{ item.formData.materielCode }}</label>
</el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
+ <el-col :span="8">
<label>鍚堟牸鏁伴噺锛歿{ item.formData.qualifiedQuantity }}</label>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<label>鐗归噰鏁伴噺锛歿{ item.formData.defectedQuantity }}</label>
</el-col>
- <el-col :span="6">
+ </el-row>
+
+ <el-row>
+ <el-col :span="8">
<label>閫�璐ф暟閲忥細{{ item.formData.returnQuantity }}</label>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<label>鎶ュ簾鏁伴噺锛歿{ item.formData.scrappedQuantity }}</label>
</el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
+ <el-col :span="8">
<label>璐ㄦ鎬绘暟锛歿{ item.formData.receivedQuantity }}</label>
</el-col>
- <el-col :span="6">
+ </el-row>
+
+ <el-row>
+ <el-col :span="16">
<label>鐗归噰璇存槑锛歿{ item.formData.defectedNote }}</label>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<label>妫�楠屼汉锛歿{ item.formData.checkUserName }}</label>
</el-col>
</el-row>
@@ -62,27 +67,26 @@
},
},
created() {
- if (!this.list.length) {
- this.list.push({
- title: "IQC璐ㄦ缁撴灉瀹℃壒",
- formData: {
- receiveOrderNo: "鏀惰揣鍗曞彿",
- checkOrderNo: "璐ㄦ鍗曞彿",
- receiveDetailRowNo: "鏀惰揣鏄庣粏琛屽彿",
- materielCode: "鐗╂枡缂栧彿",
- qualifiedQuantity: "鍚堟牸鏁伴噺",
- defectedQuantity: "鐗归噰鏁伴噺",
- returnQuantity: "閫�璐ф暟閲�",
- scrappedQuantity: "鎶ュ簾鏁伴噺",
- receivedQuantity: "璐ㄦ鎬绘暟",
- defectedNote: "鐗归噰璇存槑",
- checkUserName: "妫�楠屼汉",
- message: "娑堟伅娴嬭瘯鍐呭娑堟伅娴嬭瘯鍐呭娑堟伅娴嬭瘯鍐呭娑堟伅娴嬭瘯鍐呭",
- },
-
- date: "2022-05-02 03:10",
- });
- }
+ // if (!this.list.length) {
+ // this.list.push({
+ // title: "IQC璐ㄦ缁撴灉瀹℃壒",
+ // formData: {
+ // receiveOrderNo: "鏀惰揣鍗曞彿",
+ // checkOrderNo: "璐ㄦ鍗曞彿",
+ // receiveDetailRowNo: "鏀惰揣鏄庣粏琛屽彿",
+ // materielCode: "鐗╂枡缂栧彿",
+ // qualifiedQuantity: "鍚堟牸鏁伴噺",
+ // defectedQuantity: "鐗归噰鏁伴噺",
+ // returnQuantity: "閫�璐ф暟閲�",
+ // scrappedQuantity: "鎶ュ簾鏁伴噺",
+ // receivedQuantity: "璐ㄦ鎬绘暟",
+ // defectedNote: "鐗归噰璇存槑",
+ // checkUserName: "妫�楠屼汉",
+ // message: "娑堟伅娴嬭瘯鍐呭娑堟伅娴嬭瘯鍐呭娑堟伅娴嬭瘯鍐呭娑堟伅娴嬭瘯鍐呭",
+ // },
+ // date: "2022-05-02 03:10",
+ // });
+ // }
},
};
</script>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/09f72f2c-b273-4279-b316-3cd115d14817.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/09f72f2c-b273-4279-b316-3cd115d14817.vsidx"
new file mode 100644
index 0000000..9390d9f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/09f72f2c-b273-4279-b316-3cd115d14817.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/17995e9c-2ddd-48c7-bbd9-eada1e6c4f48.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/17995e9c-2ddd-48c7-bbd9-eada1e6c4f48.vsidx"
new file mode 100644
index 0000000..946ae09
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/17995e9c-2ddd-48c7-bbd9-eada1e6c4f48.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/789398d4-ad10-4b21-9f9c-c017ed2e4aa0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/789398d4-ad10-4b21-9f9c-c017ed2e4aa0.vsidx"
deleted file mode 100644
index d734286..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/789398d4-ad10-4b21-9f9c-c017ed2e4aa0.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/914d9c3f-57db-4637-bc40-52081424fde2.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/914d9c3f-57db-4637-bc40-52081424fde2.vsidx"
deleted file mode 100644
index 3007b7e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/914d9c3f-57db-4637-bc40-52081424fde2.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/d7105167-5efc-465c-b440-fa7c68170e72.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d7105167-5efc-465c-b440-fa7c68170e72.vsidx"
new file mode 100644
index 0000000..e07e61b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d7105167-5efc-465c-b440-fa7c68170e72.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/d98d9afe-9e7d-42bb-a74d-be4c0981ccda.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d98d9afe-9e7d-42bb-a74d-be4c0981ccda.vsidx"
new file mode 100644
index 0000000..bdefe6a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d98d9afe-9e7d-42bb-a74d-be4c0981ccda.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/eef0aa91-791e-44dd-b321-3146cf9e9a18.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/eef0aa91-791e-44dd-b321-3146cf9e9a18.vsidx"
deleted file mode 100644
index c712292..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/eef0aa91-791e-44dd-b321-3146cf9e9a18.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/f3502ed8-fc43-47df-b9a2-74d7c2feb215.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f24c70fa-e22c-4a39-92fe-e726fb794d24.vsidx"
similarity index 93%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f3502ed8-fc43-47df-b9a2-74d7c2feb215.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f24c70fa-e22c-4a39-92fe-e726fb794d24.vsidx"
index 3c31860..4c41aff 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f3502ed8-fc43-47df-b9a2-74d7c2feb215.vsidx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f24c70fa-e22c-4a39-92fe-e726fb794d24.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/f91e73eb-1823-4174-b99b-0eb163ec64f8.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f91e73eb-1823-4174-b99b-0eb163ec64f8.vsidx"
deleted file mode 100644
index 2f1d0a1..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f91e73eb-1823-4174-b99b-0eb163ec64f8.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_ApprovalService/ApprovalTaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ApprovalService/ApprovalTaskService.cs"
index 0c47e9a..86b016e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ApprovalService/ApprovalTaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ApprovalService/ApprovalTaskService.cs"
@@ -28,6 +28,8 @@
private readonly WebSocketServer _webSocketServer;
private readonly ISys_UserRepository _userRepository;
+ public IApprovalTaskRepository Repository => BaseDal;
+
public ApprovalTaskService(IApprovalTaskRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IApprovalFlowRepository approvalFlowRepository, IApprovalNodeRepository approvalNodeRepository, ICheckOrderRepository checkOrderRepository, WebSocketServer webSocketServer, ISys_UserRepository userRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
@@ -38,6 +40,8 @@
_userRepository = userRepository;
}
+
+
public WebResponseContent AuditAgree(int sourceKey)
{
try
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/BasicService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/BasicService.cs"
index 0d540d5..74092ce 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/BasicService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/BasicService.cs"
@@ -26,25 +26,5 @@
MaterielInfoService = materielInfoService;
WarehouseService = warehouseService;
}
-
- #region AreaInfo
-
- #endregion
-
- #region CachePoint
-
- #endregion
-
- #region LocationInfo
-
- #endregion
-
- #region RoadwayInfo
-
- #endregion
-
- #region Warehouse
-
- #endregion
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
index 176c147..d7f434a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
@@ -143,7 +143,6 @@
public void UpdateLocationStatus(string locationCode, PalletTypeEnum palletType, LocationStatusEnum locationStatus)
{
-
Dt_LocationInfo location = Repository.QueryFirst(x => x.LocationCode == locationCode);
List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => x.RoadwayNo == location.RoadwayNo);
@@ -184,8 +183,6 @@
public void UpdateLocationStatus(Dt_LocationInfo location, PalletTypeEnum palletType, LocationStatusEnum locationStatus)
{
-
-
List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => x.RoadwayNo == location.RoadwayNo);
List<Dt_LocationInfo> locations = GetGroupLocations(locationInfos, location);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
index 8a14bce..3e62230 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
@@ -12,7 +12,6 @@
{
public partial class MaterielInfoService : ServiceBase<Dt_MaterielInfo, IMaterielInfoRepository>, IMaterielInfoService
{
-
public bool ExsitMateriel(string materielCode)
{
return BaseDal.QueryFirst(x => x.MaterielCode == materielCode) != null;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs"
index d03eaa7..79dda98 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs"
@@ -25,7 +25,6 @@
public WebResponseContent CommitCheckResult(int checkOrderId, Dt_CheckOrderResult checkResult)
{
- WebResponseContent content = new WebResponseContent();
try
{
Dt_CheckOrder checkOrder = _checkOrderRepository.QueryFirst(x => x.CheckOrderId == checkOrderId);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IApprovalService/IApprovalTaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IApprovalService/IApprovalTaskService.cs"
index 6750ba4..085929d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IApprovalService/IApprovalTaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IApprovalService/IApprovalTaskService.cs"
@@ -5,12 +5,15 @@
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_IApprovalRepository;
using WIDESEA_Model.Models;
namespace WIDESEA_IApprovalService
{
public interface IApprovalTaskService : IService<Dt_ApprovalTask>
{
+ IApprovalTaskRepository Repository { get; }
+
WebResponseContent AuditAgree(int sourceKey);
WebResponseContent AuditReject(int sourceKey);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/ILocationStatusChangeRecordSetvice.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/ILocationStatusChangeRecordService.cs"
similarity index 92%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/ILocationStatusChangeRecordSetvice.cs"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/ILocationStatusChangeRecordService.cs"
index 8dd2cb3..4499a31 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/ILocationStatusChangeRecordSetvice.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/ILocationStatusChangeRecordService.cs"
@@ -11,7 +11,7 @@
namespace WIDESEA_IRecordService
{
- public interface ILocationStatusChangeRecordSetvice : IService<Dt_LocationStatusChangeRecord>
+ public interface ILocationStatusChangeRecordService : IService<Dt_LocationStatusChangeRecord>
{
ILocationStatusChangeRecordRepository Repository { get; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/IRecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/IRecordService.cs"
index 6fd0066..5c9e120 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/IRecordService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/IRecordService.cs"
@@ -9,7 +9,7 @@
{
public interface IRecordService : IDependency
{
- ILocationStatusChangeRecordSetvice LocationStatusChangeRecordSetvice { get; }
+ ILocationStatusChangeRecordService LocationStatusChangeRecordSetvice { get; }
IStockQuantityChangeRecordService StockQuantityChangeRecordService { get; }
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrder_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrder_HtyService.cs"
index 939e975..fba9048 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrder_HtyService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrder_HtyService.cs"
@@ -25,12 +25,8 @@
{
public class InboundOrder_HtyService : ServiceBase<Dt_InboundOrder_Hty, IInboundOrder_HtyRepository>, IInboundOrder_HtyService
{
-
-
public InboundOrder_HtyService(IInboundOrder_HtyRepository BaseDal) : base(BaseDal)
{
-
}
-
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
index 4262788..a3d2f5a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
@@ -32,19 +32,14 @@
{
try
{
- switch (model.Way)
+ return model.Way switch
{
- case 1:
- return AddPurchaseOrder(model);
- case 2:
- return UpdatePurchaseOrder(model);
- case 3:
- return DeletePurchaseOrder(model);
- case 4:
- return ClosePurchaseOrder(model);
- }
-
- return WebResponseContent.Instance.OK();
+ 1 => AddPurchaseOrder(model),
+ 2 => UpdatePurchaseOrder(model),
+ 3 => DeletePurchaseOrder(model),
+ 4 => ClosePurchaseOrder(model),
+ _ => WebResponseContent.Instance.OK(),
+ };
}
catch (Exception ex)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs"
index f720d11..7987de7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs"
@@ -22,7 +22,7 @@
/// <summary>
/// 妫�楠屽崟鍙�
/// </summary>
- [CodeRule(RuleCodeEnum.InboundOrderRule)]
+ [CodeRule(RuleCodeEnum.CheckOrderRule)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "妫�楠屽崟鍙�")]
public string CheckOrderNo { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs"
index d8e0216..2c0c087 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs"
@@ -19,6 +19,5 @@
public OutStockLockInfoService(IOutStockLockInfoRepository BaseDal) : base(BaseDal)
{
}
-
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutStockLockInfoService.cs"
index a8e3dfc..3566725 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutStockLockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutStockLockInfoService.cs"
@@ -13,6 +13,5 @@
{
public partial class OutStockLockInfoService : ServiceBase<Dt_OutStockLockInfo, IOutStockLockInfoRepository>, IOutStockLockInfoService
{
-
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/LocationStatusChangeRecordSetvice.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/LocationStatusChangeRecordService.cs"
similarity index 75%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/LocationStatusChangeRecordSetvice.cs"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/LocationStatusChangeRecordService.cs"
index 8aaa86a..66ed98e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/LocationStatusChangeRecordSetvice.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/LocationStatusChangeRecordService.cs"
@@ -13,13 +13,12 @@
namespace WIDESEA_RecordService
{
- public partial class LocationStatusChangeRecordSetvice : ServiceBase<Dt_LocationStatusChangeRecord, ILocationStatusChangeRecordRepository>, ILocationStatusChangeRecordSetvice
+ public partial class LocationStatusChangeRecordService : ServiceBase<Dt_LocationStatusChangeRecord, ILocationStatusChangeRecordRepository>, ILocationStatusChangeRecordService
{
- public LocationStatusChangeRecordSetvice(ILocationStatusChangeRecordRepository BaseDal) : base(BaseDal)
+ public LocationStatusChangeRecordService(ILocationStatusChangeRecordRepository BaseDal) : base(BaseDal)
{
}
public ILocationStatusChangeRecordRepository Repository => BaseDal;
-
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/StockQuantityChangeRecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/StockQuantityChangeRecordService.cs"
index 6a686b7..1a29618 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/StockQuantityChangeRecordService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Base/StockQuantityChangeRecordService.cs"
@@ -22,6 +22,5 @@
}
public IStockQuantityChangeRecordRepository Repository => BaseDal;
-
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/RecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/RecordService.cs"
index 5586293..5b98765 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/RecordService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/RecordService.cs"
@@ -9,11 +9,11 @@
{
public class RecordService : IRecordService
{
- public ILocationStatusChangeRecordSetvice LocationStatusChangeRecordSetvice { get; }
+ public ILocationStatusChangeRecordService LocationStatusChangeRecordSetvice { get; }
public IStockQuantityChangeRecordService StockQuantityChangeRecordService { get; }
- public RecordService(ILocationStatusChangeRecordSetvice locationStatusChangeRecordSetvice, IStockQuantityChangeRecordService stockQuantityChangeRecordService)
+ public RecordService(ILocationStatusChangeRecordService locationStatusChangeRecordSetvice, IStockQuantityChangeRecordService stockQuantityChangeRecordService)
{
LocationStatusChangeRecordSetvice = locationStatusChangeRecordSetvice;
StockQuantityChangeRecordService = stockQuantityChangeRecordService;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordSetvice.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordService.cs"
similarity index 96%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordSetvice.cs"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordService.cs"
index 92b885c..af43159 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordSetvice.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordService.cs"
@@ -17,7 +17,7 @@
namespace WIDESEA_RecordService
{
- public partial class LocationStatusChangeRecordSetvice : ServiceBase<Dt_LocationStatusChangeRecord, ILocationStatusChangeRecordRepository>, ILocationStatusChangeRecordSetvice
+ public partial class LocationStatusChangeRecordService : ServiceBase<Dt_LocationStatusChangeRecord, ILocationStatusChangeRecordRepository>, ILocationStatusChangeRecordService
{
public void AddLocationStatusChangeRecord(Dt_LocationInfo locationInfo, LocationStatusEnum lastStatus, LocationChangeType changeType, string? orderNo = null, int? taskNum = null)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockInfoService.cs"
index 38019c6..bc4e2d7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockInfoService.cs"
@@ -30,6 +30,5 @@
{
_mapper = mapper;
}
-
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockInfo_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockInfo_HtyService.cs"
index 316624f..6194e8d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockInfo_HtyService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockInfo_HtyService.cs"
@@ -29,6 +29,5 @@
{
_mapper = mapper;
}
-
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
index 9203ffa..277cf6c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
@@ -34,7 +34,6 @@
int index = 0;
while (needQuantity > 0)
{
-
Dt_StockInfo stockInfo = stockInfos[index];
float useableStockQuantity = stockInfo.Details.Where(x => x.MaterielCode == materielCode).Sum(x => x.StockQuantity - x.OutboundQuantity);
if (useableStockQuantity < needQuantity)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
index effa323..f6f1027 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
@@ -648,6 +648,33 @@
}
break;
+ case "locationChangeType":
+ {
+ List<object> data = new List<object>();
+
+ {
+ Type type = typeof(LocationChangeType);
+ List<int> enums = Enum.GetValues(typeof(LocationChangeType)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(LocationChangeType).GetField(((LocationChangeType)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+
+ result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
+ }
+ break;
}
return result;
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 979eedc..3797b3a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -188,7 +188,6 @@
return WebResponseContent.Instance.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
}
-
LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
@@ -202,7 +201,7 @@
_stockRepository.StockInfoRepository.UpdateData(stockInfo);
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationChangeType.InboundAssignLocation);
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationChangeType.InboundCompleted);
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
index 4c19bec..4ef6d8e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
@@ -35,10 +35,7 @@
public class Task_HtyService : ServiceBase<Dt_Task_Hty, ITask_HtyRepository>, ITask_HtyService
{
-
public Task_HtyService(ITask_HtyRepository BaseDal) : base(BaseDal)
{
-
}
-
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs"
index d9c631b..ac7b02d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs"
@@ -1,8 +1,13 @@
-锘縰sing Microsoft.AspNetCore.Http;
+锘縰sing HslCommunication.WebSocket;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
+using WIDESEA_Core.Helper;
using WIDESEA_IApprovalService;
+using WIDESEA_ICheckRepository;
using WIDESEA_Model.Models;
namespace WIDESEA_WMSServer.Controllers.Approval
@@ -11,8 +16,13 @@
[ApiController]
public class ApprovalTaskController : ApiBaseController<IApprovalTaskService, Dt_ApprovalTask>
{
- public ApprovalTaskController(IApprovalTaskService service) : base(service)
+ private readonly ICheckOrderRepository _checkOrderRepository;
+ private readonly WebSocketServer _webSocketServer;
+
+ public ApprovalTaskController(IApprovalTaskService service, ICheckOrderRepository checkOrderRepository, WebSocketServer webSocketServer) : base(service)
{
+ _checkOrderRepository = checkOrderRepository;
+ _webSocketServer = webSocketServer;
}
[HttpGet, HttpPost, Route("AuditAgree")]
@@ -26,5 +36,36 @@
{
return Service.AuditReject(sourceKey);
}
+
+ [HttpGet, HttpPost, Route("PushTest"), AllowAnonymous]
+ public WebResponseContent PushTest()
+ {
+ try
+ {
+ List<Dt_CheckOrder> checkOrders = _checkOrderRepository.Db.Queryable<Dt_CheckOrder>().Includes(x => x.Details).ToList();
+
+ foreach (var checkOrder in checkOrders)
+ {
+ object obj = new
+ {
+ title = "IQC璐ㄦ缁撴灉瀹℃壒",
+ formData = checkOrder,
+ tableData = checkOrder.Details,
+ message = "鎺ㄩ�佹祴璇曚俊鎭綋",
+ date = DateTime.Now.ToString(),
+ };
+ JsonSerializerSettings settings = new JsonSerializerSettings()
+ {
+ ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
+ };
+ _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(obj, settings));
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
index 3a1f79d..068b487 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
@@ -54,6 +54,7 @@
}
}
+ [HttpPost, Route("ReceivePurchaseOrderSingle"), AllowAnonymous, MethodParamsValidate]
public WebResponseContent ReceivePurchaseOrderSingle(PurchaseOrderModel model)
{
return _purchaseOrderService.ReceivePurchaseOrderSingle(model);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/LocationStatusChangeRecordController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/LocationStatusChangeRecordController.cs"
index 5674faa..595d7bb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/LocationStatusChangeRecordController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/LocationStatusChangeRecordController.cs"
@@ -10,9 +10,9 @@
{
[Route("api/LocationStatusChangeRecord")]
[ApiController]
- public class LocationStatusChangeRecordController : ApiBaseController<ILocationStatusChangeRecordSetvice, Dt_LocationStatusChangeRecord>
+ public class LocationStatusChangeRecordController : ApiBaseController<ILocationStatusChangeRecordService, Dt_LocationStatusChangeRecord>
{
- public LocationStatusChangeRecordController(ILocationStatusChangeRecordSetvice service) : base(service)
+ public LocationStatusChangeRecordController(ILocationStatusChangeRecordService service) : base(service)
{
}
[HttpPost, HttpGet,Route("GetLocationState")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutofacPropertityModuleReg.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutofacPropertityModuleReg.cs"
index f10530b..d8f1854 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutofacPropertityModuleReg.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutofacPropertityModuleReg.cs"
@@ -11,7 +11,6 @@
builder.RegisterAssemblyTypes(typeof(Program).Assembly)
.Where(t => controllerBaseType.IsAssignableFrom(t) && t != controllerBaseType)
.PropertiesAutowired();
-
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
index baf10ad..9390217 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
@@ -6,7 +6,7 @@
"Microsoft.AspNetCore": "Warning"
}
},
- "dics": "inOrderType,outOrderType,inboundState,createType,enableEnum,enableStatusEnum,locationStatusEnum,locationTypeEnum,taskTypeEnum,taskStatusEnum,outboundStatusEnum,orderDetailStatusEnum,stockStatusEmun,stockChangeType,outStockStatus,receiveOrderTypeEnum,authorityScope,authorityScopes",
+ "dics": "inOrderType,outOrderType,inboundState,createType,enableEnum,enableStatusEnum,locationStatusEnum,locationTypeEnum,taskTypeEnum,taskStatusEnum,outboundStatusEnum,orderDetailStatusEnum,stockStatusEmun,stockChangeType,outStockStatus,receiveOrderTypeEnum,authorityScope,authorityScopes,locationChangeType",
"AllowedHosts": "*",
"ConnectionStringsEncryption": false,
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\226\207\346\241\243/MES\344\270\232\345\212\241\346\265\201\347\250\213\345\233\276V1.0.vsdx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\226\207\346\241\243/MES\344\270\232\345\212\241\346\265\201\347\250\213\345\233\276V1.0.vsdx"
new file mode 100644
index 0000000..90f64b6
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\226\207\346\241\243/MES\344\270\232\345\212\241\346\265\201\347\250\213\345\233\276V1.0.vsdx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\226\207\346\241\243/MES\344\270\232\345\212\241\346\265\201\347\250\213\345\233\276V1.0.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\226\207\346\241\243/MES\344\270\232\345\212\241\346\265\201\347\250\213\345\233\276V1.0.xlsx"
new file mode 100644
index 0000000..59f5196
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\346\226\207\346\241\243/MES\344\270\232\345\212\241\346\265\201\347\250\213\345\233\276V1.0.xlsx"
Binary files differ
--
Gitblit v1.9.3