From 99ff0b03a5116df776aa2210fdb0174d688690f5 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 13 一月 2026 18:47:58 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/Dt_AllocateOrder.js | 399 +++---------------------
项目代码/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue | 3
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 30 +
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 2
项目代码/WIDESEA_WMSClient/src/extension/inbound/allocateinboundOrder.js | 29 +
项目代码/WIDESEA_WMSClient/src/extension/outbound/allocateoutboundOrder.js | 28 +
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue | 277 ++++++++--------
项目代码/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue | 132 ++++---
项目代码/WIDESEA_WMSClient/config/buttons.js | 2
项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 4
项目代码/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue | 3
11 files changed, 358 insertions(+), 551 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/config/buttons.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/config/buttons.js"
index 19a4ca9..64174fb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/config/buttons.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/config/buttons.js"
@@ -319,7 +319,7 @@
name: "鍏抽棴鍗曟嵁",
icon: '',
class: '',
- value: ' ',
+ value: 'CloseOrder',
type: 'warning',
onClick: function () {
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/Dt_AllocateOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/Dt_AllocateOrder.js"
index 42b4c4f..4143ebe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/Dt_AllocateOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/Dt_AllocateOrder.js"
@@ -17,345 +17,7 @@
modelFooter: ''
},
tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [
- // {
- // name: '缁勭洏',
- // type: 'primary',
- // value: '缁勭洏',
- // onClick: function () { // 淇1锛氱Щ闄ゆ棤鐢╮ow鍙傛暟锛屽姞鏃ュ織璋冭瘯
- // console.log('缁勭洏鎸夐挳琚偣鍑伙紝寮�濮嬫牎楠�');
- // const selectedRows = this.$refs.table.getSelected();
-
- // // 鏍￠獙1锛氭槸鍚﹂�変腑琛�
- // if (selectedRows.length === 0) {
- // console.log('鏍￠獙涓嶉�氳繃锛氭湭閫変腑浠讳綍鍗曟嵁');
- // ElMessage.warning('璇烽�夋嫨涓�鏉″崟鎹�');
- // return;
- // }
- // // 鏍￠獙2锛氭槸鍚﹂�変腑鍗曡
- // if (selectedRows.length > 1) {
- // console.log('鏍￠獙涓嶉�氳繃锛氶�変腑澶氳鍗曟嵁');
- // ElMessage.warning('鍙兘閫夋嫨涓�鏉″崟鎹�');
- // return;
- // }
-
- // const targetRow = selectedRows[0];
-
- // this.$emit('openPalletDialog', targetRow.orderNo);
- // }
- // },
- {
- name: '鎾ら攢缁勭洏',
- type: 'primary',
- value: '鎾ら攢缁勭洏',
- onClick: function () {
- console.log('鎾ら攢缁勭洏鎸夐挳琚偣鍑�');
- const mountNode = document.createElement('div');
- document.body.appendChild(mountNode);
-
- // 鍝嶅簲寮忚〃鍗曟暟鎹細鎵樼洏鍙凤紙蹇呭～锛�
- const formData = reactive({
- palletCode: '' // 鎵樼洏鍙疯緭鍏ユ
- });
-
- // 鎻愪氦琛ㄥ崟鐨勭粺涓�閫昏緫
- const submitForm = async () => {
- const formRef = vnode.component.refs.cancelPalletForm;
- try {
- // 鎵ц琛ㄥ崟鏍￠獙锛堟墭鐩樺彿蹇呭～锛�
- await formRef.validate();
- } catch (err) {
- ElMessage.warning('璇疯緭鍏ユ湁鏁堢殑鎵樼洏鍙�');
- return;
- }
-
- // 鍙戣捣鎾ら攢缁勭洏璇锋眰
- try {
- //console.log('鍙戣捣鎾ら攢缁勭洏璇锋眰锛屾墭鐩樺彿锛�', formData.palletCode.trim());
- const response = await http.post('/api/InboundOrder/CancelPalletGroup', {
- palletCode: formData.palletCode.trim()
- });
-
- const { status, message, data } = response;
- if (status) {
- ElMessage.success(`鎾ら攢缁勭洏鎴愬姛锛屾墭鐩樺彿锛�${formData.palletCode.trim()}`);
- this.refresh(); // 鎴愬姛鍚庡埛鏂板垪琛�
- // 鍏抽棴瀵硅瘽妗�
- render(null, mountNode);
- document.body.removeChild(mountNode);
- } else {
- console.log('鎾ら攢缁勭洏澶辫触锛屽悗绔彁绀猴細', message);
- ElMessage.error(message || data?.message || '鎾ら攢缁勭洏澶辫触');
- selectPalletCodeInput(); // 閫変腑杈撳叆妗嗘柟渚块噸鏂拌緭鍏�
- }
- } catch (error) {
- console.error('鎾ら攢缁勭洏璇锋眰寮傚父锛�', error);
- ElMessage.error('缃戠粶寮傚父鎴栨帴鍙ｉ敊璇紝璇风◢鍚庨噸璇�');
- selectPalletCodeInput();
- }
- };
-
- // 閫変腑杈撳叆妗嗘枃鏈紙鏂逛究閲嶆柊杈撳叆锛�
- const selectPalletCodeInput = () => {
- setTimeout(() => {
- const inputRef = vnode.component.refs.palletCodeInput;
- if (inputRef) {
- const targetInput = inputRef.$el?.querySelector('input') || inputRef;
- targetInput?.focus();
- targetInput?.select();
- }
- }, 100);
- };
-
- // 鍒涘缓瀵硅瘽妗哣Node
- const vnode = createVNode(ElDialog, {
- title: '鎾ら攢缁勭洏',
- width: '400px',
- modelValue: true,
- appendToBody: true,
- onOpened: () => {
- // 瀵硅瘽妗嗘墦寮�鍚庤嚜鍔ㄨ仛鐒﹁緭鍏ユ
- setTimeout(() => {
- const inputRef = vnode.component.refs.palletCodeInput;
- inputRef?.focus();
- }, 100);
- },
- 'onUpdate:modelValue': (isVisible) => {
- if (!isVisible) {
- render(null, mountNode);
- document.body.removeChild(mountNode);
- }
- }
- }, {
- default: () => h(ElForm, {
- model: formData,
- rules: {
- palletCode: [
- { required: true, message: '璇疯緭鍏ユ墭鐩樺彿', trigger: ['blur', 'enter'] },
- { min: 1, max: 50, message: '鎵樼洏鍙烽暱搴︿笉鑳借秴杩�50涓瓧绗�', trigger: ['blur', 'input'] }
- ]
- },
- ref: 'cancelPalletForm'
- }, [
- // 鎵樼洏鍙疯緭鍏ラ」
- h(ElFormItem, { label: '鎵樼洏鍙�', prop: 'palletCode', required: true }, [
- h(ElInput, {
- type: 'text',
- modelValue: formData.palletCode,
- 'onUpdate:modelValue': (val) => {
- formData.palletCode = val;
- },
- ref: 'palletCodeInput',
- placeholder: '鎵爜杈撳叆鎴栨墜鍔ㄨ緭鍏ユ墭鐩樺彿',
- maxLength: 50,
- // 鐩戝惉鍥炶溅浜嬩欢锛堟壂鐮佹灙榛樿浼氬彂閫佸洖杞︼級
- onKeydown: (e) => {
- if (e.key === 'Enter') {
- e.preventDefault();
- submitForm();
- }
- }
- })
- ]),
- // 搴曢儴鎸夐挳鍖�
- h('div', { style: { textAlign: 'right', marginTop: '16px' } }, [
- h(ElButton, {
- type: 'text',
- onClick: () => {
- render(null, mountNode);
- document.body.removeChild(mountNode);
- ElMessage.info('鍙栨秷鎾ら攢缁勭洏');
- }
- }, '鍙栨秷'),
- h(ElButton, {
- type: 'primary',
- onClick: submitForm.bind(this) // 缁戝畾this涓婁笅鏂�
- }, '纭鎾ら攢')
- ])
- ])
- });
-
- vnode.appContext = this.$.appContext;
- render(vnode, mountNode);
- }
- },
-
- {
- name: '绌烘墭鐩樺叆搴�',
- type: 'primary',
- value: '绌烘墭鐩樺叆搴�',
-
- onClick: function () {
- const mountNode = document.createElement('div');
- document.body.appendChild(mountNode);
-
- // 鍝嶅簲寮忚〃鍗曟暟鎹細鏂欑鐮侊紙蹇呭～锛屾壂鐮佹灙/鎵嬪姩杈撳叆锛�
- const formData = reactive({
- boxCode: '',
- warehouseCode:''
- });
-
- const warehouses = ref([]);
- const isLoadingWarehouses = ref(false);
-
- const getWarehouseList = async () => {
- isLoadingWarehouses.value = true;
- try {
- const { data, status } = await http.post('/api/LocationInfo/GetLocationTypes');
- if (status && Array.isArray(data)) {
- // 鏍煎紡鍖栦粨搴撻�夐」锛氶�傞厤ElSelect鐨刲abel-value鏍煎紡
- warehouses.value = data.map(item => ({
- label: item.locationTypeDesc,
- value: item.locationType
- }));
- } else {
- ElMessage.error('鑾峰彇鍖哄煙鍒楄〃澶辫触');
- warehouses.value = [];
- }
- } catch (err) {
- ElMessage.error('鍖哄煙鏁版嵁璇锋眰寮傚父锛岃绋嶅悗閲嶈瘯');
- warehouses.value = [];
- } finally {
- isLoadingWarehouses.value = false;
- }
- };
-
- // 鎻愪氦琛ㄥ崟鐨勭粺涓�閫昏緫锛堜緵鍥炶溅瑙﹀彂鍜屾寜閽偣鍑诲叡鐢級
- const submitForm = async () => {
- const formRef = vnode.component.refs.batchInForm;
- try {
- // 鎵ц琛ㄥ崟鏍￠獙锛堟枡绠辩爜蹇呭～锛�
- await formRef.validate();
- } catch (err) {
- ElMessage.warning('璇疯緭鍏ユ湁鏁堢殑鏂欑鐮�');
- return;
- }
-
-
- http.post('/api/InboundOrder/EmptyMaterielGroup', {
- palletCode: formData.boxCode.trim(),
- warehouseCode:formData.warehouseCode
- }).then(({ data, status, message }) => {
- if (status) {
- ElMessage.success(`鍏ュ簱鎴愬姛锛屾枡绠辩爜锛�${formData.boxCode.trim()}`);
- this.refresh();
- formData.boxCode = '';
-
- setTimeout(() => {
- const inputRef = vnode.component.refs.boxCodeInput;
- inputRef?.focus();
- }, 100);
- } else {
- ElMessage.error(message || data?.message || '鍏ュ簱澶辫触');
- selectBoxCodeInput();
- }
- }).catch(() => {
- ElMessage.error('璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯');
- selectBoxCodeInput();
- });
- };
-
- const selectBoxCodeInput = () => {
- setTimeout(() => {
- const inputRef = vnode.component.refs.boxCodeInput;
- if (inputRef) {
- const targetInput = inputRef.$el?.querySelector('input') || inputRef;
- targetInput?.focus();
- targetInput?.select();
- }
- }, 100);
-}
- const vnode = createVNode(ElDialog, {
- title: '绌烘墭鐩樺叆搴�',
- width: '400px',
- modelValue: true,
- appendToBody: true,
-
- onOpened: async () => {
- await getWarehouseList();
- const inputRef = vnode.component.refs.boxCodeInput;
- inputRef?.focus();
- },
- 'onUpdate:modelValue': (isVisible) => {
- if (!isVisible) {
- render(null, mountNode);
- document.body.removeChild(mountNode);
- }
- }
- }, {
- default: () => h(ElForm, {
- model: formData,
- rules: {
- boxCode: [
- { required: true, message: '璇疯緭鍏ユ枡绠辩爜', trigger: ['blur', 'enter'] }
- ],
- warehouseCode:[
- { required: true, message: '璇烽�夋嫨鍖哄煙', trigger: ['change', 'blur'] }
- ]
- },
- ref: 'batchInForm'
- }, [
- //浠撳簱鏁版嵁
- h(ElFormItem, { label: '鍖哄煙', prop: 'warehouseCode', required: true }, [
- h(ElSelect, {
- modelValue: formData.warehouseCode,
- 'onUpdate:modelValue': (val) => {
- formData.warehouseCode = val;
- },
- placeholder: '璇烽�夋嫨鍏ュ簱鍖哄煙',
- filterable: true, // 鏀寔鎼滅储浠撳簱
- loading: isLoadingWarehouses.value, // 鍔犺浇鐘舵��
- style: { width: '100%' }
- }, [
- // 娓叉煋浠撳簱涓嬫媺閫夐」
- warehouses.value.map(item => h(ElOption, {
- label: item.label,
- value: item.value
- }))
- ])
- ]),
- // 鏂欑鐮佽緭鍏ラ」锛堟敮鎸佽仛鐒︺�佸洖杞︽彁浜わ級
- h(ElFormItem, { label: '鏂欑鐮�', prop: 'boxCode', required: true }, [
- h(ElInput, {
- type: 'text',
- modelValue: formData.boxCode,
- 'onUpdate:modelValue': (val) => {
- formData.boxCode = val;
- },
- ref: 'boxCodeInput',
- placeholder: '鎵爜杈撳叆鎴栨墜鍔ㄨ緭鍏ユ枡绠辩爜',
- // 鐩戝惉鍥炶溅浜嬩欢锛堟壂鐮佹灙榛樿浼氬彂閫佸洖杞︼級
- onKeydown: (e) => {
- if (e.key === 'Enter') {
- e.preventDefault();
- submitForm();
- }
- }
- })
- ]),
- // 搴曢儴鎸夐挳鍖�
- h('div', { style: { textAlign: 'right', marginTop: '16px' } }, [
- h(ElButton, {
- type: 'text',
- onClick: () => {
- render(null, mountNode);
- document.body.removeChild(mountNode);
- ElMessage.info('鍙栨秷鍏ュ簱浠诲姟');
- }
- }, '鍙栨秷'),
- h(ElButton, {
- type: 'primary',
- onClick: submitForm
- }, '纭畾')
- ])
- ])
- });
-
- vnode.appContext = this.$.appContext;
- render(vnode, mountNode);
- }
-}
- ], box: [], detail: [] },
+ buttons: { view: [], box: [], detail: [] },
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
onInit() {
@@ -387,7 +49,64 @@
},
onInited() {
-
+ let BatchOrderFeedbackToMesBtn = this.buttons.find(x => x.value == 'BatchOrderFeedbackToMes');
+ if (BatchOrderFeedbackToMesBtn) {
+ const _this = this;
+ BatchOrderFeedbackToMesBtn.onClick = function () {
+ let selectedRows = _this.$refs.table.getSelected();
+
+ // 鏍￠獙鏄惁鏈夐�変腑鏁版嵁
+ if (!selectedRows || selectedRows.length === 0) {
+ return _this.$Message.warning('璇峰厛閫夋嫨闇�瑕佸鐞嗙殑鍗曟嵁');
+ }
+ if (selectedRows.length > 1) {
+ return _this.$Message.warning('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+
+ _this.http
+ .post(`api/MesFeedback/OutboundFeedback?orderNo=${selectedRows[0].orderNo}`, {}, "鏁版嵁澶勭悊涓�...")
+ .then((x) => {
+ if (x.status) {
+ _this.$Message.success('鍒嗘壒鍑哄簱鍥炶皟瀹屾垚');
+ _this.refresh();
+ } else {
+ return _this.$Message.error('鍒嗘壒鍑哄簱鍥炶皟澶辫触');
+ }
+ })
+ .catch((error) => {
+
+ });
+ };
+ }
+
+ var CloseOrderBtn = this.buttons.find(
+ (x) => x.value == "CloseOrder"
+ );
+ if (CloseOrderBtn != null) {
+ CloseOrderBtn.onClick = () => {
+ var rows = this.$refs.table.getSelected();
+ // 鏍￠獙鏄惁鏈夐�変腑鏁版嵁
+ if (!rows || rows.length === 0) {
+ return this.$Message.error("璇峰厛閫夋嫨闇�瑕佸叧闂殑鍗曟嵁");
+ }
+ if (rows.length > 1) {
+ return this.$Message.error("璇烽�夋嫨涓�鏉″崟鎹�");
+ }
+ this.http.post(`api/InboundOrder/HandCloseOrder?orderIds=${rows[0].orderNo}`, {}, "鏁版嵁澶勭悊涓�...")
+ .then((x) => {
+ if (x.status) {
+ this.$Message.success(x.message);
+ this.refresh();
+ } else {
+ return this.$Message.error(x.message);
+ }
+ })
+ .catch((error) => {
+ // 澧炲姞寮傚父鎹曡幏锛屽鐞嗙綉缁滈敊璇瓑鎯呭喌
+ //_this.$Message.error('璇锋眰澶辫触锛�' + (error.message || '鏈煡閿欒'));
+ });
+ };
+ }
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/allocateinboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/allocateinboundOrder.js"
index 2e7a4ed..b35f033 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/allocateinboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/allocateinboundOrder.js"
@@ -131,7 +131,34 @@
}
},
onInited() {
-
+ var CloseOrderBtn = this.buttons.find(
+ (x) => x.value == "CloseOrder"
+ );
+ if (CloseOrderBtn != null) {
+ CloseOrderBtn.onClick = () => {
+ var rows = this.$refs.table.getSelected();
+ // 鏍￠獙鏄惁鏈夐�変腑鏁版嵁
+ if (!rows || rows.length === 0) {
+ return this.$Message.error("璇峰厛閫夋嫨闇�瑕佸叧闂殑鍗曟嵁");
+ }
+ if (rows.length > 1) {
+ return this.$Message.error("璇烽�夋嫨涓�鏉″崟鎹�");
+ }
+ this.http.post(`api/InboundOrder/HandCloseOrder?orderIds=${rows[0].orderNo}`, {}, "鏁版嵁澶勭悊涓�...")
+ .then((x) => {
+ if (x.status) {
+ this.$Message.success(x.message);
+ this.refresh();
+ } else {
+ return this.$Message.error(x.message);
+ }
+ })
+ .catch((error) => {
+ // 澧炲姞寮傚父鎹曡幏锛屽鐞嗙綉缁滈敊璇瓑鎯呭喌
+ //_this.$Message.error('璇锋眰澶辫触锛�' + (error.message || '鏈煡閿欒'));
+ });
+ };
+ }
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
index 2c19905..3fe9644 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
@@ -315,149 +315,150 @@
});
},
outbound() {
- // if (this.selection.length === 0) {
- // return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
- // }
- // const platformOptions = [
- // { label: "绔欏彴2", value: "2-1" },
- // { label: "绔欏彴3", value: "3-1" },
- // ];
- // const mountNode = document.createElement("div");
- // document.body.appendChild(mountNode);
+ if (this.selection.length === 0) {
+ return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
+ }
+ const platformOptions = [
+ { label: "绔欏彴2", value: "2-1" },
+ { label: "绔欏彴3", value: "3-1" },
+ ];
+ const mountNode = document.createElement("div");
+ document.body.appendChild(mountNode);
- // const formData = reactive({
- // selectedPlatform: platformOptions[0].value,
- // });
+ const formData = reactive({
+ selectedPlatform: platformOptions[0].value,
+ });
- // const vnode = createVNode(
- // ElDialog,
- // {
- // title: "鍑哄簱鎿嶄綔 - 閫夋嫨鍑哄簱绔欏彴",
- // width: "500px",
- // modelValue: true,
- // appendToBody: true,
- // "onUpdate:modelValue": (isVisible) => {
- // if (!isVisible) {
- // render(null, mountNode);
- // document.body.removeChild(mountNode);
- // }
- // },
- // style: {
- // padding: "20px 0",
- // borderRadius: "8px",
- // },
- // },
- // {
- // default: () =>
- // h(
- // ElForm,
- // {
- // model: formData,
- // rules: {
- // selectedPlatform: [
- // { required: true, message: "璇烽�夋嫨鍑哄簱绔欏彴", trigger: "change" },
- // ],
- // },
- // ref: "outboundForm",
- // labelWidth: "100px",
- // style: {
- // padding: "0 30px",
- // },
- // },
- // [
- // h(ElFormItem, {
- // label: "鍑哄簱绔欏彴",
- // prop: "selectedPlatform",
- // style: {
- // marginBottom: "24px",
- // },
- // }, [
- // h(ElSelect, {
- // placeholder: "璇烽�夋嫨鍑哄簱绔欏彴锛�3-12锛�",
- // modelValue: formData.selectedPlatform,
- // "onUpdate:modelValue": (val) => {
- // formData.selectedPlatform = val;
- // },
- // style: {
- // width: "100%",
- // height: "40px",
- // borderRadius: "4px",
- // borderColor: "#dcdfe6",
- // },
- // }, platformOptions.map((platform) =>
- // h(ElOption, { label: platform.label, value: platform.value })
- // )),
- // ]),
- // h("div", {
- // style: {
- // textAlign: "right",
- // marginTop: "8px",
- // paddingRight: "4px",
- // },
- // }, [
- // h(ElButton, {
- // type: "text",
- // onClick: () => {
- // render(null, mountNode);
- // document.body.removeChild(mountNode);
- // ElMessage.info("鍙栨秷鍑哄簱鎿嶄綔");
- // },
- // style: {
- // marginRight: "8px",
- // color: "#606266",
- // },
- // }, "鍙栨秷"),
- // h(ElButton, {
- // type: "primary",
- // onClick: async () => {
- // const formRef = vnode.component.refs.outboundForm;
- // try {
- // await formRef.validate();
- // } catch (err) {
- // return;
- // }
+ const vnode = createVNode(
+ ElDialog,
+ {
+ title: "鍑哄簱鎿嶄綔 - 閫夋嫨鍑哄簱绔欏彴",
+ width: "500px",
+ modelValue: true,
+ appendToBody: true,
+ "onUpdate:modelValue": (isVisible) => {
+ if (!isVisible) {
+ render(null, mountNode);
+ document.body.removeChild(mountNode);
+ }
+ },
+ style: {
+ padding: "20px 0",
+ borderRadius: "8px",
+ },
+ },
+ {
+ default: () =>
+ h(
+ ElForm,
+ {
+ model: formData,
+ rules: {
+ selectedPlatform: [
+ { required: true, message: "璇烽�夋嫨鍑哄簱绔欏彴", trigger: "change" },
+ ],
+ },
+ ref: "outboundForm",
+ labelWidth: "100px",
+ style: {
+ padding: "0 30px",
+ },
+ },
+ [
+ h(ElFormItem, {
+ label: "鍑哄簱绔欏彴",
+ prop: "selectedPlatform",
+ style: {
+ marginBottom: "24px",
+ },
+ }, [
+ h(ElSelect, {
+ placeholder: "璇烽�夋嫨鍑哄簱绔欏彴锛�3-12锛�",
+ modelValue: formData.selectedPlatform,
+ "onUpdate:modelValue": (val) => {
+ formData.selectedPlatform = val;
+ },
+ style: {
+ width: "100%",
+ height: "40px",
+ borderRadius: "4px",
+ borderColor: "#dcdfe6",
+ },
+ }, platformOptions.map((platform) =>
+ h(ElOption, { label: platform.label, value: platform.value })
+ )),
+ ]),
+ h("div", {
+ style: {
+ textAlign: "right",
+ marginTop: "8px",
+ paddingRight: "4px",
+ },
+ }, [
+ h(ElButton, {
+ type: "text",
+ onClick: () => {
+ render(null, mountNode);
+ document.body.removeChild(mountNode);
+ ElMessage.info("鍙栨秷鍑哄簱鎿嶄綔");
+ },
+ style: {
+ marginRight: "8px",
+ color: "#606266",
+ },
+ }, "鍙栨秷"),
+ h(ElButton, {
+ type: "primary",
+ onClick: async () => {
+ const formRef = vnode.component.refs.outboundForm;
+ try {
+ await formRef.validate();
+ } catch (err) {
+ return;
+ }
- // const keys = this.selection.map((item) => item.id);
- // const requestParams = {
- // detailIds: keys,
- // outboundTargetLocation: formData.selectedPlatform,
- // outboundQuantity: 1,
- // operator: "",
- // orderNo: this.row.orderNo,
- // };
+ const keys = this.selection.map((item) => item.id);
+ const requestParams = {
+ detailIds: keys,
+ outboundTargetLocation: formData.selectedPlatform,
+ outboundQuantity: 1,
+ operator: "",
+ orderNo: this.row.orderNo,
+ stockDetailIds: []
+ };
- // this.http
- // .post(
- // "api/Outbound/ProcessPickingOutbound",
- // requestParams,
- // "鏁版嵁澶勭悊涓�"
- // )
- // .then((x) => {
- // if (!x.status) return ElMessage.error(x.message);
- // ElMessage.success("鎿嶄綔鎴愬姛");
- // this.showDetialBox = false;
- // this.$emit("parentCall", ($vue) => {
- // $vue.getData();
- // });
- // render(null, mountNode);
- // document.body.removeChild(mountNode);
- // })
- // // .catch(() => {
- // // ElMessage.error("璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯");
- // // });
- // },
- // style: {
- // borderRadius: "4px",
- // padding: "8px 20px",
- // },
- // }, "纭畾鍑哄簱"),
- // ]),
- // ]),
- // }
- // );
+ this.http
+ .post(
+ "api/Outbound/ProcessPickingOutbound",
+ requestParams,
+ "鏁版嵁澶勭悊涓�"
+ )
+ .then((x) => {
+ if (!x.status) return ElMessage.error(x.message);
+ ElMessage.success("鎿嶄綔鎴愬姛");
+ this.showDetialBox = false;
+ this.$emit("parentCall", ($vue) => {
+ $vue.getData();
+ });
+ render(null, mountNode);
+ document.body.removeChild(mountNode);
+ })
+ // .catch(() => {
+ // ElMessage.error("璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯");
+ // });
+ },
+ style: {
+ borderRadius: "4px",
+ padding: "8px 20px",
+ },
+ }, "纭畾鍑哄簱"),
+ ]),
+ ]),
+ }
+ );
- // vnode.appContext = this.$.appContext;
- // render(vnode, mountNode);
+ vnode.appContext = this.$.appContext;
+ render(vnode, mountNode);
},
outboundbatch() {
if (this.selection.length === 0) {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/allocateoutboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/allocateoutboundOrder.js"
index 25f7268..8bdfe1b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/allocateoutboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/allocateoutboundOrder.js"
@@ -85,6 +85,34 @@
}
},
onInited() {
+ var CloseOrderBtn = this.buttons.find(
+ (x) => x.value == "CloseOrder"
+ );
+ if (CloseOrderBtn != null) {
+ CloseOrderBtn.onClick = () => {
+ var rows = this.$refs.table.getSelected();
+ // 鏍￠獙鏄惁鏈夐�変腑鏁版嵁
+ if (!rows || rows.length === 0) {
+ return this.$Message.error("璇峰厛閫夋嫨闇�瑕佸叧闂殑鍗曟嵁");
+ }
+ if (rows.length > 1) {
+ return this.$Message.error("璇烽�夋嫨涓�鏉″崟鎹�");
+ }
+ this.http.post(`api/InboundOrder/HandCloseOrder?orderIds=${rows[0].orderNo}`, {}, "鏁版嵁澶勭悊涓�...")
+ .then((x) => {
+ if (x.status) {
+ this.$Message.success(x.message);
+ this.refresh();
+ } else {
+ return this.$Message.error(x.message);
+ }
+ })
+ .catch((error) => {
+ // 澧炲姞寮傚父鎹曡幏锛屽鐞嗙綉缁滈敊璇瓑鎯呭喌
+ //_this.$Message.error('璇锋眰澶辫触锛�' + (error.message || '鏈煡閿欒'));
+ });
+ };
+ }
//妗嗘灦鍒濆鍖栭厤缃悗
//濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
//this.detailOptions.columns.forEach(column=>{ });
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
index 640b5de..e97e890 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
@@ -128,58 +128,90 @@
]);
+ // const searchFormFields = ref({
+ // orderNo: "",
+ // upperOrderNo: "",
+ // orderType: "117",
+ // orderStatus: "",
+ // createType: "",
+ // fromWarehouse: "",
+ // toWarehouse: "",
+ // factoryArea: "",
+ // creater: "",
+ // createDate: "",
+ // });
+
+
+ // const searchFormOptions = ref([
+ // [
+ // { title: "涓婄骇鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
+ // {
+ // title: "鍗曟嵁鐘舵��",
+ // field: "orderStatus",
+ // type: "select",
+ // dataKey: "allocateOrderStatus",
+ // data: [],
+ // },
+ // {
+ // title: "鍗曟嵁绫诲瀷",
+ // field: "orderType",
+ // type: "select",
+ // dataKey: "outOrderType",
+ // data: [],
+ // },
+ // ],
+ // [
+ // {
+ // title: "鍒涘缓绫诲瀷",
+ // field: "createType",
+ // type: "select",
+ // dataKey: "createType",
+ // data: [],
+ // },
+ // { title: "鏉ユ簮浠撳簱", field: "fromWarehouse", type: "like" },
+ // { title: "鐩爣浠撳簱", field: "toWarehouse", type: "like" },
+ // ],
+ // [
+ // { title: "鍘傚尯", field: "factoryArea", type: "like" },
+ // { title: "鍒涘缓鑰�", field: "creater", type: "like" },
+ // { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ // ],
+ // ]);
const searchFormFields = ref({
orderNo: "",
upperOrderNo: "",
- supplierId: "",
- orderType: "",
+ orderType: "117",
orderStatus: "",
createType: "",
- businessType: "",
- fromWarehouse: "",
- toWarehouse: "",
- factoryArea: "",
creater: "",
createDate: "",
});
-
-
const searchFormOptions = ref([
[
{ title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
- { title: "涓婄骇鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
- { title: "渚涘簲鍟咺D", field: "supplierId", type: "like" },
{
- title: "璁㈠崟绫诲瀷",
+ title: "鍗曟嵁绫诲瀷",
field: "orderType",
type: "select",
- dataKey: "allocateOrderType",
+ dataKey: "outOrderType",
+ data: [],
+ },
+ {
+ title: "鍗曟嵁鐘舵��",
+ field: "orderStatus",
+ type: "select",
+ dataKey: "outboundStatusEnum",
data: [],
},
],
[
{
- title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
- type: "select",
- dataKey: "allocateOrderStatus",
- data: [],
- },
- {
- title: "鍒涘缓绫诲瀷",
+ title: "鍒涘缓鏂瑰紡",
field: "createType",
type: "select",
dataKey: "createType",
data: [],
},
- { title: "涓氬姟绫诲瀷", field: "businessType", type: "like" },
- ],
- [
- { title: "鏉ユ簮浠撳簱", field: "fromWarehouse", type: "like" },
- { title: "鐩爣浠撳簱", field: "toWarehouse", type: "like" },
- { title: "鍘傚尯", field: "factoryArea", type: "like" },
- ],
- [
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
@@ -211,19 +243,12 @@
align: "left",
},
{
- field: "supplierId",
- title: "渚涘簲鍟咺D",
- type: "string",
- width: 120,
- align: "left",
- },
- {
field: "orderType",
title: "璁㈠崟绫诲瀷",
type: "int",
width: 120,
align: "left",
- bind: { key: "allocateOrderType", data: [] },
+ bind: { key: "outOrderType", data: [] },
},
{
field: "orderStatus",
@@ -231,7 +256,7 @@
type: "int",
width: 120,
align: "left",
- bind: { key: "allocateOrderStatus", data: [] },
+ bind: { key: "inboundState", data: [] },
},
{
field: "createType",
@@ -241,20 +266,20 @@
align: "left",
bind: { key: "createType", data: [] },
},
- {
- field: "businessType",
- title: "涓氬姟绫诲瀷",
- type: "string",
- width: 120,
- align: "left",
- },
+ // {
+ // field: "businessType",
+ // title: "涓氬姟绫诲瀷",
+ // type: "string",
+ // width: 120,
+ // align: "left",
+ // bind: { key: "businessType", data: [] },
+ // },
{
field: "fromWarehouse",
title: "鏉ユ簮浠撳簱",
type: "string",
width: 120,
align: "left",
- bind: { key: "warehouses", data: [] },
},
{
field: "toWarehouse",
@@ -262,21 +287,12 @@
type: "string",
width: 120,
align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "isBatch",
- title: "鏄惁鎵规",
- type: "bool",
- width: 100,
- align: "left",
},
{
field: "returnToMESStatus",
- title: "鍥炰紶鐘舵��",
- type: "string",
- width: 100,
- align: "left",
+ title: "鍥炰紶MES鐘舵��",
+ width: 120,
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" }] },
},
{
field: "factoryArea",
@@ -300,7 +316,7 @@
align: "left",
},
{
- field: "operator",
+ field: "modifier",
title: "淇敼浜�",
type: "string",
width: 100,
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
index 4ab9e5b..93de787 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
@@ -74,7 +74,6 @@
const searchFormOptions = ref([
[
{ title: "璇锋壂鎻忓崟鎹垨鏉＄爜", field: "orderNo", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
field: "orderType",
@@ -185,7 +184,7 @@
field: "returnToMESStatus",
title: "鍥炰紶MES鐘舵��",
width: 120,
- bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] },
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" }] },
},
{
field: "creater",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index 7591b62..de26fb9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -169,7 +169,7 @@
field: "returnToMESStatus",
title: "鍥炰紶MES鐘舵��",
width: 120,
- bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] },
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" }] },
},
{
field: "factoryArea",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue"
index a408b17..055dfd5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue"
@@ -83,7 +83,6 @@
const searchFormOptions = ref([
[
{ title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
field: "orderType",
@@ -195,7 +194,7 @@
field: "returnToMESStatus",
title: "鍥炰紶MES鐘舵��",
width: 120,
- bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] },
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" }] },
},
{
field: "departmentCode",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index d6ff1fb..a66d763 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -196,7 +196,7 @@
field: "returnToMESStatus",
title: "鍥炰紶MES鐘舵��",
width: 120,
- bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] },
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" }] },
},
{
field: "factoryArea",
@@ -236,7 +236,7 @@
align: "left",
},
{
- field: "modifier",
+ field: "operator",
title: "淇敼浜�",
type: "string",
width: 100,
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index 3dd6e37..3416506 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -48,9 +48,10 @@
private readonly IRepository<Dt_LocationInfo> _locationInfoRepository;
private readonly IBasicService _basicService;
private readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
+ private readonly IRepository<Dt_OutboundOrder> _outboundOrderRepository;
public IRepository<Dt_InboundOrder> Repository => BaseDal;
- public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService, IRepository<Dt_StockInfoDetail> stockDetailRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_StockInfo> stockRepository, IRepository<Dt_LocationType> locationTypeRepository, IMaterielInfoService materielInfoService, IBasicService basicService, IRepository<Dt_LocationInfo> locationInfoRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository) : base(BaseDal)
+ public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService, IRepository<Dt_StockInfoDetail> stockDetailRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_StockInfo> stockRepository, IRepository<Dt_LocationType> locationTypeRepository, IMaterielInfoService materielInfoService, IBasicService basicService, IRepository<Dt_LocationInfo> locationInfoRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IRepository<Dt_OutboundOrder> outboundOrderRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -68,6 +69,7 @@
_basicService = basicService;
_locationInfoRepository = locationInfoRepository;
_allocateOrderRepository = allocateOrderRepository;
+ _outboundOrderRepository = outboundOrderRepository;
}
public async Task<WebResponseContent> ReceiveInboundOrder(List<Dt_InboundOrder> models, int operateType)
@@ -977,16 +979,32 @@
foreach (var orderNo in orderNos)
{
var inbound = _inboundOrderRepository.QueryFirst(x => x.InboundOrderNo == orderNo);
- if(inbound == null)
+ var outbound = _outboundOrderRepository.QueryFirst(x=>x.OrderNo == orderNo);
+ if(inbound == null && outbound == null)
{
return WebResponseContent.Instance.Error($"璇ュ崟鎹笉瀛樺湪锛屾棤娉曡繘琛屽叧闂�");
}
- if (inbound.OrderStatus != (int)InOrderStatusEnum.鏈紑濮� && inbound.OrderStatus != (int)InOrderStatusEnum.鍏ュ簱涓�)
+
+ if (inbound != null)
{
- return WebResponseContent.Instance.Error($"璇ュ崟鎹姸鎬佷笉鍙互鍏抽棴");
+ if (inbound.OrderStatus != (int)InOrderStatusEnum.鏈紑濮� && inbound.OrderStatus != (int)InOrderStatusEnum.鍏ュ簱涓�)
+ {
+ return WebResponseContent.Instance.Error($"璇ュ崟鎹姸鎬佷笉鍙互鍏抽棴");
+ }
+ inbound.OrderStatus = (int)InOrderStatusEnum.鎵嬪姩鍏抽棴;
+ inbound.Operator = App.User.UserName;
+ _inboundOrderRepository.UpdateData(inbound);
+ }else if (outbound != null)
+ {
+ if(outbound.OrderStatus !=(int)OutOrderStatusEnum.鏈紑濮� && outbound.OrderStatus != (int)OutOrderStatusEnum.鍑哄簱涓�)
+ {
+ return WebResponseContent.Instance.Error($"璇ュ崟鎹姸鎬佷笉鍙互鍏抽棴");
+ }
+ outbound.OrderStatus = (int)OutOrderStatusEnum.鍏抽棴;
+ outbound.Operator = App.User.UserName;
+ _outboundOrderRepository.UpdateData(outbound);
}
- inbound.OrderStatus = (int)InOrderStatusEnum.鎵嬪姩鍏抽棴;
- _inboundOrderRepository.UpdateData(inbound);
+
}
return WebResponseContent.Instance.OK($"鍗曟嵁鍏抽棴鎴愬姛");
}
--
Gitblit v1.9.3