diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceFreight.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceFreight.java index b713a1e03..c380b8e8f 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceFreight.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceFreight.java @@ -81,9 +81,9 @@ public class SysWorkplaceFreight implements Serializable { /** * 行数 */ - @TableField(value = "row") + @TableField(value = "freightRow") @ApiModelProperty(value = "") - private Integer row; + private Integer freightRow; diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java index e4cef0ac0..81ee9274e 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java @@ -61,7 +61,7 @@ public class SysWorkplaceFreightResponse { * 受否单产品槽位 */ private Integer isSingQueue; - private Integer row; + private Integer freightRow; diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightViewResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightViewResponse.java index 07add3770..d850f4d10 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightViewResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightViewResponse.java @@ -60,7 +60,7 @@ public class SysWorkplaceFreightViewResponse { * 受否单产品槽位 */ private Integer isSingQueue; - private Integer row; + private Integer freightRow; private List sysWorkplaceFreightList; diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java index 13a0134e1..214cee119 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java @@ -101,12 +101,12 @@ public class SysWorkplaceFreightService extends ServiceImpl> collect = list.stream().collect(Collectors.groupingBy(SysWorkplaceFreightResponse::getRow)); + Map> collect = list.stream().collect(Collectors.groupingBy(SysWorkplaceFreightResponse::getFreightRow)); - collect.forEach((row, responseList) -> { + collect.forEach((freightRow, responseList) -> { SysWorkplaceFreightViewResponse sysWorkplaceFreightViewResponse = new SysWorkplaceFreightViewResponse(); sysWorkplaceFreightViewResponse.setSysWorkplaceFreightList(responseList); - sysWorkplaceFreightViewResponse.setRow(row); + sysWorkplaceFreightViewResponse.setFreightRow(freightRow); respList.add(sysWorkplaceFreightViewResponse); }); } @@ -114,7 +114,7 @@ public class SysWorkplaceFreightService extends ServiceImpl