diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java index b7a0024d..5a86fe88 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java @@ -38,7 +38,6 @@ public class SelectParaAllController extends BaseController { { return prefix + "/ParaAllShow"; } - @RequiresPermissions("nanjing:ParaAllShow:list") @PostMapping("/paraAllShow") @ResponseBody public TableDataInfo list(HttpServletRequest request) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProductChangeInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProductChangeInfoController.java index f53e3551..7fa1345e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProductChangeInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProductChangeInfoController.java @@ -56,7 +56,7 @@ public class SelectProductChangeInfoController extends BaseController /** * 查询机种切换管理列表 */ - @RequiresPermissions("nanjing:SelectProductChangeInfo:list") + @RequiresPermissions("nanjing:SelectProductChangeInfo:view") @PostMapping("/list") @ResponseBody public TableDataInfo list(TRpProductchangeinfo tRpProductchangeinfo) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java index ed49898c..617d2d19 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java @@ -41,7 +41,7 @@ public class StationParaInfoController extends BaseController { return prefix + "/StationParaInfo"; } - @RequiresPermissions("nanjing:StationPara:list") + @RequiresPermissions("nanjing:StationPara:view") @PostMapping("/list") @ResponseBody public TableDataInfo list(HttpServletRequest request) { @@ -60,7 +60,7 @@ public class StationParaInfoController extends BaseController { s = tracestateService.selectSemi(productBarcode); if (s==null && productBarcode.length()!=0){ System.out.println(productBarcode.length()); - System.out.println("nulllllllllllllllllllllllllllllllllllllllllllllll"); +// System.out.println("nulllllllllllllllllllllllllllllllllllllllllllllll"); map.put("SemiBarcode", "qqqqqqqqqqqqqqqqqqqqqqqqqqqq"); } else { @@ -78,27 +78,31 @@ public class StationParaInfoController extends BaseController { map.put("StateID", ""); // s200 210 230 240直接查产品码 5 6 8 9 11 12 // s300 320 - if (stationCode.equals("5")||stationCode.equals("6")||stationCode.equals("8") - ||stationCode.equals("9")||stationCode.equals("11")||stationCode.equals("12") + if (stationCode.equals("2") || stationCode.equals("3") ||stationCode.equals("4") || stationCode.equals("8") ||stationCode.equals("9") + ||stationCode.equals("11")||stationCode.equals("12")||stationCode.equals("13")||stationCode.equals("14")||stationCode.equals("15")||stationCode.equals("16")||stationCode.equals("17")||stationCode.equals("18")||stationCode.equals("19")||stationCode.equals("20") ){ - map.put("ScanBarcode",productBarcode); List> list = tracestateService.selectStationPara2(map); return getDataTable(list); } - else{ + else { + if (stationCode.equals("5") || stationCode.equals("6") || stationCode.equals("7")) { + String semiBarcode = tracestateService.selectsemiBarcode(productBarcode); + map.put("SemiBarcode", semiBarcode); + } - List> list = tracestateService.selectStationPara(map); - for (int i = 0; i < list.size(); i++) { - if (list.get(i).containsKey("系统主条码")) { - continue; - } else { - list.get(i).put("系统主条码", "-"); + List> list = tracestateService.selectStationPara(map); + for (int i = 0; i < list.size(); i++) { + if (list.get(i).containsKey("系统主条码")) { + continue; + } else { + list.get(i).put("系统主条码", "-"); + } } + + return getDataTable(list); } - return getDataTable(list); - } } // @RequiresPermissions("nanjing:StationPara:export") diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 0efa4ecd..c124114e 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -5,14 +5,14 @@ spring: driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver druid: # 主库数据源 -# master: -# url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=JYD_shengjie -# username: sa -# password: haiwei@123 master: - url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=JYD_shengjie + url: jdbc:sqlserver://192.168.0.254:1433;SelectMethod=cursor;DatabaseName=ATJ_HS_DB username: sa password: 123456 +# master: +# url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=ATJ_HS_DB +# username: sa +# password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 66d96668..9290a052 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -17,7 +17,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为80 - port: 9080 + port: 9099 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 7696fad3..f1860d82 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -189,9 +189,9 @@ - - 保养详情 - + + +