Accueil Explorer Aide
S'inscrire Connexion
zgzt
/
el-java
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

设备备件查询字段调整

qiangxuan il y a 3 semaines
Parent
b575a1368e
commit
a18a48ea1d
8 fichiers modifiés avec 2118 ajouts et 1 suppressions
Vue séparée Afficher les stats Diff
  1. 66 0
      logs/error-log.html
  2. 49 0
      logs/jeecg-gateway-2025-05-15.0.log
  3. 890 0
      logs/jeecg-lesm-2025-05-15.0.html
  4. 101 0
      logs/jeecg-lesm-2025-05-15.0.log
  5. 899 0
      logs/jeecg-system-2025-05-15.0.html
  6. 100 0
      logs/jeecg-system-2025-05-15.0.log
  7. 1 1
      zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/controller/DeviceMaterialRelationController.java
  8. 12 0
      zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/entity/DeviceMaterialRelation.java

+ 66 - 0
logs/error-log.html
Voir le fichier 

@@ -92768,3 +92768,69 @@ TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
 <td class="FileOfCaller">CommonController.java</td>
 
 <td class="LineOfCaller">331</td>
 
 </tr>
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Thu May 15 10:04:18 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+  <head>
 
+    <title>Logback Log Messages</title>
 
+<style  type="text/css">
 
+table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
 
+TR.even { background: #FFFFFF; }
 
+TR.odd { background: #EAEAEA; }
 
+TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
 
+TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
 
+TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
 
+TD.Thread { text-align: left; }
 
+TD.Level { text-align: right; }
 
+TD.Logger { text-align: left; }
 
+TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
 
+TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
 
+</style>
 
+
 
+  </head>
 
+<body>
 
+<hr/>
 
+<p>Log session start time Thu May 15 10:04:52 CST 2025</p><p></p>
 
+
 
+<table cellspacing="0">
 
+<tr class="header">
 
+<td class="Level">Level</td>
 
+<td class="Date">Date</td>
 
+<td class="Message">Message</td>
 
+<td class="MethodOfCaller">MethodOfCaller</td>
 
+<td class="FileOfCaller">FileOfCaller</td>
 
+<td class="LineOfCaller">LineOfCaller</td>
 
+</tr>
 
+

Fichier diff supprimé car celui-ci est trop grand
+ 49 - 0
logs/jeecg-gateway-2025-05-15.0.log


Fichier diff supprimé car celui-ci est trop grand
+ 890 - 0
logs/jeecg-lesm-2025-05-15.0.html


Fichier diff supprimé car celui-ci est trop grand
+ 101 - 0
logs/jeecg-lesm-2025-05-15.0.log


Fichier diff supprimé car celui-ci est trop grand
+ 899 - 0
logs/jeecg-system-2025-05-15.0.html


Fichier diff supprimé car celui-ci est trop grand
+ 100 - 0
logs/jeecg-system-2025-05-15.0.log


+ 1 - 1
zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/controller/DeviceMaterialRelationController.java
Voir le fichier 

@@ -185,7 +185,7 @@ public class DeviceMaterialRelationController extends JeecgController<DeviceMate
 
 	 @GetMapping(value = "/queryDeviceMaterialRelationAllInfo")
 
 	 public Result<List<DeviceMaterialRelation>> queryDeviceMaterialRelationAllInfo(@RequestParam(name="deviceNumber", required=true) String deviceNumber) {
 
 		 LambdaQueryWrapper<DeviceMaterialRelation> queryWrapper = new LambdaQueryWrapper<>();
 
-//		 queryWrapper.eq(DeviceMaterialRelation::getDeviceNumber, deviceNumber);
 
+		 queryWrapper.eq(DeviceMaterialRelation::getDeviceNumber, deviceNumber);
 
 		 queryWrapper.orderByDesc(DeviceMaterialRelation::getCreateTime);
 
 		 List<DeviceMaterialRelation> deviceMaterialRelationList = deviceMaterialRelationService.list(queryWrapper);
 
 		 if(oConvertUtils.listIsEmpty(deviceMaterialRelationList)) {

+ 12 - 0
zgzt-sbsmzq/jeecg-module-lifecycle/src/main/java/org/jeecg/modules/deviceManage/entity/DeviceMaterialRelation.java
Voir le fichier 

@@ -61,6 +61,18 @@ public class DeviceMaterialRelation implements Serializable {
 
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 
     @ApiModelProperty(value = "日期")
 
     private Date createDate;
 
+    /**设备编号*/
 
+    @Excel(name = "设备编号", width = 15)
 
+    @ApiModelProperty(value = "设备编号")
 
+    private String deviceNumber;
 
+    /**类别*/
 
+    @Excel(name = "类别名称", width = 15)
 
+    @ApiModelProperty(value = "类别名称")
 
+    private String categoryName;
 
+    /**规格型号*/
 
+    @Excel(name = "规格型号", width = 15)
 
+    @ApiModelProperty(value = "规格型号")
 
+    private String specificationModel;
 
     /**物料规格型号*/
 
     @Excel(name = "物料规格型号", width = 15)
 
     @ApiModelProperty(value = "物料规格型号")

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff