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

Merge branch 'deng' of http://101.43.41.9:13000/xzzn/SIPAIIS_WMS_JSSW into deng

Browse Source
This commit is contained in:
Rue Ji
2026-02-02 23:52:52 +08:00
parent 5133e4f983 8d3cca18d9
commit 79a8fc11cf
18 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;

2
src/main/resources/log4j.properties
View File

@ -15,7 +15,7 @@ log4j.appender.Console.layout.ConversionPattern=[%c] - %m%n
#\u6587\u4EF6\u5927\u5C0F\u5230\u8FBE\u6307\u5B9A\u5C3A\u5BF8\u7684\u65F6\u5019\u4EA7\u751F\u4E00\u4E2A\u65B0\u7684\u6587\u4EF6
log4j.appender.File = org.apache.log4j.RollingFileAppender
#\u6307\u5B9A\u8F93\u51FA\u76EE\u5F55
log4j.appender.File.File = logs/SIPAIIS_WMS.log
log4j.appender.File.File = logs/TGLW.log
#\u5B9A\u4E49\u6587\u4EF6\u6700\u5927\u5927\u5C0F
log4j.appender.File.MaxFileSize = 10MB
# \u8F93\u51FA\u6240\u4EE5\u65E5\u5FD7\uFF0C\u5982\u679C\u6362\u6210DEBUG\u8868\u793A\u8F93\u51FADEBUG\u4EE5\u4E0A\u7EA7\u522B\u65E5\u5FD7

8
src/main/resources/redis.properties
View File

@ -1,10 +1,10 @@
#redis<69><73><EFBFBD><EFBFBD>
redis.host=122.51.194.184
#redis.host=127.0.0.1
#redis.host=122.51.194.184
redis.host=127.0.0.1
#<23><><EFBFBD><EFBFBD>single <20><>Ⱥcluster
redis.mode=single
redis.port=26739
#redis.port=6379
#redis.port=26739
redis.port=6379
redis.password=Aa112211
redis.maxIdle=100
redis.maxActive=300

2
src/main/resources/url.properties
View File

@ -1 +1 @@
url=http\://127.0.0.1\:8080/SIPAIIS_WMS/oeProcess/taskList.do?ng\=''
url=http\://127.0.0.1\:8080/TGLW/oeProcess/taskList.do?ng\=''

2
src/main/webapp/jsp/maintenance/libraryFaultBiz4Tree.jsp
View File

