diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java
index 82064b3..0713db0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java
@@ -75,6 +75,9 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
if (!"1".equals(basStock.getProductStatus())){
return AjaxResult.warn("库存非正常状态");
}
+ if (basStock.getQuantity().equals(checkDifferenceRecord.getNewQuantity())){
+ return AjaxResult.success();
+ }
basStock.setProductStatus("2");
basStockService.updateBasStock(basStock);
checkDifferenceRecord.setCargoSpaceId(basStock.getCargoSpaceId());
diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js
index 4c55ada..8d3c215 100644
--- a/ruoyi-ui/src/lang/zh.js
+++ b/ruoyi-ui/src/lang/zh.js
@@ -466,6 +466,7 @@ export default {
auditTitle:'审核单据',
selectExit:'选择出口',
pleaseSelectExit:'请选择出口',
+ defaultExit:'人工出口'
},
// ***************盘点入库作业*************
checkJobIn: {
@@ -537,7 +538,10 @@ export default {
netWeight:"净重",
totalNetWeight:"总净重",
grossWeight:"毛重",
- onlyOneCanAutoAllocation:"请选择一条分配单据"
+ onlyOneCanAutoAllocation:"请选择一条分配单据",
+ selectDataRequired:'请选择要操作的数据',
+ selectOneDataRequired:'请选择一条任务',
+ operaSuccess:'操作成功',
},
// **************盘点出库作业****************
checkJobOut: {
@@ -651,7 +655,11 @@ export default {
inputOldQuantity: '请输入原值',
inputNewQuantity: '请输入新值',
inputProductGuid: '请输入物料guid',
- inputRecordType:'请选择操作方式'
+ inputRecordType:'请选择操作方式',
+ confirmNotPass:'是否确认不通过盘点差异编号为',
+ confirmNPass:'是否确认通过盘点差异编号为',
+ deleteSuccess:'审核不通过成功',
+ auditSuccess:'审核成功',
},
// ********************库存信息*************
stockManagement: {
diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue
index 83eca87..9bcf7e0 100644
--- a/ruoyi-ui/src/views/check/create/index.vue
+++ b/ruoyi-ui/src/views/check/create/index.vue
@@ -12,13 +12,6 @@
/>
-
-
-
-
-
{{$t('checkDifference.search')}}
{{$t('checkDifference.reset')}}
@@ -406,11 +358,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const checkGuids = row.checkGuid || this.ids
- this.$modal.confirm('是否确认删除盘点差异编号为"' + checkGuids + '"的数据项？').then(function() {
+ this.$modal.confirm(this.$t('checkDifference.confirmNotPass') + checkGuids).then(function() {
return delDifference(checkGuids)
}).then(() => {
this.getList()
- this.$modal.msgSuccess("删除成功")
+ this.$modal.msgSuccess(this.$t('checkDifference.deleteSuccess'))
}).catch(() => {})
},
/** 导出按钮操作 */
@@ -422,11 +374,11 @@ export default {
/** 审核按钮操作 */
handleAudit() {
const checkGuids = this.ids
- this.$modal.confirm('是否确认审核选中的' + checkGuids.length + '条数据？').then(function() {
+ this.$modal.confirm(this.$t('checkDifference.confirmPass') + checkGuids.length).then(function() {
return auditDifference(checkGuids)
}).then(() => {
this.getList()
- this.$modal.msgSuccess("审核成功")
+ this.$modal.msgSuccess(this.$t('checkDifference.auditSuccess'))
}).catch(() => {})
},
}
diff --git a/ruoyi-ui/src/views/check/flat/index.vue b/ruoyi-ui/src/views/check/flat/index.vue
index ef2daa2..0341757 100644
--- a/ruoyi-ui/src/views/check/flat/index.vue
+++ b/ruoyi-ui/src/views/check/flat/index.vue
@@ -27,27 +27,6 @@
/>
-
-
-
-
-
-
-
{{$t('stockManagement.search')}}
{{$t('stockManagement.reset')}}
@@ -235,7 +101,7 @@
v-hasPermi="['stock:management:remove']"
>{{$t('stockManagement.delete')}}
-
+
-
+ >{{$t('stockManagement.export')}} <!– 导出 –>
+ -->
@@ -277,11 +143,8 @@
-
-
-
@@ -315,12 +178,6 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
{{$t('checkJobIn.search')}}
{{$t('checkJobIn.reset')}}
@@ -407,7 +295,6 @@ export default {
// 表单参数
form: {},
// 表单校验
- // 表单校验
rules: {
jobId: [
{ required: true, message: this.$t('checkJobIn.jobIdRequired'), trigger: "blur" }
@@ -518,11 +405,11 @@ export default {
//console.log("1111")
const jobIds = this.ids;
if (jobIds.length === 0) {
- this.$modal.msgError("请选择要操作的数据");
+ this.$modal.msgError(this.$t('checkJobIn.selectDataRequired'));
return;
}
if (jobIds.length > 1) {
- this.$modal.msgError("请选择一条任务");
+ this.$modal.msgError(this.$t('checkJobIn.selectOneDataRequired'));
return;
}
var data = {
@@ -531,13 +418,13 @@ export default {
if (row.type === 'invalid'){
//手动作废
manualInvalidation(data).then(response => {
- this.$modal.msgSuccess("操作成功");
+ this.$modal.msgSuccess(this.$t('checkJobIn.operaSuccess'));
this.getList();
})
}else if (row.type === 'completed'){
//手动完成
manualCompleted(data).then(response => {
- this.$modal.msgSuccess("操作成功");
+ this.$modal.msgSuccess(this.$t('checkJobIn.operaSuccess'));
this.getList();
})
}
diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue
index 53553c1..607a662 100644
--- a/ruoyi-ui/src/views/check/job/out/index.vue
+++ b/ruoyi-ui/src/views/check/job/out/index.vue
@@ -19,16 +19,6 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
{{$t('checkJobOut.search')}}
{{$t('checkJobOut.reset')}}
@@ -236,16 +123,6 @@
v-hasPermi="['job:job:checkMydoJob:OuthandInvalidation']"
>{{$t('checkJobOut.manualFinish')}}
-
@@ -257,7 +134,7 @@
-
+
@@ -287,7 +164,7 @@
-
+
-
-
{{$t('checkStockCheck.search')}}
{{$t('checkStockCheck.reset')}}
@@ -606,7 +502,7 @@ export default {
// 如果最终没有可用的出口选项，给出提示
if (this.exitOptions.length === 0) {
//console.warn('当前仓库没有可用的出口选项')
- this.exitOptions=[{exitId: '0', exitName: '人工出口'}]
+ this.exitOptions=[{exitId: '0', exitName: this.$t('checkStockCheck.defaultExit')}]
}
} catch (error) {