10539622/2025-03-JS-SDK-CLI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-CLI

Browse Source
This commit is contained in:
郭飞 2025-05-27 20:06:41 +08:00
commit d6183159ea
8 changed files with 1533 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/StockIn/index.ts
View File

@ -174,3 +174,16 @@ export function UpdateDeliveryStates(ChangeParams: any) {
});
}
/**
* 辅材盘盈盘亏确认
* @param data
* @returns
*/
export function confirm(data: any) {
return request({
url: '/api/MaterialReceiveAct/confirm',
method: 'post',
data: data,
});
}

13
src/api/StockOut/index.ts
View File

@ -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,
});
}

2
src/views/Query/StockQuery/StockTransaction/index.vue
View File

@ -56,7 +56,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="目的货位" prop="LOCATIONNAME">
<el-form-item label="货位" prop="LOCATIONNAME">
<el-select
size="small"
v-model="queryParams.LOCATIONNAME"

277
src/views/check/auxiliaryOutIn/index.vue Normal file
View File

@ -0,0 +1,277 @@
<template>
<div class="vue-element-page-wrap" ref="tableContainer">
<el-row class="page-search" justify="space-between" align="bottom">
<el-form ref="queryFormRef" :model="queryParams.params" :rules="rulesParam" :inline="true" label-position="left">
<el-row :gutter="20">
<el-col :span="6" class="col_height">
<el-form-item label="盘点类型" prop="checkType">
<el-select v-model="queryParams.params.checkType" placeholder="选择盘点类型" clearable>
<el-option value="盘盈" label="盘盈"></el-option>
<el-option value="盘亏" label="盘亏"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" class="col_height">
<el-form-item label="组织" prop="erpFactory">
<el-select filterable v-model="queryParams.params.erpFactory" placeholder="下拉选择组织" @change="ERPLocationQuery">
<el-option v-for="item in ERPFactoryList" :key="item.ERPFACTORY" :label="item.DESCRIPTION" :value="item.ERPFACTORY"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" class="col_height">
<el-form-item label="仓库" prop="erpLocation">
<el-select v-model="queryParams.params.erpLocation" clearable collapse-tags placeholder="请选择仓库"
popper-class="custom-header" :max-collapse-tags="1"
@visible-change="GetLocationListForSomeERPLocation" filterable>
<template #header>
</template>
<el-option v-for="item in state.ERPLocationList" :key="item.ENUMVALUE" :label="item.DESCRIPTION"
:value="item.ENUMVALUE" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" class="col_height">
<el-form-item label="货位" prop="location">
<el-select v-model="queryParams.params.location" clearable collapse-tags placeholder="请选择货位"
popper-class="custom-header" :max-collapse-tags="1"
remote :remote-method="handleInput" filterable>
<template #header>
</template>
<el-option v-for="item in state.LocationList" :key="item.storageName" :label="item.storageName"
:value="item.storageName" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" class="col_height">
<el-form-item label="物料编号" prop="materialSpecName">
<el-Input v-model="queryParams.params.materialSpecName" placeholder="输入物料编号" clearable/>
</el-form-item>
</el-col>
<el-col :span="6" class="col_height">
<el-form-item label="差异数量" prop="nums">
<el-Input-number min="0" v-model="queryParams.params.nums" placeholder="输入差异数量" clearable/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="page-search-btns">
<el-button type="primary" @click="handleConfirm" v-loading="state.loadingC">确认</el-button>
</div>
</el-row>
<!-- table 区域-->
<div class="vue-element-page-table">
<div class="page-table-operate">
<div class="page-table-title">
<div class="page-table-title-left">
<span>生成信息</span>
</div>
</div>
</div>
<el-table :height="tableHeight" border v-loading="loading" :default-sort="{ prop: 'MATERIALSPECNAME', order: 'descending' }"
:data="state.dataList" highlight-current-row row-key="id" style="width: 100%">
<template v-for="(col, index) in tableConfig.column" :key="index">
<el-table-column v-if="!col.hide" :label="col.header" :prop="col.field" show-overflow-tooltip
:width="col.width" :sort-orders="['descending', 'ascending']" :sortable="true"/>
</template>
</el-table>
<div>
<el-form :model="state.updateParams" ref="formDataRef" label-position="left" :rules="rules" style="margin-top: 10px;">
<el-row :gutter="22">
<el-col :span="5">
<el-form-item label="成本中心" prop="costName">
<el-select v-model="state.updateParams.costName" placeholder="选择成本中心" clearable>
<el-option value="1010103000" label="财务部中心"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button type="primary" @click="submit" v-loading="state.loadings">提交</el-button>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script lang="ts">
export default {
name: 'auxiliaryOutIn'
}
</script>
<script lang="ts" setup>
import { reactive, ref, onMounted, toRefs, getCurrentInstance } from 'vue'
import { ElForm, ElMessageBox, ElTable } from 'element-plus'
import { getQueryPageList,getQueryList } from '@/api/common'
import { areAllNotEmpty, msToDate } from '@/utils/CommonUtil';
import { localStorage } from '@/utils/storage'
import { confirm } from '@/api/StockIn'
import { bTableHeight } from '@/composables/calcTableHeight'
import { getORG } from '@/api/auth'
import { search } from '@/api/wareHouse'
// 公共变量
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(310)
const { proxy }: any = getCurrentInstance()
const tableConfig = ref({
loading: false,
column: [] as any,
data: []
})
const queryFormRef = ref()
const formDataRef = ref()
// 变量
const state = reactive({
dataList: [] as any, // 表格数据
loadings: false, // 更新按钮
loadingC: false,
loading: false, // 表格
// 组织
ERPFactoryList: [] as any,
// 仓库
ERPLocationList: [] as any,
// 货位
LocationList: [] as any,
// 查询参数
queryParams: {
queryId: 'NotPosted',
version: 'G5001',
params: {
siteName: localStorage.get('siteName') || 'SDK',
user: localStorage.get('userName'),
materialSpecName: '', // 物料编号
location: '',// 货位
erpLocation: '',
erpFactory: '',
CHARGE: '',
ERPLOCATION: '',
LOCATIONNAME: '',
PHASE: '',
DESC_CN: '',
REMARK: '',
checkType: '',
nums: 0,
},
pageNum: 1,
pageSize: 10
},
queryParamsERPLocation: {
queryId: "GetErpLocationList",
version: "WEB00001",
params: {
SITENAME: localStorage.get("siteName") || 'SDK',
ERPFACTORYNAME: '',
},
pageNum: 1,
pageSize: 10
},
// 更新参数
updateParams: {
costName: '',
},
// 条件
rules: {
costName: [{required: true, message: '请选择成本中心', trigger: 'blur'}],
},
rulesParam: {
checkType: [{required: true, message: '请选择盘点类型', trigger: 'blur'}],
erpFactory: [{required: true, message: '请选择组织', trigger: 'blur'}],
erpLocation: [{required: true, message: '请选择仓库', trigger: 'blur'}],
location: [{required: true, message: '请选择货位', trigger: 'blur'}],
materialSpecName: [{required: true, message: '请输入料号', trigger: 'blur'}],
nums: [{required: true, message: '请输入数量', trigger: 'blur'}],
},
})
const { queryParams, loading, ERPFactoryList, rules, rulesParam } = toRefs(state)
// 加载
onMounted(() => {
tableConfig.value.column = [
{ header: '二维码', field: 'SITENAME', hide: true },
{ header: '组织', field: 'ERPFACTORY', hide: false },
// { header: '组织(CN)', field: 'ERPFACTORYDESC', hide: false, width: 100 },
{ header: '仓库编码', field: 'ERPLOCATION', hide: false, width: 100 },
// { header: "仓库名称", field: "ERPLOCATIONDESC", hide: false, width: 100 },
{ header: '货位', field: 'LOCATIONNAME', hide: false },
// { header: '货位名称', field: 'LOCATIONNAMEDESC', hide: false, width: 100 },
{ header: '物料编号', field: 'MATERIALSPECNAME', hide: false, width: 140 },
{ header: '差异数量', field: 'MATERIALQUANTITY', hide: false, width: 140 },
{ header: '批次号', field: 'CHARGE', hide: false, width: 180 },
]
getErpFactory()
updateTableHeight()
window.addEventListener('resize', handleResize)
})
// 更新
function submit() {
}
// 加载组织
function getErpFactory() {
getORG({ orgNo: null }).then((res: any) => {
state.ERPFactoryList = res.resultObj
state.ERPFactoryList.unshift({
ERPFACTORY: ''
})
})
}
//ERP库位查询
function ERPLocationQuery() {
state.queryParamsERPLocation.params.ERPFACTORYNAME = state.queryParams.params.erpFactory
getQueryList(state.queryParamsERPLocation).then((res: any) => {
state.ERPLocationList = res.data;
});
}
function GetLocationListForSomeERPLocation(value: any) {
if (!areAllNotEmpty(state.queryParams.params.erpFactory)) {
proxy.$ElMessage.warning('当前还未选择组织');
state.queryParams.params.ERPLOCATION = ''
state.ERPLocationList = []
return
}
if (!areAllNotEmpty(state.queryParams.params.ERPLOCATION)) {
return
}
}
function handleInput(val: any) {
let index = [1, 3, 4, 7, 8]
if (index.indexOf(val.length) > -1) {
state.LocationList = []
search({
storageName: val,
orgNo: JSON.parse(localStorage.get('orgNo'))
}).then((res:any) => {
if (res.resultObj) {
state.LocationList = res.resultObj
} else {
proxy.$ElMessage.warning(res.message);
}
})
}
}
function handleConfirm(){
queryFormRef.value.validate((valid: any) => {
if (!valid) {
return
}
})
let param = {
...state.queryParams.params,
}
state.loadingC = true
confirm(state.queryParams.params).then(res => {
if(res.success){
state.dataList = res.resultObj;
} else {
proxy.$ElMessage.error(res.message);
}
state.loadingC = false
})
}
</script>
<style>
.col_height {
padding-top: 3.5px;
padding-bottom: 3.5px;
}
</style>

