ezhizao_zx преди 11 месеца
родител
ревизия
fefea8fb7e

+ 2 - 2
src/main/java/cn/ezhizao/project/business/controller/BizOutsourcedOrderController.java

@@ -575,7 +575,7 @@ public class BizOutsourcedOrderController extends BaseController {
                 saveRecords.setNewCarrier(detail.getOriginalCarrier());
             }
             saveRecords.setProcessNames(detail.getProcessNames());
-            saveRecords.setStartTime(formattedDate);
+            saveRecords.setStartTime(new Date());
             outsourcedRecordsList.add(saveRecords);
         });
         //修改主表信息
@@ -977,7 +977,7 @@ public class BizOutsourcedOrderController extends BaseController {
             record.setProductDescription(l.getProductDescription());
             record.setProductNum(l.getProductNum());
             record.setProcessNames(l.getProcessNames());
-            record.setStartTime(formattedDate);
+            record.setStartTime(new Date());
             records.add(record);
             l.setDayworkId(daywork.getId());
             BizFurnaceNoInfo furnaceNoInfo = l.getFurnaceNoInfo();

+ 5 - 1
src/main/java/cn/ezhizao/project/business/domain/BizOutsourcedRecords.java

@@ -8,6 +8,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 /**
  * 外协发出单历史记录对象 biz_outsourced_records
  *
@@ -80,7 +82,9 @@ public class BizOutsourcedRecords extends BaseEntity
     @Excel(name = "工序名称")
     @ApiModelProperty(value = "工序名称")
     private String processNames;
-    private String startTime;
+    @ApiModelProperty("开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
     @TableField(exist = false)
     private String records;