diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java index 3f7bae124..8b5d547fa 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java @@ -18,7 +18,7 @@ public class MesRbPacturnrecord { private String prtno; //物料号 private String sono; //车间订单号 private String onductor; //周转工 - private String cdate; //周转时间 + private Date cdate; //周转时间 private String seqavlqty; //提交数量 private String arctlr; //保管员 private String sedeptcode; //使用部门代码 diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java index 74a9ac81f..3cc06cf97 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; @@ -354,7 +355,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { // apsOrderClient.upByDateMax(newlevdateMax, "SYCN_PACTURNRECORD_TIME"); List pacturnrecordList=mesRbPacturnrecordService.getMesRbPacturnrecordList(selectTime); if(!CollectionUtils.isEmpty(pacturnrecordList)){ - apsOrderClient.upByDateMax(pacturnrecordList.get(0).getCdate(), "SYCN_PACTURNRECORD_TIME"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + apsOrderClient.upByDateMax(sdf.format(pacturnrecordList.get(0).getCdate()), "SYCN_PACTURNRECORD_TIME"); } Gson gson = new Gson(); String jsonString = gson.toJson(pacturnrecordList); @@ -382,7 +384,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDept(mesRbPacturnrecord.getSedept()); yieldOrder.setDemandDate(mesRbPacturnrecord.getWoreqdat());//需求日期 yieldOrder.setPlanUser(mesRbPacturnrecord.getPlanner()); - yieldOrder.setReleaseDate(mesRbPacturnrecord.getRecdate()); + yieldOrder.setReleaseDate(mesRbPacturnrecord.getCdate()); yieldOrder.setCardNo(mesRbPacturnrecord.getRouclp()); yieldOrder.setYpQty(Double.valueOf(mesRbPacturnrecord.getSeqavlqty()));//生产数量 yieldOrder.setCustodian(mesRbPacturnrecord.getWarctlr());//保管员