|
@@ -48,16 +48,16 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
|
|
|
|
|
|
@Autowired
|
|
|
private ITRmWorkprocProductService tRmWorkprocProductService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private TRmWorkprocProductMapper tRmWorkprocProductMapper;
|
|
|
|
|
|
@Autowired
|
|
|
private TRmWorkprocProductValueMapper tRmWorkprocProductValueMapper;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
IFormulaService formulaService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
IIfMesEmsSwapfileService ifMesEmsSwapfileService;
|
|
|
//@Autowired
|
|
@@ -71,7 +71,6 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
|
|
|
//@RequiresPermissions("trmworkprocproductvalue:view")
|
|
|
@GetMapping(value = "/")
|
|
|
public RESTfulResult list(@RequestParam HashMap<String, Object> parmas,Integer pageNum, Integer pageSize){
|
|
|
- tRmWorkprocProductValueService.setDate(new Date());
|
|
|
// ifMesEmsSwapfileService.getLgDateProd();
|
|
|
if(parmas.containsKey("productid") && parmas.get("productid") != null && !"".equals(parmas.get("productid").toString())){
|
|
|
String productid = parmas.get("productid").toString();
|
|
@@ -82,7 +81,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
|
|
|
parmas.put("productid", productid);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if(parmas.containsKey("workprocid") && parmas.get("workprocid") != null && !"".equals(parmas.get("workprocid").toString())){
|
|
|
String workprocid = parmas.get("workprocid").toString();
|
|
|
if(workprocid.indexOf(",") == -1){
|
|
@@ -107,7 +106,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
|
|
|
PageList<TRmWorkprocProductValue> list = tRmWorkprocProductValueService.queryLikeForPage(parmas, pageNum, pageSize);
|
|
|
return success(list);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@ApiOperation(value="创建", notes="根据TRmWorkprocProductValue对象创建")
|
|
|
@ApiImplicitParam(name = "tRmWorkprocProductValue", value = "详细实体tRmWorkprocProductValue", required = true, dataType = "TRmWorkprocProductValue")
|
|
|
@PostMapping(value = "/")
|
|
@@ -346,7 +345,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
|
|
|
parmas.put("productid", productid);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if(parmas.containsKey("workprocid") && parmas.get("workprocid") != null && !"".equals(parmas.get("workprocid").toString())){
|
|
|
String workprocid = parmas.get("workprocid").toString();
|
|
|
if(workprocid.indexOf(",") == -1){
|
|
@@ -356,7 +355,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
|
|
|
parmas.put("workprocid", workprocid);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
PageList<Map<String, Object>> workprocProductValueForPage = tRmWorkprocProductValueService.getWorkprocProductValueForPage(parmas, pageNum, pageSize);
|
|
|
return success(workprocProductValueForPage);
|
|
|
}
|
|
@@ -380,7 +379,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
|
|
|
tRmWorkprocProductValueService.setDate(new Date());
|
|
|
return success();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@GetMapping("/createMRData")
|
|
|
public RESTfulResult createMRData(@RequestParam HashMap<String,Object> parmas) {
|
|
|
if (parmas == null) {
|
|
@@ -401,7 +400,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
|
|
|
tRmWorkprocProductValueService.createRData(timegranid,clock,itmegranidSource);
|
|
|
return success();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@GetMapping("/restatAllRData1")
|
|
|
public RESTfulResult getDate(@RequestParam HashMap<String,Object> parmas){
|
|
|
if (parmas == null) {
|
|
@@ -418,7 +417,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
|
|
|
tRmWorkprocProductValueService.restatAllRData1(clock, timegranid);
|
|
|
return success();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@ApiOperation(value="重新计算或生成项目数据-(月、年)")
|
|
|
@GetMapping(value = "/restatWpv")
|
|
|
public RESTfulResult restatWpv(@RequestParam HashMap<String, Object> parmas, String clock, String clocke, String timegranid){
|
|
@@ -445,7 +444,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
|
|
|
}
|
|
|
return success();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@ApiOperation(value="批量重新计算", notes="")
|
|
|
@ApiImplicitParam(name = "TRmWorkprocProductValue", value = "详细实体TRmWorkprocProductValue", required = true, dataType = "TRmWorkprocProductValue")
|
|
|
@PutMapping(value = "/batchCompute", produces = "application/json;charset=UTF-8")
|