字段修改

liweidong
ShiJiuZhou 1 day ago
parent fe3377858b
commit ca20dc5694
  1. 2
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/AllocationMessVO.java
  2. 3
      blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java
  3. 4
      blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/MesRbPkpqryDTO.java
  4. 18
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml

@ -80,7 +80,7 @@ public class AllocationMessVO implements Serializable {
/**
* 计划部门
*/
private String plandept;
private String plndept;
/**
* 备注
*/

@ -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<List<Map<String, String>>> trialItemList(List<String> nameList);
@GetMapping(CHECK_COMPLETE)

@ -112,8 +112,8 @@ public class MesRbPkpqryDTO {
* 计划部门
*/
@Schema(description = "计划部门")
@TableField("plandept")
private String plandept;
@TableField("plndept")
private String plndept;
/**
* 备注
*/

@ -59,8 +59,8 @@
<if test="dto.barcodeno != null and dto.barcodeno != ''">
AND a.barcodeno = #{dto.barcodeno}
</if>
<if test="dto.plandept != null and dto.plandept != ''">
AND a.plandept = #{dto.plandept}
<if test="dto.plndept != null and dto.plndept != ''">
AND a.plndept = #{dto.plndept}
</if>
<if test="dto.remark != null and dto.remark != ''">
AND a.remark LIKE '%' || #{dto.remark} || '%'
@ -132,8 +132,8 @@
<if test="dto.barcodeno != null and dto.barcodeno != ''">
AND a.barcodeno = #{dto.barcodeno}
</if>
<if test="dto.plandept != null and dto.plandept != ''">
AND a.plandept = #{dto.plandept}
<if test="dto.plndept != null and dto.plndept != ''">
AND a.plndept = #{dto.plndept}
</if>
<if test="dto.remark != null and dto.remark != ''">
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 @@
<if test="dto.barcodeno != null and dto.barcodeno != ''">
AND a.barcodeno = #{dto.barcodeno}
</if>
<if test="dto.plandept != null and dto.plandept != ''">
AND a.plandept = #{dto.plandept}
<if test="dto.plndept != null and dto.plndept != ''">
AND a.plndept = #{dto.plndept}
</if>
<if test="dto.remark != null and dto.remark != ''">
AND a.remark LIKE '%' || #{dto.remark} || '%'
@ -316,8 +316,8 @@
<if test="dto.barcodeno != null and dto.barcodeno != ''">
AND a.barcodeno = #{dto.barcodeno}
</if>
<if test="dto.plandept != null and dto.plandept != ''">
AND a.plandept = #{dto.plandept}
<if test="dto.plndept != null and dto.plndept != ''">
AND a.plndept = #{dto.plndept}
</if>
<if test="dto.remark != null and dto.remark != ''">
AND a.remark LIKE '%' || #{dto.remark} || '%'

Loading…
Cancel
Save