101
src/views/label/newMaterialSpecLabelPrint/index.vue
View File

@ -67,6 +67,7 @@
v-model="state.queryParams.params.ERPLOCATION"
placeholder="选择仓库"
clearable
@change="getLocationName"
style="width: 170px"
>
<el-option
@ -81,19 +82,18 @@
<el-col :span="4">
<el-form-item label="货位" prop="queryParams.params">
<el-select
filterable
v-model="state.queryParams.params.LOCATIONNAME"
remote
:remote-method="handleInput"
clearable
multiple filterable
placeholder="选择库位"
:filter-method="getlocDec"
default-first-option
style="width: 170px"
>
<el-option
v-for="item in state.LocationList"
:key="item.storageName"
:label="item.storageName"
:value="item.storageName"
v-for="item in state.locDecList2"
:key="item.VALUE"
:label="item.LABEL"
:value="item.VALUE"
/>
</el-select>
</el-form-item>
@ -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 = []
@ -557,10 +581,13 @@ function getGetPrintLabelType() {
state.queryParams.params.LOCATIONNAME = ''
state.AllLocationList = []
state.PRINTLABELLIST = [
{"LABEINAME":"PET","LABELCODE":"PET标签-电晕.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\WMS\\WHRePrint","SITENAME":"SDK"},
{"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"},
{"LABEINAME":"胶水原料","LABELCODE":"胶水原材.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
]
}
@ -871,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
}
}
</script>
<style scoped></style>

