From 045ca12b406d1a63265cf571c4272b540992315b Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Thu, 15 Dec 2022 14:36:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8D=B7=E5=85=A5=E5=BA=93=E6=98=8E?= =?UTF-8?q?=E7=BB=86=20=202022=E5=B9=B412=E6=9C=8815=E6=97=A5=20=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gaotao/common/utils/DateUtil.java | 9 ++ .../service/impl/SysConfigServiceImpl.java | 6 +- .../templates/produce/split_roll_nos.ftl | 140 ++++++++++++++++++ 3 files changed, 152 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/templates/produce/split_roll_nos.ftl 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