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

零件采购

Browse Source
This commit is contained in:
wb_zhanghaoyuan 2025-06-27 11:34:02 +08:00
parent 3e0c9de015
commit d42f96606b
6 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java
View File

@ -200,17 +200,11 @@ public class MaterialPlanController {
return materialPlanService.delMaterial(id);
}
// @PostMapping("/getPartPurchasePages")
// @Operation(summary = "获得零件采购分页")
// public CommonResult<PageResult<MaterialPlanBoomDO>> getPartPurchasePages(@Valid @RequestBody MaterialPlanPageReqVO pageReqVO) {
// PageResult<MaterialPlanBoomDO> pageResult = materialPlanService.getPartPurchasePages(pageReqVO);
// return success(pageResult);
// }
@GetMapping("/getPartPurchasePages")
@Operation(summary = "获得零件采购分页")
public CommonResult<PageResult<MaterialPlanBoomDO>> getPartPurchasePages() {
String a ="asdij";
return null;
public CommonResult<PageResult<MaterialPlanBoomDO>> getPartPurchasePages(@Valid MaterialPlanPageReqVO pageReqVO) {
PageResult<MaterialPlanBoomDO> pageResult = materialPlanService.getPartPurchasePages(pageReqVO);
return success(pageResult);
}
}

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
import com.chanko.yunxi.mes.framework.mybatis.core.query.QueryWrapperX;
import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageReqVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PurchaseOrderMakeSaveReqVO;
@ -27,6 +28,7 @@ import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@ -111,6 +113,8 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{
PurchaseOrderMakeDO purchaseOrderMakeDO = new PurchaseOrderMakeDO();
purchaseOrderMakeDO.setId(id);
purchaseOrderMakeDO.setStatus(2);
purchaseOrderMakeDO.setAuditor(SecurityFrameworkUtils.getLoginUserId());
purchaseOrderMakeDO.setAuditTime(LocalDateTime.now());
purchaseOrderMakeMapper.updateById(purchaseOrderMakeDO);
List<MaterialPlanBoomDO> materialPlanBoomDOs= materialPlanBoomMapper.selectList("project_purchase_order_make_id", id);

2
mes-ui/mes-ui-admin-vue3/package.json
View File

@ -6,7 +6,7 @@
"private": false,
"scripts": {
"i": "pnpm install",
"dev": "vite --mode dev",
"dev": "vite --mode base",
"front": "vite --mode front",
"ts:check": "vue-tsc --noEmit",
"build:pro": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode pro",

11
mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts
View File

@ -95,12 +95,7 @@ export const delMaterial = async (id: number) => {
return await request.delete({ url: `/heli/material-plan/delMaterial?id=` + id })
}
// // 查询零件采购分页
// export const getPartPurchasePages = async (params) => {
// return await request.post({ url: `/heli/material-plan/getPartPurchasePages`, params })
// }
// 更新采购单主驳回
export const getPartPurchasePages = async () => {
return await request.get({ url: `/heli/material-plan/getPartPurchasePage` })
// 查询零件采购分页
export const getPartPurchasePages = async (params) => {
return await request.get({ url: `/heli/material-plan/getPartPurchasePages`, params })
}

7
mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue
View File

@ -144,10 +144,9 @@ const exportLoading = ref(false) // 导出的加载中
const getList = async () => {
loading.value = true
try {
// const data = await MaterialPlanApi.getPartPurchasePages(queryParams)
// list.value = data.list
// total.value = data.total
await MaterialPlanApi.getPartPurchasePages()
const data = await MaterialPlanApi.getPartPurchasePages(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}

14
mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue
View File

@ -135,13 +135,27 @@ const updateParams = reactive({
reason: undefined
})
const approve = async () => {
const checkParams = await PartPurchaseOrderApi.getPurchaseOrderMake(query.id)
if (checkParams.status != 1){
message.warning("该单据状态非待审核，请刷新界面！");
return;
}
await PartPurchaseOrderApi.updatePurchaseOrderMake(formData.value.id)
message.success("提交成功");
getList();
}
const handleReject = async () => {
const checkParams = await PartPurchaseOrderApi.getPurchaseOrderMake(query.id)
if (checkParams.status != 1){
message.warning("该单据状态非待审核，请刷新界面！");
return;
}
try {
const { value, action } = await ElMessageBox.prompt('请输入驳回原因', '提示', {
confirmButtonText: '确定',