diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/BaseKnifeServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/BaseKnifeServiceImpl.java index d1ea20d..40f5a74 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/BaseKnifeServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/BaseKnifeServiceImpl.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -84,9 +85,9 @@ public class BaseKnifeServiceImpl implements IBaseKnifeService { hashMap.put("planType", wmsOutPlan.getPlanType()); // 计划类型 hashMap.put("useUsername", wmsOutPlan.getRecipientUsername()); // 领用人 /* 来自出入库计划类型 */ - hashMap.put("planTypeId", wmsBusinessType.getTypeId()); // 出库ID - hashMap.put("planTypeCode", wmsBusinessType.getCode()); // 出库编码 - hashMap.put("planTypeName", wmsBusinessType.getName()); // 出库名称 + hashMap.put("planTypeId", wmsBusinessType.getTypeId()); // 出库类型ID + hashMap.put("planTypeCode", wmsBusinessType.getCode()); // 出库类型编码 + hashMap.put("planTypeName", wmsBusinessType.getName()); // 出库类型名称 /* 来自计划明细 */ hashMap.put("detailBatchNum", wmsOutPlanDetail.getDetailBatchNum()); // 明细批次 hashMap.put("wmStorageAreaId", wmsOutPlanDetail.getWmStorageAreaId()); // 库位ID @@ -94,7 +95,7 @@ public class BaseKnifeServiceImpl implements IBaseKnifeService { hashMap.put("wmStorageAreaName", wmsOutPlanDetail.getWmStorageAreaName()); // 库位名称 hashMap.put("detailStatus", wmsOutPlanDetail.getDetailState()); // 明细状态 /* 实体 */ - hashMap.put("outTime", nowWmsOutPlanDetailEntity.getCreateTime()); + hashMap.put("outTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(nowWmsOutPlanDetailEntity.getCreateTime())); // 出库时间 hashMapList.add(hashMap); // 注入出库信息对象