@ -101,7 +101,7 @@
$.post(ext.contextPath + '/maintenance/libraryFaultBloc/doInit.do', {unitId: unitId}, function (data) {
if (data.code == '1') {
showAlert('s', data.msg, 'mainAlertdiv');
// refreshPage('/SIPAIIS_WMS/maintenance/libraryFaultBloc/showList4TreeBiz.do')
// refreshPage('/TGLW/maintenance/libraryFaultBloc/showList4TreeBiz.do')
location.reload();
} else {
showAlert('d', data.msg, 'mainAlertdiv');

2
src/main/webapp/jsp/register.jsp
View File

@ -39,7 +39,7 @@
//微信授权注册
var companyid=$('#pid').val();
//console.info(companyid);
$("#btn_wechat").attr('href','http://wx.sipaiis.com/wxAuth/wxLogin?systemFlag=SIPAIIS_WMS'+'&companyid='+companyid);
$("#btn_wechat").attr('href','http://wx.sipaiis.com/wxAuth/wxLogin?systemFlag=TGLW'+'&companyid='+companyid);
//输入框验证
$("#subForm").bootstrapValidator({

26
src/main/webapp/jsp/robot.jsp
View File

@ -106,8 +106,8 @@
// function getJobList(){
// $.ajax({
// type: 'get',
// url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
// // url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
// url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
// // url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
// dataType: JSON,
// async: true,
// success: function(data) {
@ -191,8 +191,8 @@
$.ajax({
type: 'get',
// url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/taskStart.do?type=1&taskId=" + taskId,
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskStart.do?type=1&taskId=" + taskId,
// url: "http://10.197.50.126:8081/TGLW/robot/taskStart.do?type=1&taskId=" + taskId,
url: "http://10.194.10.125:8088/TGLW/robot/taskStart.do?type=1&taskId=" + taskId,
dataType: JSON,
async: true,
success: function (data) {
@ -253,14 +253,14 @@
function getJobList2() {
// $.post("http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $.post("http://10.194.10.125:8088/TGLW/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $('#mptableTop').css('display', 'block');
// $('#singleBizDivTop').css('display', 'none');
$('#table9').bootstrapTable('destroy');
$("#table9").bootstrapTable({ // 对应table标签的id
// url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
// url: "http://10.197.50.126:8081/TGLW/robot/getJobList.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false
@ -389,14 +389,14 @@
function getJobListTYPE_2() {
// $.post("http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $.post("http://10.194.10.125:8088/TGLW/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $('#mptableTop').css('display', 'block');
// $('#singleBizDivTop').css('display', 'none');
$('#table11').bootstrapTable('destroy');
$("#table11").bootstrapTable({ // 对应table标签的id
// url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/getJobListTYPE_2.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobListTYPE_2.do", // 获取表格数据的url
// url: "http://10.197.50.126:8081/TGLW/robot/getJobListTYPE_2.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/TGLW/robot/getJobListTYPE_2.do", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false
@ -484,7 +484,7 @@
// function getJobList() {
// $("#table").bootstrapTable({ // 对应table标签的id
// url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
// url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do", // 获取表格数据的url
// contentType: null,
// cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
// striped: true, //表格显示条纹，默认为false
@ -648,8 +648,8 @@
openModal("robotsubModal")
$('#table10').bootstrapTable('destroy');
$("#table10").bootstrapTable({ // 对应table标签的id
// url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/taskResult.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskResult.do", // 获取表格数据的url
// url: "http://10.197.50.126:8081/TGLW/robot/taskResult.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/TGLW/robot/taskResult.do", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false

14
src/main/webapp/jsp/robot2.jsp
View File

@ -105,8 +105,8 @@
// function getJobList(){
// $.ajax({
// type: 'get',
// url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
// // url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
// url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
// // url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
// dataType: JSON,
// async: true,
// success: function(data) {
@ -251,13 +251,13 @@
function getJobList2() {
// $.post("http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $.post("http://10.194.10.125:8088/TGLW/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $('#mptableTop').css('display', 'block');
// $('#singleBizDivTop').css('display', 'none');
$('#table9').bootstrapTable('destroy');
$("#table9").bootstrapTable({ // 对应table标签的id
url: "http://10.194.10.125:8088/SIPAIIS_WMS/ro2/getList", // 获取表格数据的url
url: "http://10.194.10.125:8088/TGLW/ro2/getList", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false
@ -368,7 +368,7 @@
// function getJobList() {
// $("#table").bootstrapTable({ // 对应table标签的id
// url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
// url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do", // 获取表格数据的url
// contentType: null,
// cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
// striped: true, //表格显示条纹，默认为false
@ -533,7 +533,7 @@
/* $.ajax({
type: 'get',
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskResult.do?jobId=" + jobId,
url: "http://10.194.10.125:8088/TGLW/robot/taskResult.do?jobId=" + jobId,
dataType: JSON,
async: true,
success: function (data) {
@ -651,7 +651,7 @@
$('#table10').bootstrapTable('destroy');
$("#table10").bootstrapTable({ // 对应table标签的id
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskResult.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/TGLW/robot/taskResult.do", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false

2
src/main/webapp/jsp/top.jsp
View File

@ -779,7 +779,7 @@
width: 150,
height: 150,
//text: "http://www.baidu.com"
text: "http://127.0.0.1:8080/SIPAIIS_WMS/app/downLoadAPP.do?&path=D:\\Tomcat 7.0\\webapps\\SIPAIIS_WMS_APK&ng=''"
text: "http://127.0.0.1:8080/TGLW/app/downLoadAPP.do?&path=D:\\Tomcat 7.0\\webapps\\SIPAIIS_WMS_APK&ng=''"
}); */
}

2
src/main/webapp/jsp/visual/material.jsp
View File

@ -1522,7 +1522,7 @@
<div style="margin-left: 36%;">
<%--<div class="div8_out">
<div id="chart_div_16" style="width:100%; height: 100%;"></div>
</div>D:\workspace\SIPAIIS_WMS\WebRoot\IMG\model\battery.png
</div>D:\workspace\TGLW\WebRoot\IMG\model\battery.png
<div class="div8_out">
<div id="chart_div_17" style="width:100%; height: 100%;"></div>
</div>--%>

2
src/main/webapp/jsp/work/materialDeployOverview.jsp
View File

@ -265,7 +265,7 @@
window.onresize = function(){
var biz_id = '?biz_id='+unitId;
console.log("+biz_id"+biz_id);
refreshPage('/SIPAIIS_WMS/work/mpoint/showlistOverview.do'+biz_id);
refreshPage('/TGLW/work/mpoint/showlistOverview.do'+biz_id);
}
//物资

2
src/main/webapp/jsp/work/materverview.jsp
View File

@ -23,7 +23,7 @@
$(function(){
var biz_id = '?biz_id='+unitId;
console.log("+biz_id"+biz_id);
refreshPage('/SIPAIIS_WMS/work/mpoint/showlistOverview.do'+biz_id);
refreshPage('/TGLW/work/mpoint/showlistOverview.do'+biz_id);
});
</script>