1120
src/views/stockOut/TemporaryStockOutRepairSAPPage/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/views/stocked/NoOrMoveLibrary/index.vue
View File

@ -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()

30
src/views/stocked/careerAssistanceInquiry/index.vue
View File

@ -17,7 +17,6 @@
filterable
v-model="queryParams.params.ERPFACTORY"
placeholder="下拉选择组织"
style="width: 240px"
@change="GetERPLocationForList"
>
<el-option
@ -47,7 +46,6 @@
placeholder="请选择仓库"
popper-class="custom-header"
:max-collapse-tags="1"
style="width: 240px"
@visible-change="GetLocationListForSomeERPLocation"
filterable
>
@ -72,7 +70,6 @@
placeholder="请选择货位"
popper-class="custom-header"
:max-collapse-tags="1"
style="width: 240px"
remote
:remote-method="handleInput"
filterable
@ -101,7 +98,6 @@
<el-select
v-model="queryParams.params.PHASE"
placeholder="输入阶段"
style="width: 160px"
>
<el-option
v-for="item in state.PhaseList"
@ -146,6 +142,15 @@
/>
</el-form-item>
</el-col>
<el-col :span="6" class="col_height">
<el-form-item label="销售订单" prop="params.SALESHIPREQUESTNAME">
<el-Input
v-model="queryParams.params.SALESHIPREQUESTNAME"
placeholder="输入销售订单"
clearable
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="page-search-btns">
@ -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()