xzzn/SIPAIIS_WMS_JSSW
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TGLW bug fix

Browse Source
This commit is contained in:
Timer
2026-02-02 23:29:47 +08:00
parent 9ec5552307
commit b4932d17c4
17 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sipai/controller/activiti/OEProcessController.java
View File

@ -138,10 +138,10 @@ public class OEProcessController {
String password=request.getParameter("password");
if(null==username || "".equals(username)){
return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
return "redirect:http://192.168.2.10:5001/TGLW/";
}
if(null==password || "".equals(password)){
return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
return "redirect:http://192.168.2.10:5001/TGLW/";
}
List<User> userList=userService.selectListByWhere(" where name='"+username+"' and password='"+password+"'");
@ -160,7 +160,7 @@ public class OEProcessController {
//return "/activiti/taskList";
return "/activiti/oeProcessTaskList";
}else{
return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
return "redirect:http://192.168.2.10:5001/TGLW/";
}

6
src/main/java/com/sipai/controller/equipment/EquipmentCardController.java
View File

@ -4666,10 +4666,10 @@ public class EquipmentCardController {
String password = request.getParameter("password");
if (null == username || "".equals(username)) {
return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
return "redirect:http://192.168.2.10:5001/TGLW/";
}
if (null == password || "".equals(password)) {
return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
return "redirect:http://192.168.2.10:5001/TGLW/";
}
List<User> userList = userService.selectListByWhere(" where name='" + username + "' and password='" + password + "'");
@ -4689,7 +4689,7 @@ public class EquipmentCardController {
//return "/activiti/taskList";
return "/equipment/pumpAnalysis";
} else {
return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
return "redirect:http://192.168.2.10:5001/TGLW/";
}

21
src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java
View File

@ -103,12 +103,12 @@ public class EquipmentPlanController {
@ApiOperation(value = "获取设备计划list数据", notes = "获取设备计划list数据", httpMethod = "GET")
@ApiResponses({@ApiResponse(code = 400, message = "请求参数没填好")})
@ApiImplicitParams({
@ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = true),
@ApiImplicitParam(name = "rows", value = "每页显示数", dataType = "Integer", paramType = "query", required = true),
@ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = false),
@ApiImplicitParam(name = "rows", value = "每页显示数", dataType = "Integer", paramType = "query", required = false),
@ApiImplicitParam(name = "sort", value = "排序字段", dataType = "String", paramType = "query", required = false),
@ApiImplicitParam(name = "order", value = "排序类型", dataType = "String", paramType = "query", required = false),
@ApiImplicitParam(name = "companyId", value = "厂id", dataType = "String", paramType = "query", required = true),
@ApiImplicitParam(name = "status_val", value = "状态筛选 （全部：空、未开始：noStart、开始流程：start、完成：finish、已下发：issued）", dataType = "String", paramType = "query", required = true),
@ApiImplicitParam(name = "companyId", value = "厂id", dataType = "String", paramType = "query", required = false),
@ApiImplicitParam(name = "status_val", value = "状态筛选 （全部：空、未开始：noStart、开始流程：start、完成：finish、已下发：issued）", dataType = "String", paramType = "query", required = false),
@ApiImplicitParam(name = "type", value = "维修：wx 保养：by 大修：dx", dataType = "String", paramType = "query", required = true),
@ApiImplicitParam(name = "search_name", value = "计划内容", dataType = "String", paramType = "query", required = false),
@ApiImplicitParam(name = "date", value = "筛选日期 2023-02-17+17%3A00+~+2023-02-20+17%3A00", dataType = "String", paramType = "query", required = false)
@ -116,8 +116,8 @@ public class EquipmentPlanController {
})
@RequestMapping("/getList.do")
public ModelAndView getList(HttpServletRequest request, Model model,
@RequestParam(value = "page") Integer page,
@RequestParam(value = "rows") Integer rows,
@RequestParam(value = "page",required = false) Integer page,
@RequestParam(value = "rows",required = false) Integer rows,
@RequestParam(value = "sort", required = false) String sort,
@RequestParam(value = "order", required = false) String order) {
User cu = (User) request.getSession().getAttribute("cu");
@ -173,6 +173,8 @@ public class EquipmentPlanController {
if (StringUtils.isNotBlank(status_equ)) {
wherestr += " and (tee.equipmentCardID like '%" + status_equ + "%' or tee.equipmentName like '%" + status_equ + "%') ";
}
page = page == null ? 1 : page;
rows = rows == null ? 10 : rows;
PageHelper.startPage(page, rows);
// System.out.println(wherestr);
List<EquipmentPlan> list = this.equipmentPlanService.selectListByWhereWithEquEqu(wherestr);
@ -337,7 +339,7 @@ public class EquipmentPlanController {
JSONArray json = new JSONArray();
if(equipmentPlan.getGroupDetailId()!=null){
if (equipmentPlan.getGroupDetailId() != null) {
String[] did = equipmentPlan.getGroupDetailId().split(",");
for (String sid : did) {
JSONObject jsonObject = new JSONObject();
@ -350,7 +352,6 @@ public class EquipmentPlanController {
}
return "maintenance/equipmentPlanEdit";
}
@ -589,11 +590,11 @@ public class EquipmentPlanController {
})
@RequestMapping("/doHandPlan.do")
public String doHandPlan(HttpServletRequest request, Model model) {
try{
try {
NewMonthWork newMonthWork = new NewMonthWork();
newMonthWork.addNewMonthWork(null);
model.addAttribute("result", "suc");
}catch (Exception e){
} catch (Exception e) {
model.addAttribute("result", "fail");
}
return "result";

4
src/main/java/com/sipai/controller/robot/RobotController.java
View File

@ -222,9 +222,9 @@ public class RobotController {
pageNum = 0;
}
String token = "";
// String url = "http://127.0.0.1:8099/SIPAIIS_WMS/robot/test.do";
// String url = "http://127.0.0.1:8099/TGLW/robot/test.do";
String url = "http://10.194.10.169:9206/nsapi/cxlsbg";
// String tokenURL = "http://127.0.0.1:8099/SIPAIIS_WMS/third/test";
// String tokenURL = "http://127.0.0.1:8099/TGLW/third/test";
String tokenURL = "http://10.194.10.169:9206/nsapi/getoken?objkey=sipai";
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Authorization", "sipai");

2
src/main/java/com/sipai/entity/scada/MPointHistory.java
View File

@ -30,7 +30,7 @@ public class MPointHistory extends SQLAdapter implements Serializable {
private String tbName;
//为报表展示使用 SIPAIIS_WMS
//为报表展示使用 TGLW
private String year;
private String month;
private String day;