lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lsymicc
2025-06-09 17:08:49 +08:00
parent f39a3d5df4 a0569f17a5
commit 0eea66120f
22 changed files with 176 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-ui/src/lang/en.js
View File

@@ -114,6 +114,10 @@ export default {
stockStatus: 'Document Status',
operate: 'Operation',
selecInType: 'Please select stockin type',
netWeight: '净重',
totalPrice: '确定',
totalNetWeight: '总净重',
grossWeight: '毛重',
},
// ***************入库单据管理*************
inStockin: {
@@ -175,7 +179,15 @@ export default {
selectStartTime: 'Please select Start Time',
selectFinishTime: 'Please select Finish Time',
inputEntranceId: 'Please input Entrance ID',
inputExitId: 'Please input Exit ID'
inputExitId: 'Please input Exit ID',
netWeight: '净重',
totalPrice: '确定',
totalNetWeight: '总净重',
grossWeight: '毛重',
materialDesc: '物料描述',
englishDesc: '英文描述',
cartonNo: '箱号',
packingMethod: '包装方式',
},
// ***************出库单据管理**************
outStockoutManage: {

17
ruoyi-ui/src/lang/zh.js
View File

@@ -117,7 +117,11 @@ export default {
packingMethod: '包装方式',
quantity: '计划数量',
stockStatus: '单据状态',
operate: '操作'
operate: '操作',
netWeight: '净重',
totalPrice: '确定',
totalNetWeight: '总净重',
grossWeight: '毛重',
},
// ***************入库单据管理*************
inStockin: {
@@ -179,7 +183,16 @@ export default {
selectStartTime: '请选择开始时间',
selectFinishTime: '请选择结束时间',
inputEntranceId: '请输入入口ID',
inputExitId: '请输入出口ID'
inputExitId: '请输入出口ID',
netWeight: '净重',
totalPrice: '确定',
totalNetWeight: '总净重',
grossWeight: '毛重',
materialDesc: '物料描述',
englishDesc: '英文描述',
cartonNo: '箱号',
packingMethod: '包装方式',
},
// ***************新建出库单据**************
addOutStockout: {

12
ruoyi-ui/src/views/bas/BasProduct/index.vue
View File

@@ -59,7 +59,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="箱号" prop="spare3">
<!-- <el-form-item label="箱号" prop="spare3">
<el-input
v-model="queryParams.spare3"
placeholder="请输入箱号"
@@ -74,7 +74,7 @@
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item label="价格" prop="price">
<el-input
v-model="queryParams.price"
@@ -207,8 +207,8 @@
<el-table-column label="英文描述" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="单件净重KG" align="center" prop="spare2" />
<el-table-column label="箱号" align="center" prop="spare3" />
<el-table-column label="包装方式" align="center" prop="spare4" />
<!-- <el-table-column label="箱号" align="center" prop="spare3" />-->
<!-- <el-table-column label="包装方式" align="center" prop="spare4" />-->
<el-table-column label="长MM" align="center" prop="spare5" />
<el-table-column label="宽MM" align="center" prop="spare6" />
<el-table-column label="高MM" align="center" prop="spare7" />
@@ -263,12 +263,12 @@
<el-form-item label="单件净重KG" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入单件净重" />
</el-form-item>
<el-form-item label="箱号" prop="spare3">
<!-- <el-form-item label="箱号" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入箱号" />
</el-form-item>
<el-form-item label="包装方式" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入包装方式" />
</el-form-item>
</el-form-item>-->
<el-form-item label="长MM" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入长度" />
</el-form-item>

4
ruoyi-ui/src/views/check/create/index.vue
View File

@@ -31,12 +31,12 @@
</el-form-item>
<el-form-item>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">{{ $t('checkCreate.reset') }}</el-button> <!-- 重置 -->
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">{{ $t('checkCreate.saveDocument') }}</el-button> <!-- 保存单据 -->
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave" v-hasPermi="['check:stockCheck:saveBill']" >{{ $t('checkCreate.saveDocument') }}</el-button> <!-- 保存单据 -->
</el-form-item>
</el-form>
<div class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">{{ $t('checkCreate.selectMaterial') }}</el-button> <!-- 选择物资 -->
<el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['check:productAndStock:list']" @click="handleSelectMaterials" >{{ $t('checkCreate.selectMaterial') }}</el-button> <!-- 选择物资 -->
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">{{ $t('checkCreate.recreateDocument') }}</el-button> <!-- 重新建单 -->
</div>

4
ruoyi-ui/src/views/check/job/in/index.vue
View File

@@ -216,7 +216,7 @@
size="mini"
:disabled="multiple"
@click="handleManualVoid"
v-hasPermi="['check:job:in:void']"
v-hasPermi="['job:checkMydoJob:manualInvalidation']"
>{{$t('checkJobIn.manualVoid')}}</el-button> <!--手动作废-->
</el-col>
<el-col :span="1.5">
@@ -227,7 +227,7 @@
size="mini"
:disabled="multiple"
@click="handleManualFinish"
v-hasPermi="['check:job:in:finish']"
v-hasPermi="['job:checkMydoJob:manualCompleted']"
>{{$t('checkJobIn.manualFinish')}}</el-button> <!--手动完成-->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

14
ruoyi-ui/src/views/check/job/out/index.vue
View File

@@ -216,7 +216,7 @@
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:mydoJob:CompletedManually']"
v-hasPermi="['job:checkMydoJob:OuthandFinish']"
>{{$t('checkJobOut.manualInvalid')}}</el-button> <!-- 手动作废 -->
</el-col>
<el-col :span="1.5">
@@ -226,7 +226,7 @@
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'completed'})"
v-hasPermi="['job:mydoJob:CompletedManually']"
v-hasPermi="['job:job:checkMydoJob:OuthandInvalidation']"
>{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
</el-col>
<!-- <el-col :span="1.5">
@@ -297,11 +297,13 @@
size="mini"
type="text"
@click="handleManualFinish(scope.row)"
v-hasPermi="['job:checkMydoJob:OuthandFinish']"
>{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
<el-button
size="mini"
type="text"
@click="handleManualInvalid(scope.row)"
v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
>{{$t('checkJobOut.manualInvalid')}}</el-button> <!-- 手动作废 -->
</template>
</el-table-column>
@@ -338,14 +340,6 @@
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.supplierId')" align="center" prop="supplierId" /> <!-- 供应商ID -->
<!-- <el-table-column label="库存数量" align="center" prop="stockQuantity" />
<!-- <el-table-column label="出库数量" align="center" prop="outQuantity" />
<!-- <el-table-column label="整层数量" align="center" prop="layerQuantity" />
<!-- <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />
<!-- <el-table-column label="回流数量" align="center" prop="giveNum" />
<!-- <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />
<!-- <el-table-column label="垛型ID" align="center" prop="stackingId" />
<!-- <el-table-column label="出库口ID" align="center" prop="exitId" />-->
<el-table-column label="生产日期" align="center" prop="printDate" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="供应商ID" align="center" prop="supplierId" />

1
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -167,6 +167,7 @@
plain
icon="el-icon-plus"
size="mini"
:disabled="single"
@click="handleReview"
v-hasPermi="['check:stockCheck:edit']"
>{{$t('checkStockCheck.review')}}</el-button> <!-- 单据审核 -->

20
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -305,8 +305,8 @@
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('inJob.jobDetailId')" align="center" prop="jobDetailId" />
<el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID
<el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID
<!-- <el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID-->
<!-- <el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID-->
<el-table-column :label="$t('inJob.lotNo')" align="center" prop="lotNo" /> // 批次号
<el-table-column :label="$t('inJob.inDate')" align="center" prop="inDate" width="180"> // 入库时间
<template slot-scope="scope">
@@ -315,12 +315,20 @@
</el-table-column>
<el-table-column :label="$t('inJob.inOrOutId')" align="center" prop="inOrOutId" /> // 单据ID
<el-table-column :label="$t('inJob.inOrOutDId')" align="center" prop="inOrOutDId" /> // 子单据ID
<el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID
<!-- <el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID-->
<el-table-column :label="$t('inJob.productId')" align="center" prop="productId" /> // 物料编码
<el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态
<el-table-column :label="$t('inJob.materialDesc')" align="center" prop="extraField.materialDesc" /> // 物料描述
<el-table-column :label="$t('inJob.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
<el-table-column :label="$t('inJob.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号
<el-table-column :label="$t('inJob.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式
<el-table-column :label="$t('inJob.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('inJob.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('inJob.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
<!-- <el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态-->
<el-table-column :label="$t('inJob.inQuantity')" align="center" prop="inQuantity" /> // 入库数量
<el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期
<el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID
<!-- <el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期-->
<!-- <el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID-->
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
<el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段3" align="center" prop="spare3" />

6
ruoyi-ui/src/views/in/receive/add/index.vue
View File

@@ -162,8 +162,8 @@
<el-table-column :label="$t('receiveStockinAdd.spare1')" align="center" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="center" prop="spare2" /><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" /><!--箱号-->
<el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" /><!--包装方式-->
<!-- <el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" />&lt;!&ndash;箱号&ndash;&gt;-->
<!-- <el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" />&lt;!&ndash;包装方式&ndash;&gt;-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="center" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="center" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="center" prop="spare7" /><!--高MM-->
@@ -436,7 +436,7 @@ export default {
addStockin(data).then(() => {
this.$modal.msgSuccess(this.$t('receiveStockinAdd.addSuccess'));
// 重置表单数据
cancelPri()
this.cancelPri();
});
}
});

8
ruoyi-ui/src/views/in/receive/index.vue
View File

@@ -235,7 +235,7 @@
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/>
<dict-tag :options="dict.type.receive_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
@@ -316,6 +316,10 @@
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/><!--毛重-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight"/><!--净重-->
<el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/><!--总价格-->
<el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/><!--总净重-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="center"><!--计划数量-->
<template slot-scope="scope">
<el-input-number
@@ -337,7 +341,7 @@
<!-- <el-table-column label="入库日期" align="center" prop="printDate"/>-->
<el-table-column :label="$t('inReceiveStockin.stockStatus')" align="center" prop="stockStatus"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.stockStatus"/>
<dict-tag :options="dict.type.receive_bill_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<!-- <el-table-column label="供应商编码" align="center" prop="supplierId"/>-->

3
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -294,6 +294,9 @@
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
<el-table-column :label="$t('inReceiveStockin.quantity')" align="center" prop="quantity"/><!--计划数量-->
<el-table-column :label="$t('inStockin.scanNum')" align="center" prop="scanNum"/><!--扫码数量-->
<el-table-column :label="$t('inStockin.assignNum')" align="center" prop="assignNum"/><!--实际数量-->

4
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -31,12 +31,12 @@
</el-form-item>
<el-form-item>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">{{$t('addOutStockout.reset')}}<!--重置--></el-button>
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">{{$t('addOutStockout.saveDocument')}}<!--保存单据--></el-button>
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave" v-hasPermi="['out:outStockout:saveBill']">{{$t('addOutStockout.saveDocument')}}<!--保存单据--></el-button>
</el-form-item>
</el-form>
<div class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">{{$t('addOutStockout.selectMaterial')}}<!--选择物资--></el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials" v-hasPermi="['out:productAndStock:list']">{{$t('addOutStockout.selectMaterial')}}<!--选择物资--></el-button>
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">{{$t('addOutStockout.recreateDocument')}}<!--重新建单--></el-button>
</div>

2
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -115,6 +115,7 @@
icon="el-icon-s-promotion"
size="mini"
@click="handleAutoAllot"
v-hasPermi="['out:outStockout:autoAllot']"
>{{$t('outStockoutManage.autoAllot')}}</el-button> <!-- 自动分配 -->
</el-col>
<el-col :span="1.5">
@@ -124,6 +125,7 @@
icon="el-icon-s-tools"
size="mini"
@click="handleManualAllot"
v-hasPermi="['out:outStockout:manualAllot']"
>{{$t('outStockoutManage.manualAllot')}}</el-button> <!-- 手动分配 -->
</el-col>
</el-row>