Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

维护删、改

Browse Source
master
yinq 2 years ago
parent aeff6d2181
commit 59665a4338
5 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File

4
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java
Unescape Escape View File

@ -113,7 +113,7 @@ public class EquipmentAssetDetailsController {
* @param equipmentAssetDetails 传递的实体
* @return null 失败 实体成功
*/
@PutMapping
@PostMapping("/PUT")
public R updateById(@RequestBody EquipmentAssetDetails equipmentAssetDetails) {
String user = CommonMethods.getUser();
LocalDateTime now = LocalDateTime.now();
@ -128,7 +128,7 @@ public class EquipmentAssetDetailsController {
* @return 0 失败 1 成功
*/
@ResponseBody
@RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
@GetMapping("/delete/{id}")
public R removeById(@PathVariable("id") String id){
return R.ok(equipmentAssetDetailsService.removeById(id));
}

13
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ImprovementProposalsController.java
Unescape Escape View File

@ -118,7 +118,7 @@ public class ImprovementProposalsController {
* @param improvementProposals 传递的实体
* @return null 失败 实体成功
*/
@PutMapping
@PostMapping("/PUT")
public R updateById(@RequestBody ImprovementProposals improvementProposals) {
LocalDateTime now = LocalDateTime.now();
String user = CommonMethods.getUser();
@ -128,12 +128,6 @@ public class ImprovementProposalsController {
return R.ok(improvementProposalsService.updateById(improvementProposals));
}
@PostMapping("/ImageUpload")
public R ImageUpload(FileItem fileItem, HttpServletRequest request){
//fileUploadedService.showFile(uploadImage)
return null;
}
/**
* 根据id删除对象
@ -142,9 +136,10 @@ public class ImprovementProposalsController {
* @return 0 失败 1 成功
*/
@ResponseBody
@RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
@GetMapping("/delete/{id}")
public R removeById(@PathVariable("id") String id) {
return R.ok(improvementProposalsService.removeById(id));
boolean res = improvementProposalsService.removeById(id);
return R.ok(res);
}
/**

4
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/OutStoreController.java
Unescape Escape View File

@ -112,7 +112,7 @@ public class OutStoreController {
* @param outStore 传递的实体
* @return null 失败 实体成功
*/
@PutMapping
@PostMapping("/PUT")
public R updateById(@RequestBody OutStore outStore) {
return R.ok(outStoreService.updateById(outStore));
}
@ -123,7 +123,7 @@ public class OutStoreController {
* @return 0 失败 1 成功
*/
@ResponseBody
@RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
@GetMapping("/delete/{id}")
public R removeById(@PathVariable("id") String id){
return R.ok(outStoreService.removeById(id));
}

6
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java
Unescape Escape View File

@ -114,7 +114,7 @@ public class TemporaryFixController {
* @param temporaryFix 传递的实体
* @return null 失败 实体成功
*/
@PostMapping("/addOrUpdate")
@PostMapping
public R save(@RequestBody TemporaryFix temporaryFix) {
String handle = StringUtil.createQUID();
String user = CommonMethods.getUser();
@ -133,7 +133,7 @@ public class TemporaryFixController {
}
@PutMapping("/addOrUpdate")
@PostMapping("/PUT")
public R updateById(@RequestBody TemporaryFix temporaryFix) {
LocalDateTime now = LocalDateTime.now();
String user = CommonMethods.getUser();
@ -188,7 +188,7 @@ public class TemporaryFixController {
* @return 0 失败 1 成功
*/
@ResponseBody
@RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
@GetMapping("/delete/{id}")
public R removeById(@PathVariable("id") String id){
return R.ok(temporaryFixService.removeById(id));
}

8
anomaly/src/main/resources/mapper/ReportMapper.xml
Unescape Escape View File

@ -1726,11 +1726,11 @@
RT.DESCRIPTION RESOURCE_TYPE_DESCRIPTION,
SUM(zsd.DISPATCH_QTY) SUM_QTY,
SUM(CASE
WHEN zsd.DISPATCH_STATUS = 'COMPLETE' OR zsd.DISPATCH_STATUS = 'CANCEL' AND zsd.PLANNED_COMP_DATE > zsd.ACTUAL_COMPLETE_DATE THEN zsd.DISPATCH_QTY
WHEN (zsd.DISPATCH_STATUS = 'COMPLETE' AND to_char(zsd.PLANNED_COMP_DATE,'yyyy-mm-dd')>= to_char(zsd.ACTUAL_COMPLETE_DATE,'yyyy-mm-dd')) OR zsd.DISPATCH_STATUS = 'CANCEL' THEN zsd.DISPATCH_QTY
ELSE 0 END) SUM_DONE_QTY,
SUM(zsd.PROD_HOURS * zsd.DISPATCH_QTY) SUM_HOURS,
SUM(CASE
WHEN zsd.DISPATCH_STATUS = 'COMPLETE' OR zsd.DISPATCH_STATUS = 'CANCEL' AND zsd.PLANNED_COMP_DATE > zsd.ACTUAL_COMPLETE_DATE THEN zsd.PROD_HOURS * zsd.DISPATCH_QTY
WHEN (zsd.DISPATCH_STATUS = 'COMPLETE' AND to_char(zsd.PLANNED_COMP_DATE,'yyyy-mm-dd')>= to_char(zsd.ACTUAL_COMPLETE_DATE,'yyyy-mm-dd')) OR zsd.DISPATCH_STATUS = 'CANCEL' THEN zsd.PROD_HOURS * zsd.DISPATCH_QTY
ELSE 0 END) SUM_DONE_HOURS
FROM Z_SFC_DISPATCH zsd
LEFT JOIN WORK_CENTER wc ON zsd.WORK_CENTER = wc.WORK_CENTER
@ -1778,11 +1778,11 @@
RT.DESCRIPTION RESOURCE_TYPE_DESCRIPTION,
SUM(zsd.DISPATCH_QTY) SUM_QTY,
SUM(CASE
WHEN zsd.DISPATCH_STATUS = 'COMPLETE' OR zsd.DISPATCH_STATUS = 'CANCEL' AND zsd.PLANNED_COMP_DATE > zsd.ACTUAL_COMPLETE_DATE THEN zsd.DISPATCH_QTY
WHEN (zsd.DISPATCH_STATUS = 'COMPLETE' AND to_char(zsd.PLANNED_COMP_DATE,'yyyy-mm-dd')>= to_char(zsd.ACTUAL_COMPLETE_DATE,'yyyy-mm-dd')) OR zsd.DISPATCH_STATUS = 'CANCEL' THEN zsd.DISPATCH_QTY
ELSE 0 END) SUM_DONE_QTY,
SUM(zsd.PROD_HOURS * zsd.DISPATCH_QTY) SUM_HOURS,
SUM(CASE
WHEN zsd.DISPATCH_STATUS = 'COMPLETE' OR zsd.DISPATCH_STATUS = 'CANCEL' AND zsd.PLANNED_COMP_DATE > zsd.ACTUAL_COMPLETE_DATE THEN zsd.PROD_HOURS * zsd.DISPATCH_QTY
WHEN (zsd.DISPATCH_STATUS = 'COMPLETE' AND to_char(zsd.PLANNED_COMP_DATE,'yyyy-mm-dd')>= to_char(zsd.ACTUAL_COMPLETE_DATE,'yyyy-mm-dd')) OR zsd.DISPATCH_STATUS = 'CANCEL' THEN zsd.PROD_HOURS * zsd.DISPATCH_QTY
ELSE 0 END) SUM_DONE_HOURS
FROM Z_SFC_DISPATCH zsd
LEFT JOIN WORK_CENTER wc ON zsd.WORK_CENTER = wc.WORK_CENTER

Write Preview
Loading…
Cancel
Save