licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

问题修改

Browse Source
This commit is contained in:
z 2025-07-20 20:38:44 +08:00
parent b8e4cec878
commit f132d277f6
17 changed files with 141 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java
View File

@ -341,6 +341,14 @@ private StorageLogService storageLogService;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createStorage(StorageSaveReqVO createReqVO) {
if (createReqVO.getStockType()==1){
for (StorageMatSaveReqVO item : createReqVO.getMatItemDOList()) {
if (item.getStorageOkQty().compareTo(BigDecimal.ZERO) <= 0) {
throw exception(new ErrorCode(400, "本次入库数量小于等于0,请确认"));
}
}
}
if (createReqVO.getStockType()==1&&createReqVO.getStockInType()==1){
for (StorageMatSaveReqVO item : createReqVO.getMatItemDOList()) {
PurchaseOrderNoDetailDO purchaseOrderNoDetailDO = purchaseOrderNoDetailMapper.selectById(item.getPurchaseOrderNoDetailId());
@ -381,6 +389,16 @@ private StorageLogService storageLogService;
public void updateStorage(StorageSaveReqVO updateReqVO) {
// 校验存在
validateStorageExists(updateReqVO.getId());
if (updateReqVO.getStockType()==1){
List<StorageMatDO> storageMatDOS = storageMatMapper.selectMatByStorckID(updateReqVO.getId());
if (ObjectUtil.isNotEmpty(storageMatDOS)) {
for (StorageMatDO item : storageMatDOS) {
if (item.getStorageOkQty().compareTo(BigDecimal.ZERO) <= 0) {
throw exception(new ErrorCode(400, "本次入库数量小于等于0,请确认"));
}
}
}
}
if (updateReqVO.getStockType()==1&&updateReqVO.getStockInType()==1){
List<StorageMatDO> storageMatDOS = storageMatMapper.selectMatByStorckID(updateReqVO.getId());
if (ObjectUtil.isNotEmpty(storageMatDOS)){

25
mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/warehouseFrom.vue
View File

@ -259,6 +259,16 @@
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="goback" size="large" style="margin-left: 5rem">取 消</el-button>
<el-button @click="submitForm" type="success" :disabled="formLoading" size="large"
>保 存</el-button
>
<el-button @click="submitForm" type="primary" :disabled="formLoading" size="large"
>提 交</el-button
>
<el-button @click="submitForm" type="danger" :disabled="formLoading" size="large"
>报 废</el-button
>
</template>
<el-row justify="center">
@ -299,18 +309,9 @@
</el-row>
</el-card>
</el-form>
<div class="text-center hl-footer">
<el-button @click="goback" size="large">取 消</el-button>
<el-button @click="submitForm" type="success" :disabled="formLoading" size="large"
>保 存</el-button
>
<el-button @click="submitForm" type="primary" :disabled="formLoading" size="large"
>提 交</el-button
>
<el-button @click="submitForm" type="danger" :disabled="formLoading" size="large"
>报 废</el-button
>
</div>
<!-- <div class="text-center hl-footer">-->
<!-- -->
<!-- </div>-->
</el-card>
</template>
<script setup lang="ts">

11
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/auditdetail.vue
View File

@ -325,6 +325,9 @@ link type="primary" size="small"
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="closeForm" size="large" style="margin-left: 5rem">取 消</el-button>
<el-button @click="saveForm(3)" v-if="isShow" type="primary" size="large">审 核</el-button>
<el-button @click="saveForm(4)" v-if="isShow" type="danger" size="large">打 回</el-button>
</template>
<el-row justify="center">
@ -366,11 +369,9 @@ link type="primary" size="small"
</el-card>
</el-form>
<div class="hl-footer text-center">
<el-button @click="closeForm" size="large">取 消</el-button>
<el-button @click="saveForm(3)" v-if="isShow" type="primary" size="large">审 核</el-button>
<el-button @click="saveForm(4)" v-if="isShow" type="danger" size="large">打 回</el-button>
</div>
<!-- <div class="hl-footer text-center">-->
<!-- -->
<!-- </div>-->
</el-card>
<!-- 表单弹窗：物料列表 -->

7
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/detail.vue
View File

@ -280,6 +280,8 @@ ref="matUploadRef" :file-list="matUploadFiles" multiple :limit="10" :action="upl
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="closeForm" size="large" style="margin-left: 5rem">取 消</el-button>
</template>
<el-row justify="center">
@ -321,9 +323,8 @@ ref="matUploadRef" :file-list="matUploadFiles" multiple :limit="10" :action="upl
</el-card>
</el-form>
<div class="hl-footer text-center">
<el-button @click="closeForm" size="large">取 消</el-button>
</div>
<!-- <div class="hl-footer text-center">-->
<!-- </div>-->
</el-card>
<!-- 表单弹窗：物料列表 -->

17
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue
View File

@ -293,6 +293,12 @@ ref="matUploadRef" :file-list="matUploadFiles" multiple :limit="10" :action="upl
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="closeForm" size="large" style="margin-left: 5rem">取 消</el-button>
<el-button @click="deleteForm" type="danger" size="large" v-if="formData.status == 1 || formData.status == 4">删 除</el-button>
<el-button @click="saveForm" type="primary" size="large" v-if="formData.status !== 2 && formData.status !== 3">保
存</el-button>
<el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !== 3">送
审</el-button>
</template>
<el-row justify="center">
@ -334,14 +340,9 @@ ref="matUploadRef" :file-list="matUploadFiles" multiple :limit="10" :action="upl
</el-card>
</el-form>
<div class="hl-footer text-center">
<el-button @click="closeForm" size="large">取 消</el-button>
<el-button @click="deleteForm" type="danger" size="large" v-if="formData.status == 1 || formData.status == 4">删 除</el-button>
<el-button @click="saveForm" type="primary" size="large" v-if="formData.status !== 2 && formData.status !== 3">保
存</el-button>
<el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !== 3">送
审</el-button>
</div>
<!-- <div class="hl-footer text-center">-->
<!-- -->
<!-- </div>-->
</el-card>
<!-- 表单弹窗：物料列表 -->

17
mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue
View File

@ -459,6 +459,12 @@ link type="primary" size="small" :disabled="formData.status == 2"
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="saveForm" v-if="formData.status !== 2 && formData.status !== 3" type="primary" size="large" style="margin-left: 5rem">保
存</el-button>
<el-button
@click="submitForm" type="success" size="large"
v-if="formData.status !== 2 && formData.status !== 3">提交</el-button>
<el-button @click="closeForm" v-if="formData.status == 2" size="large">取消提交</el-button>
</template>
<el-row justify="center">
@ -488,17 +494,12 @@ link type="primary" size="small" :disabled="formData.status == 2"
</el-card>
</el-form>
<div class="hl-footer text-center">
<!-- <div class="hl-footer text-center">-->
<!-- <el-button @click="deleteForm" type="danger" size="large" v-if="formData.status == 1 || formData.status == 4">删
除</el-button> -->
<el-button @click="saveForm" v-if="formData.status !== 2 && formData.status !== 3" type="primary" size="large">保
存</el-button>
<el-button
@click="submitForm" type="success" size="large"
v-if="formData.status !== 2 && formData.status !== 3">提交</el-button>
<el-button @click="closeForm" v-if="formData.status == 2" size="large">取消提交</el-button>
</div>
<!-- </div>-->
</el-card>
<!-- 表单弹窗：物料列表 -->
<materials ref="matOpenFormRef" @success="getList" />

9
mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/firstAdd.vue
View File

@ -454,6 +454,8 @@ link type="primary" size="small" :disabled="formData.status == 2 || formData.sta
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="saveForm" type="primary" size="large" style="margin-left: 5rem">保
存</el-button>
</template>
<el-row justify="center">
@ -483,15 +485,14 @@ link type="primary" size="small" :disabled="formData.status == 2 || formData.sta
</el-card>
</el-form>
<div class="hl-footer text-center">
<!-- <div class="hl-footer text-center">-->
<!-- <el-button @click="deleteForm" type="danger" size="large" v-if="formData.status == 1 || formData.status == 4">删
除</el-button> -->
<el-button @click="saveForm" type="primary" size="large">保
存</el-button>
<!-- <el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !== 3">提交</el-button>
<el-button @click="closeForm" v-if="formData.status == 2" size="large">取消提交</el-button> -->
</div>
<!-- </div>-->
</el-card>
<!-- 表单弹窗：物料列表 -->
<materials ref="matOpenFormRef" @success="getList" />

2
mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/purchaseorderDialog.vue
View File

@ -128,7 +128,7 @@ const queryParams = reactive({
taxRatio: undefined,
estimatedPrice: undefined,
actualPrice: undefined,
status: 2,
status: 3,
receivingStatus: undefined,
submitUserId: undefined,
submitTime: [],

7
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue
View File

@ -596,6 +596,8 @@
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="closeForm" size="large" style="margin-left: 5rem">取 消</el-button>
</template>
<el-row justify="center">
@ -637,10 +639,9 @@
</el-card>
</el-form>
<div class="hl-footer text-center">
<el-button @click="closeForm" size="large">取 消</el-button>
<!-- <div class="hl-footer text-center">-->
</div>
<!-- </div>-->
</el-card>
</template>

17
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
View File

@ -596,6 +596,12 @@ ref="matUploadRef" :file-list="matUploadFiles" multiple :action="uploadUrl" :hea
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="deleteForm" type="danger" size="large" v-if="formData.status == 1 || formData.status == 4" style="margin-left: 5rem">删
除</el-button>
<el-button @click="saveForm" type="primary" size="large" v-if="formData.status !== 2 && formData.status !== 3">保
存</el-button>
<el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !== 3">送
审</el-button>
</template>
<el-row justify="center">
@ -637,15 +643,10 @@ ref="matUploadRef" :file-list="matUploadFiles" multiple :action="uploadUrl" :hea
</el-card>
</el-form>
<div class="hl-footer text-center">
<!-- <div class="hl-footer text-center">-->
<!-- <el-button @click="closeForm" size="large">取 消</el-button> -->
<el-button @click="deleteForm" type="danger" size="large" v-if="formData.status == 1 || formData.status == 4">删
除</el-button>
<el-button @click="saveForm" type="primary" size="large" v-if="formData.status !== 2 && formData.status !== 3">保
存</el-button>
<el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !== 3">送
审</el-button>
</div>
<!-- </div>-->
</el-card>
<!-- 表单弹窗：物料列表 -->
<materials ref="matOpenFormRef" @success="getList" />

9
mes-ui/mes-ui-admin-vue3/src/views/heli/qualityfeedback/detail.vue
View File

@ -64,6 +64,8 @@
<el-card class="hl-card-info" v-if="active != 'create'">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="goback" size="large" style="margin-left: 5rem">取 消</el-button>
<el-button v-if="active != 'detail'" type="primary" @click="submitForm('SAVE')" :disabled="formLoading" size="large">保 存</el-button>
</template>
<el-row>
<el-col :span="8">
@ -91,10 +93,9 @@
</el-row>
</el-card>
</el-form>
<div class="text-center hl-footer">
<el-button @click="goback" size="large">取 消</el-button>
<el-button v-if="active != 'detail'" type="primary" @click="submitForm('SAVE')" :disabled="formLoading" size="large">保 存</el-button>
</div>
<!-- <div class="text-center hl-footer">-->
<!-- -->
<!-- </div>-->
</el-card>
<ProjectSubDialog ref="projectSubDialog" @success="handleSelectedProjectOrderSub" />

26
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
View File

@ -308,6 +308,15 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete"
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="() => router.go(-1)" size="large" style="margin-left: 5rem">取 消</el-button>
<el-button @click="isPrint()" type="primary" size="large" :loading="printLoading" >打印</el-button>
<el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
存</el-button>
<el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">提
交</el-button>
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel&&formData.status != 2" size="large">作
废</el-button>
</template>
<el-row justify="center">
@ -348,17 +357,9 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete"
</el-row>
</el-card>
</el-form>
<div class="hl-footer text-center">
<el-button @click="() => router.go(-1)" size="large">取 消</el-button>
<el-button @click="isPrint()" type="primary" size="large" :loading="printLoading" >打印</el-button>
<el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
存</el-button>
<el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">提
交</el-button>
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel&&formData.status != 2" size="large">作
废</el-button>
</div>
<!-- <div class="hl-footer text-center">-->
<!-- -->
<!-- </div>-->
</el-card>
<!-- 表单弹窗：物料列表 -->
<materials ref="matOpenFormRef" @success="getList" />
@ -788,8 +789,7 @@ const getList1 = async (arrMat) => {
}
queryParams.whId=formData.value.whId;
console.log(formData.value.matItemDOList)
console.log(arrMat)
for (const row of arrMat) {
if (
formData.value.matItemDOList.filter(

19
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
View File

@ -338,6 +338,13 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete"
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="() => router.go(-1)" size="large" style="margin-left: 5rem">取 消</el-button>
<el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
存</el-button>
<el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">提
交</el-button>
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel" size="large">作
废</el-button>
</template>
<el-row justify="center">
@ -391,16 +398,10 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete"
</span>
</template>
</el-dialog>
<div class="hl-footer text-center">
<el-button @click="() => router.go(-1)" size="large">取 消</el-button>
<el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
存</el-button>
<el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">提
交</el-button>
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel" size="large">作
废</el-button>
<!-- <div class="hl-footer text-center">-->
<!-- <el-button @click="handleStatus(4)" type="success" v-if="btnCancel" size="large">审核</el-button> -->
</div>
<!-- </div>-->
</el-card>
<!-- 表单弹窗：物料列表 -->
<materials ref="matOpenFormRef" @success="getList" />

23
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue
View File

@ -323,6 +323,15 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete"
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="() => router.go(-1)" size="large" style="margin-left: 5rem">取 消</el-button>
<el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
存</el-button>
<el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">提
交</el-button>
<el-button @click="handleStatus(4)" type="success" v-if="btnok " size="large">审核</el-button>
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel&&formData.status != 4 " size="large">作
废</el-button>
</template>
<el-row justify="center">
@ -363,17 +372,9 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete"
</el-row>
</el-card>
</el-form>
<div class="hl-footer text-center">
<el-button @click="() => router.go(-1)" size="large">取 消</el-button>
<el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
存</el-button>
<el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">提
交</el-button>
<el-button @click="handleStatus(4)" type="success" v-if="btnok " size="large">审核</el-button>
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel&&formData.status != 4 " size="large">作
废</el-button>
</div>
<!-- <div class="hl-footer text-center">-->
<!-- -->
<!-- </div>-->
</el-card>
<el-dialog v-model="centerDialogVisible" title="提示" width="30%" center>
<span>

6
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/materialsin1.vue
View File

@ -205,6 +205,12 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => {
for (let i = 0; i < multipleSelection.value.length; i++) {
if (multipleSelection.value[i].purchaseRemAmount==null||multipleSelection.value[i].purchaseRemAmount<=0){
message.error(multipleSelection.value[i].matName+"剩余数量等于0,请确认")
return
}
}
// 提交请求
formLoading.value = true
try {

19
mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
View File

@ -235,6 +235,13 @@ ref="matUploadRef" :file-list="matUploadFiles" multiple :action="uploadUrl" :hea
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="() => router.go(-1)" size="large" style="margin-left: 5rem">取 消</el-button>
<el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
存</el-button>
<el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">提
交</el-button>
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel" size="large">删
除</el-button>
</template>
<el-row justify="center">
@ -301,15 +308,9 @@ ref="matUploadRef" :file-list="matUploadFiles" multiple :action="uploadUrl" :hea
</el-dialog>
</el-card>
</el-form>
<div class="hl-footer text-center">
<el-button @click="() => router.go(-1)" size="large">取 消</el-button>
<el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
存</el-button>
<el-button @click="handleStatus(2)" type="primary" v-if="btnSave" size="large">提
交</el-button>
<el-button @click="handleStatus(3)" type="danger" v-if="btnCancel" size="large">删
除</el-button>
</div>
<!-- <div class="hl-footer text-center">-->
<!-- -->
<!-- </div>-->
</el-card>
<!-- 表单弹窗：物料列表 -->

9
mes-ui/mes-ui-admin-vue3/src/views/heli/unqualifiednotification/detail.vue
View File

@ -122,6 +122,8 @@
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
<el-button @click="activeOpinionDialogVisible = false" style="margin-left: 5rem">取 消</el-button>
<el-button type="primary" @click="submitForm('AUDIT') && (activeOpinionDialogVisible = false)">确 认</el-button>
</template>
<el-row>
<el-col :span="8">
@ -184,10 +186,9 @@
</el-select>
</el-form-item>
<template #footer>
<span class="dialog-footer">
<el-button @click="activeOpinionDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submitForm('AUDIT') && (activeOpinionDialogVisible = false)">确 认</el-button>
</span>
<!-- <span class="dialog-footer">-->
<!-- -->
<!-- </span>-->
</template>
</el-dialog>
</el-form>