sephiroth190326/EPCMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设计管理：材料明细表料单阶段比较报告

Browse Source
This commit is contained in:
suncz
2024-05-09 14:53:21 +08:00
parent eec463ac58
commit 2b06717f72
6 changed files with 184 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/vverp/controller/admin/MaterialOrderController.java
View File

@@ -107,7 +107,7 @@ public class MaterialOrderController extends BaseController {
modelMap.addAttribute("productList", productService.findAll());
modelMap.addAttribute("type", orderQuery.getMaterialType());
modelMap.addAttribute("pageType",pageType);
// modelMap.addAttribute("adminId",admin.getId());
modelMap.addAttribute("adminId",admin.getId());
Page<MaterialOrder> page = (Page<MaterialOrder>) modelMap.get("page");
Map<Long,String> map = new HashMap<>();
for (MaterialOrder materialOrder : page.getContent()){
@@ -433,14 +433,30 @@ public class MaterialOrderController extends BaseController {
}
/**
* 导入明细表页面中 根据前缀和阶段找以往阶段的料单
* 导入明细表页面中及阶段比较功能 根据前缀和阶段找以往阶段的料单
*/
@RequestMapping(value = "/findPrevStageListDialog")
public String findPrevStageListDialog(ModelMap modelMap, Long adminId, String preTitle, Long stage) {
public String findPrevStageListDialog(ModelMap modelMap, Long adminId, String preTitle, Long stage, Long materialOrderId) {
modelMap.addAttribute("materialOrderId", materialOrderId);
modelMap.addAttribute("materialOrderList", materialOrderService.findPrevStageList(adminId, preTitle, stage));
return "materialOrder/dialog/findPrevStageListDialog";
}
/**
* 对以往阶段的料单进行阶段比较
*/
@RequestMapping(value = "/PrevStageComparisonExcel")
@ResponseBody
public RespData PrevStageComparisonExcel(Long materialOrderId) {
MaterialOrder materialOrder = materialOrderService.find(materialOrderId);
if(materialOrder.getStageNum()==1){
return RespData.error("该料单是第一阶段，无法进行阶段比较");
} else {
materialOrderService.PrevStageComparisonExcel(materialOrderId);
return RespData.success("料单比较成功");
}
}
/**
* 导入明细表