diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/AllocationMessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/AllocationMessVO.java index b5e26fed..4a621e92 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/AllocationMessVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/AllocationMessVO.java @@ -80,7 +80,7 @@ public class AllocationMessVO implements Serializable { /** * 计划部门 */ - private String plandept; + private String plndept; /** * 备注 */ diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java index 0edf8a0a..526a3d64 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java @@ -8,6 +8,7 @@ import org.springblade.desk.produce.pojo.dto.MesRbRedoRoutDTO; import org.springblade.erpdata.pojo.vo.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import java.util.Date; @@ -181,7 +182,7 @@ public interface IErpDataProduceClient { * @param nameList 试验计划名称 * @return 结果 */ - @GetMapping(TRAIL_ITEM_LIST) + @PostMapping(TRAIL_ITEM_LIST) R>> trialItemList(List nameList); @GetMapping(CHECK_COMPLETE) diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/MesRbPkpqryDTO.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/MesRbPkpqryDTO.java index a5df8921..7d14b5f7 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/MesRbPkpqryDTO.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/MesRbPkpqryDTO.java @@ -112,8 +112,8 @@ public class MesRbPkpqryDTO { * 计划部门 */ @Schema(description = "计划部门") - @TableField("plandept") - private String plandept; + @TableField("plndept") + private String plndept; /** * 备注 */ diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml index 4f5ae815..68d67bd3 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml @@ -59,8 +59,8 @@ AND a.barcodeno = #{dto.barcodeno} - - AND a.plandept = #{dto.plandept} + + AND a.plndept = #{dto.plndept} AND a.remark LIKE '%' || #{dto.remark} || '%' @@ -132,8 +132,8 @@ AND a.barcodeno = #{dto.barcodeno} - - AND a.plandept = #{dto.plandept} + + AND a.plndept = #{dto.plndept} AND a.remark LIKE '%' || #{dto.remark} || '%' @@ -164,7 +164,7 @@ d.subpkdate, d.warctlr, d.barcodeno, - d.plandept, + d.plndept, d.remark, d.prtclass FROM ( @@ -225,8 +225,8 @@ AND a.barcodeno = #{dto.barcodeno} - - AND a.plandept = #{dto.plandept} + + AND a.plndept = #{dto.plndept} AND a.remark LIKE '%' || #{dto.remark} || '%' @@ -316,8 +316,8 @@ AND a.barcodeno = #{dto.barcodeno} - - AND a.plandept = #{dto.plandept} + + AND a.plndept = #{dto.plndept} AND a.remark LIKE '%' || #{dto.remark} || '%'