排产相关-sjx

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java

@@ -26,6 +26,8 @@
 package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -53,6 +55,7 @@ public class PersonAbilityEntity extends BaseEntity {
 	 * 作业中心Id
 	 */
 	@Schema(description = "作业中心Id")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long workCenterId;
 
 	/**
@@ -65,6 +68,7 @@ public class PersonAbilityEntity extends BaseEntity {
 	 * 工序编码
 	 */
 	@Schema(description = "工序编码")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long processId;
 
 	/**
@@ -77,6 +81,7 @@ public class PersonAbilityEntity extends BaseEntity {
 	 * 工艺能力Id
 	 */
 	@Schema(description = "工艺能力Id")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long craftId;
 
 	/**

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml

@@ -294,7 +294,7 @@
                 LEFT JOIN BA_REL_TEAM_SET_USER tu ON ph.user_id = tu.user_id
                 LEFT JOIN BS_TEAM_SET ts ON tu.team_set_id = ts.id
         WHERE
-            ph.is_deleted = 0
+            ph.is_deleted = 0 AND ph.staff_type != 1
           AND ts.id = #{teamId}
           AND ct.id = #{certificateId}
     </select>