diff --git a/src/main/java/com/gaotao/common/utils/DateUtil.java b/src/main/java/com/gaotao/common/utils/DateUtil.java index 06ddccd..defca13 100644 --- a/src/main/java/com/gaotao/common/utils/DateUtil.java +++ b/src/main/java/com/gaotao/common/utils/DateUtil.java @@ -148,6 +148,15 @@ public class DateUtil { } + public static Date getStringToDate(String time) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + return sdf.parse(time); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + /** * @param @param date * @param @return 设定文件 diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/SysConfigServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/SysConfigServiceImpl.java index 27c65d1..7266db8 100644 --- a/src/main/java/com/gaotao/modules/sys/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/gaotao/modules/sys/service/impl/SysConfigServiceImpl.java @@ -51,14 +51,14 @@ public class SysConfigServiceImpl extends ServiceImpl + + + + + + + + + +${projectTitle!"MESPda"} + + + + + + + + + + + + +
+
+
+
+
+ + 融欣MES - 生产收货 +
+
+

+
+
+
+
生产订单号：
+
${rollNos.orderNo!'' }
+ +
+
+
物料编码：
+
${rollNos.partNo!'' }
+ +
+
+
物料描述：
+
${rollNos.partDes!'' }
+
+
+
单卷数量：
+
${rollNos.nums!'' }
+ +
+
+
卷数：
+
${rollNos.rollNums!'' }
+ +
+
+
+
+ + + + + + + + + + + +
+
+ 卷号 +
+ 		+
+ 操作 +
+
+
+
+ + + + + + + <#assign temp = rollNos.rollNoList! > + <#list temp ? keys as key > + + + + + + +
+
+ ${temp[key]} +
+ 		+
+
+ +
+
+
+
+ +
+
+
+
+ + 返回 + +
+
+
+
+ + + + + + \ No newline at end of file