+
+
+
+
+
@@ -194,6 +199,7 @@
v-if="!col.hide"
:label="col.header"
:prop="col.field"
+ :width="col.width"
show-overflow-tooltip
:sort-orders="['descending', 'ascending']"
:sortable="true"
@@ -418,7 +424,8 @@ const state = reactive({
CAREER_ASSISTANCE: '',
DESC_CN: '',
OQARESULTSTATE: '',
- PACKINGGRADE: ''
+ PACKINGGRADE: '',
+ SALESHIPREQUESTNAME: ''
},
pageNum: 1,
pageSize: 10
@@ -548,12 +555,12 @@ onMounted(() => {
// { header: "主数量", field: "MATERIALQUANTITY", hide: false },
// { header: "主单位", field: "FNAME", hide: false },
// { header: "仓库编码", field: "ERPLOCATION", hide: false },
- { header: '仓库名称', field: 'ERPLOCATIONDESC', hide: false },
+ { header: '仓库名称', field: 'ERPLOCATIONDESC', hide: false, width: 120 },
// { header: "货位编码", field: "LOCATIONNAME", hide: false },
- { header: '货位名称', field: 'LOCATIONNAMEDESC', hide: false },
+ { header: '货位名称', field: 'LOCATIONNAMEDESC', hide: false, width: 150 },
{ header: '物料编号', field: 'MATERIALSPECNAME', hide: false },
- { header: '品名', field: 'DESC_CN', hide: false },
- { header: '批次号', field: 'CHARGE', hide: false },
+ { header: '品名', field: 'DESC_CN', hide: false, width: 120 },
+ { header: '批次号', field: 'CHARGE', hide: false, width: 180 },
{ header: '阶段', field: 'PHASE', hide: false },
{ header: '系统规格', field: 'DESCRIPTION', hide: false },
{ header: 'SDK规格', field: 'SPECNAME', hide: false },
@@ -570,6 +577,7 @@ onMounted(() => {
// { header: "供应商", field: "SUPPLIERNAME", hide: false },
{ header: '业助', field: 'CAREER_ASSISTANCE', hide: false },
{ header: '客户', field: 'CUSTOMNO', hide: false },
+ { header: '销售订单', field: 'SALESHIPREQUESTNAME', hide: false },
{ header: '业务', field: 'SALESPERSON', hide: false },
{ header: '事业部', field: 'BUSINESS_UNIT', hide: false }
// { header: "管芯类型", field: "DURABLETYPE", hide: false },
@@ -667,6 +675,7 @@ function modifiedRemark() {
return
}
console.log(state.multipleSelection)
+ state.loadings = true
// return
let boxLists = []
for (var i = 0; i < state.multipleSelection.length; ++i) {
@@ -695,13 +704,14 @@ function modifiedRemark() {
updateCareerAssistance(PRINT)
.then((res: any) => {
console.log(res.success)
+ state.loadings = false
// state.COUSTOMNO = ''
if (res.success) {
state.SALESHIPREQUESTNAME = ''
state.SALESHIPREQUESTDETAILNAME = ''
state.CAREER_ASSISTANCE = ''
// proxy.$ElMessage.success('备注更新成功');
- ElMessageBox.alert('业助更新成功', '提醒框', {
+ ElMessageBox.alert('E库存更新成功', '提醒框', {
confirmButtonText: 'OK'
})
handleQuery()
From cbacfe4d78e609068a0ad6800547c1a23f70b1f6 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Tue, 27 May 2025 18:02:23 +0800
Subject: [PATCH 3/5] =?UTF-8?q?update=20=E4=B8=B4=E6=97=B6=E5=87=BA?=
=?UTF-8?q?=E5=BA=93(=E8=A1=A5=E8=BF=87=E8=B4=A6),=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../TemporaryStockOutRepairSAPPage/index.vue | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/stockOut/TemporaryStockOutRepairSAPPage/index.vue b/src/views/stockOut/TemporaryStockOutRepairSAPPage/index.vue
index 7c027ef..7934fa0 100644
--- a/src/views/stockOut/TemporaryStockOutRepairSAPPage/index.vue
+++ b/src/views/stockOut/TemporaryStockOutRepairSAPPage/index.vue
@@ -119,12 +119,14 @@
row-key="id" style="width: 100%;min-height:50px" @selection-change="handleSelectionChange">
+
@@ -133,12 +135,13 @@
-
+
@@ -185,7 +188,7 @@ import {
DeAssignShipRequest,
UpdateOutQty,
RejectsAndExpCheck,
- CompleteShipRequestStockUp
+ CompleteShipRequestStockUp, CompleteShipRequestRepairStockOut
} from '@/api/StockOut'
import { Edit } from "@element-plus/icons-vue/dist/types";
import { bTableHeight } from "../../../composables/calcTableHeight";
@@ -1052,7 +1055,7 @@ function handleStockOut() {
state.buttonOut_loading = true;
//state.buttonOut_state = true;
- CompleteShipRequestStockUp(params).then((res: any) => {
+ CompleteShipRequestRepairStockOut(params).then((res: any) => {
if (res.success) {
ElMessageBox.alert("出库成功", '', {
From 027226d2637eee83eda2a3107dbffaa17419473d Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Tue, 27 May 2025 18:04:47 +0800
Subject: [PATCH 4/5] =?UTF-8?q?update=20=E6=96=B0=E6=96=99=E5=8F=B7?=
=?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0,=E8=B4=A7=E4=BD=8D?=
=?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89?=
=?UTF-8?q?=E6=A1=86=E4=B8=94=E5=8F=AF=E4=BB=A5=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/StockOut/index.ts | 13 +++
.../StockQuery/StockTransaction/index.vue | 2 +-
.../label/newMaterialSpecLabelPrint/index.vue | 98 ++++++++++++++++---
3 files changed, 101 insertions(+), 12 deletions(-)
diff --git a/src/api/StockOut/index.ts b/src/api/StockOut/index.ts
index fd1ef4a..c4d6bdf 100644
--- a/src/api/StockOut/index.ts
+++ b/src/api/StockOut/index.ts
@@ -175,4 +175,17 @@ export function CompleteShipRequestStockUp(data: any) {
method: 'post',
data: data,
});
+}
+
+/**
+ * 临时出库(补过账)-出库过账
+ * @param data
+ * @constructor
+ */
+export function CompleteShipRequestRepairStockOut(data: any) {
+ return request({
+ url: '/api/SaleOut/completeShipRequestRepairStockOut',
+ method: 'post',
+ data: data,
+ });
}
\ No newline at end of file
diff --git a/src/views/Query/StockQuery/StockTransaction/index.vue b/src/views/Query/StockQuery/StockTransaction/index.vue
index e43bac5..3cc8e64 100644
--- a/src/views/Query/StockQuery/StockTransaction/index.vue
+++ b/src/views/Query/StockQuery/StockTransaction/index.vue
@@ -56,7 +56,7 @@
-
+
@@ -295,6 +295,7 @@ import { bTableHeight } from '../../../composables/calcTableHeight'
import { getORG } from '@/api/auth'
import { cals } from '@/utils/cal'
import { search } from '@/api/wareHouse'
+import { areAllNotEmpty } from '@/utils/CommonUtil'
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(280)
const queryFormRef = ref(ElForm)
@@ -326,7 +327,7 @@ const state = reactive({
remark: '',
queryParams: {
queryId: 'GetlabelList',
- version: 'sdk005',
+ version: 'sdk006',
listCode: '', // 查询类型
params: {
MATERIALSPECNAME: '',
@@ -376,6 +377,7 @@ const state = reactive({
total: 0,
loading: false,
MaterialList: [] as any,
+ locDecListAll: [] as any,
dialog: {
title: '新增用户',
visible: false
@@ -417,7 +419,8 @@ const state = reactive({
ERPFactoryList: [] as any,
ERPLocationList: [] as any,
LocationList: [] as any,
- AllLocationList: [] as any
+ AllLocationList: [] as any,
+ locDecList2: [] as any,
})
const materialTableConfig = ref({
@@ -512,7 +515,28 @@ const handleQuery = () => {
state.queryParams.version = 'sdk005'
}
*/
- getQueryPageList(state.queryParams)
+ let locationNameString = ''
+ for (let i = 0; i < state.queryParams.params.LOCATIONNAME.length; i++) {
+ locationNameString = locationNameString + state.queryParams.params.LOCATIONNAME[i] + ','
+ }
+ getQueryPageList({
+ queryId: 'GetlabelList',
+ version: 'sdk006',
+ listCode: '', // 查询类型
+ params: {
+ MATERIALSPECNAME: state.queryParams.params.MATERIALSPECNAME,
+ SITENAME: 'SDK',
+ RECEIVEACTNO: state.queryParams.params.RECEIVEACTNO,
+ RECEIVEREQUESTNAME: state.queryParams.params.RECEIVEREQUESTNAME,
+ CHARGE: state.queryParams.params.CHARGE,
+ ERPFACTORY: state.queryParams.params.ERPFACTORY,
+ ERPLOCATION: state.queryParams.params.ERPLOCATION,
+ LOCATIONNAME: locationNameString,
+ DESC_CN: state.queryParams.params.DESC_CN,
+ },
+ pageNum: 1,
+ pageSize: 10
+ })
.then((res: any) => {
if (res.data.list.length == 0) {
state.MaterialList = []
@@ -559,6 +583,10 @@ function getGetPrintLabelType() {
state.PRINTLABELLIST = [
{"LABEINAME":"PET","LABELCODE":"PET标签-电晕.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\WMS\\WHRePrint\\","SITENAME":"SDK"},
{"LABEINAME":"SKD2","LABELCODE":"Sdk2.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
+ {"LABEINAME":"SKD2","LABELCODE":"Sdk2.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
+ {"LABEINAME":"SKD2","LABELCODE":"Sdk2.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
+ {"LABEINAME":"SKD2","LABELCODE":"Sdk2.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
+
{"LABEINAME":"胶水原料","LABELCODE":"胶水原材.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
]
}
@@ -870,6 +898,54 @@ function Queryprinter() {
const updateList = (col: any) => {
materialTableConfig.value.column = col
}
+
+function getLocationName(value: any) {
+ state.queryParams.params.ERPLOCATION = value
+ state.queryParams.params.LOCATIONNAME = ''
+ state.LocationList = []
+ if (!areAllNotEmpty(state.queryParams.params.ERPFACTORY)) {
+ proxy.$ElMessage.warning('当前还未选择组织');
+ return
+ } else {
+ /*let erpLocationString = ''
+ for (let i = 0; i < state.queryParams.params.ERPLOCATION.length; i++) {
+ erpLocationString = erpLocationString + state.queryParams.params.ERPLOCATION[i] + ','
+ }*/
+ getQueryList({
+ queryId: 'GetLocationForCreatePO',
+ version: '00002',
+ params: {
+ ERPLOCATION: state.queryParams.params.ERPLOCATION,
+ SITENAME: 'SDK'
+ }
+ }).then((res: any) => {
+ state.locDecListAll = res.data
+ //getlocDec('')
+ })
+ }
+}
+
+
+function getlocDec(query: any) {
+ if (!areAllNotEmpty(state.queryParams.params.ERPLOCATION)) {
+ proxy.$ElMessage.warning('当前还未选择仓库');
+ state.queryParams.params.LOCATIONNAME = ''
+ state.locDecList2 = []
+ return
+ }
+
+ // console.log(query)
+ //let arr = state.locDecListAll;
+ let arr = state.locDecListAll.filter((item: any) => {
+ return item.LABEL.includes(query) || item.VALUE.includes(query)
+ })
+ // console.log(arr)
+ if (arr.length > 50) {
+ state.locDecList2 = arr.slice(0, 50)
+ } else {
+ state.locDecList2 = arr
+ }
+}
From 941865e7c39a0a137cc45700c138d085894ac4cf Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Tue, 27 May 2025 19:50:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?update=20=E6=97=A0=E6=9D=A5=E6=BA=90?=
=?UTF-8?q?=E8=BD=AC=E5=BA=93=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=BA=93=E5=AD=98?=
=?UTF-8?q?=E4=BB=93=E5=BA=93=E4=B8=8B=E6=8B=89=E6=A1=86=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/stocked/NoOrMoveLibrary/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/stocked/NoOrMoveLibrary/index.vue b/src/views/stocked/NoOrMoveLibrary/index.vue
index 4a653ec..7c08dcb 100644
--- a/src/views/stocked/NoOrMoveLibrary/index.vue
+++ b/src/views/stocked/NoOrMoveLibrary/index.vue
@@ -524,7 +524,7 @@ onMounted(() => {
state.orgNo = JSON.parse(pwd).orgNo;
state.queryParams.params.ERPFACTORY = state.orgNo
}
-
+ changeFac(state.queryParams.params.ERPFACTORY)
// state.queryParams.params.ERPFACTORY = JSON.parse(pwd).orgNo;
// state.queryParamsERPLocation.params.ERPFACTORYNAME = JSON.parse(pwd).orgNo;
ERPFactoryQuery()