订单管理方法修改

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/DsCraftConstant.java

@@ -0,0 +1,24 @@
+package org.springblade.desk.dashboard.constant;
+
+/**
+ * 零件工艺信息 常量类
+ *
+ * @author lqk
+ */
+public interface DsCraftConstant {
+
+	// region 优先级
+	/**
+	 * 本次使用
+	 */
+	Integer PRIORITY_THIS_USE = 1;
+	/**
+	 * 标准
+	 */
+	Integer PRIORITY_FORMAL = 2;
+	/**
+	 * 临时
+	 */
+	Integer PRIORITY_TEMPORARY = 3;
+	// endregion
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java

@@ -25,13 +25,12 @@
  */
 package org.springblade.desk.dashboard.pojo.entity;
 
-import lombok.Data;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
 import java.io.Serial;
 
 /**
@@ -78,7 +77,7 @@ public class DsCraftEntity extends BaseEntity {
 	 * 优先级
 	 */
 	@Schema(description = "优先级")
-	private String prority;
+	private Integer prority;
 	/**
 	 * 工艺级别
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessEntity.java

@@ -25,13 +25,12 @@
  */
 package org.springblade.desk.dashboard.pojo.entity;
 
-import lombok.Data;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
 import java.io.Serial;
 
 /**
@@ -83,7 +82,7 @@ public class DsProcessEntity extends BaseEntity {
 	 * 工时定额
 	 */
 	@Schema(description = "工时定额")
-	private Long proHours;
+	private Double proHours;
 	/**
 	 * 工序描述
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -388,17 +388,27 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 					craft.setYoId(yieldOrder.getId());
 					craft.setCraftNo(craftJson.getString("craftNo"));
 					craft.setProcessNo(craftJson.getString("processNo"));
+					if (ObjectUtil.isEmpty(craft.getProcessNo())) {
+						craft.setProcessNo(StringPool.EMPTY);
+					}
 					craft.setStartTime(craftJson.getDate("startTime"));
 					craft.setEndTime(craftJson.getDate("endTime"));
 					craft.setHourQuota(craftJson.getDouble("hourQuota"));
+					if (ObjectUtil.isEmpty(craft.getHourQuota())) {
+						craft.setHourQuota(0D);
+					}
 					craft.setMakeMemo(craftJson.getString("makeMemo"));
 					craft.setPid(craftJson.getLong("pid"));
 					craft.setRpId(craftJson.getLong("rpId"));
 					craft.setPpsId(craftJson.getLong("ppsId"));
+					if (ObjectUtil.isEmpty(craft.getPpsId())) {
+						craft.setPpsId(0L);
+					}
 					craft.setMakeTeam(craftJson.getLong("makeTeam"));
 					craft.setWorkCenterId(craftJson.getLong("wcId"));
 					craft.setOcId(craftJson.getLong("ocId"));
 					craft.setCaId(craftJson.getLong("caId"));
+
 					craftList.add(craft);
 				}
 				yieldOrderCraftService.saveBatch(craftList);