From d687ff755f0f3022dcd1f57a03104b0e91536ab3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 五月 2025 08:33:29 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/MES_Projects
---
玻璃公司项目/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java | 278 +++---
河北望美项目/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java | 8
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp | 2
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp | 8
玻璃公司项目/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF | 4
玻璃公司项目/gmms_nglass/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 354 ++++++++
河北望美项目/MES_11/src/main/webapp/WEB-INF/web.xml | 2
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml | 2
玻璃公司项目/gmms_nglass/src/main/java/com/northglass/service/cutmanage/CutManageService.java | 9
河北望美项目/MES_11/.project | 2
玻璃公司项目/gmms_nglass/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties | 6
河北望美项目/MES_11/.settings/org.eclipse.wst.common.component | 6
河北望美项目/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java | 3
玻璃公司项目/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java | 4
/dev/null | 1783 ------------------------------------------
玻璃公司项目/gmms_nglass/target/classes/application.properties | 2
玻璃公司项目/gmms_nglass/src/main/java/com/northglass/service/optpattern/OptPatternService.java | 5
玻璃公司项目/gmms_nglass/src/main/resources/application.properties | 2
玻璃公司项目/gmms_nglass/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst | 22
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties | 2
20 files changed, 540 insertions(+), 1,964 deletions(-)
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.project" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.project"
index 2b89172..03496a6 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.project"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.project"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>MES_11</name>
+ <name>WmMES</name>
<comment></comment>
<projects>
</projects>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.settings/org.eclipse.wst.common.component" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.settings/org.eclipse.wst.common.component"
index 95b47f1..ab85045 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.settings/org.eclipse.wst.common.component"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/.settings/org.eclipse.wst.common.component"
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="gmms2">
+ <wb-module deploy-name="WmMES">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
- <property name="context-root" value="gmms2"/>
- <property name="java-output-path" value="/gmms2/target/classes"/>
+ <property name="java-output-path" value="/WmMES/target/classes"/>
+ <property name="context-root" value="WmMES"/>
</wb-module>
</project-modules>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
index 416024b..9384d64 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
@@ -30,11 +30,12 @@
@Query("select t from PatternTask t where t.workState='宸插畬鎴�' and t.groups=?1")
public List<PatternTask> findbygroups(Long groups);
+
@Query("select t from PatternTask t where t.workState='宸插畬鎴�' and t.groups=?1 and t.rawFile.id=?2")
public List<PatternTask> findbygroups2(Long groups,Long id);
- @Query("select t from PatternTask t where t.groups=?1 order by t.id")
+ @Query("select t from PatternTask t where t.groups=?1")
public List<PatternTask> findIdGroup(Long groups);
@Query("select t from PatternTask t where t.groups=?1 group by t.rawWidth,t.rawHeight,t.rawThickness,t.color")
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java"
index 7899180..e6ce7b8 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java"
@@ -116,6 +116,7 @@
}
//涓柇浠诲姟
+
@RequestMapping(method=RequestMethod.GET,value="/delecttask1/{id}/{line}")
public String delecttask1(Model model,@PathVariable("id") Long id,@PathVariable("line") Long line){
return cutManageService.delecttask1(id,line);
@@ -163,7 +164,12 @@
@RequestMapping(method=RequestMethod.POST, value="/updatepieces")
@ResponseBody
public boolean updatepieces(HttpServletRequest request, Model model) {
- cutManageService.updatepieces(Long.valueOf(request.getParameter("rankid")),request.getParameter("pieces"));
+ cutManageService.updatepieces(Long.valueOf(request.getParameter("rankid"))
+ ,request.getParameter("width")
+ ,request.getParameter("height")
+ ,request.getParameter("thinkness")
+ ,request.getParameter("color")
+ ,request.getParameter("count"));
return true;
}
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp"
index ac26cd7..e2e650f 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/DP_chanliang.jsp"
@@ -7,15 +7,11 @@
<div class="modal-content" style="background-color: #d9d9d9;">
<div class="modal-header">
<div class="form-group" style="margin: auto; text-align: center">
-
-
<button type="button" class="btn btn-primary close"
data-dismiss="modal" aria-hidden="true">銆愬叧闂��</button>
</div>
</div>
<div class="modal-body" style=" width:1200px;height: 600px; display: flex;">
-
-
<div id="cl_container2" style=" width: 400px;height: 600px; float:left;"></div>
<div id="cl_container3" style=" width: 1200px;height: 600px; float:left;"></div>
@@ -25,7 +21,6 @@
</div>
</form>
</div>
-
<script>
function modalDPShow_chanliang() {
$("#div_daping_chanliang").modal('toggle');
@@ -89,10 +84,10 @@
zongzhi2=y2;
}
var chartDom11 = document.getElementById('cl_container2');
+
var myChart11 = echarts.init(chartDom11);
var option11;
option11 = {
-
title: {
text:'浜ч噺',//涓绘爣棰樻枃鏈�
left:'center',
@@ -167,7 +162,6 @@
}
]
};
-
option11 && myChart11.setOption(option11);
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp"
index 29f12d4..7501e69 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/modal_daping.jsp"
@@ -108,13 +108,11 @@
if(data.length>0){
for(var i =0;i<data.length;i++)
current_gongxu_banzu.push(data[i][0]);
-
getFormat(0);//榛樿寮�濮嬫椂闂�
$("#endtime").val(format);
getFormat(6);//榛樿缁撴潫鏃堕棿
$("#starttime").val(format);
myChart.resize();
-
myCharts_.resize();
chat_query();
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/web.xml" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/web.xml"
index d1bed3d..257dcec 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/web.xml"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/web.xml"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
- <display-name>gmms2</display-name>
+ <display-name>WmMES</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties"
index 2000581..1b49ab5 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties"
@@ -16,7 +16,7 @@
#jdbc.url=jdbc:mariadb:// localhost 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
-jdbc.url=jdbc:mariadb://10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.url=jdbc:mariadb://10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml"
index d1bed3d..257dcec 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/web.xml"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
- <display-name>gmms2</display-name>
+ <display-name>WmMES</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/cutmanage/CutManageService.java" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/cutmanage/CutManageService.java"
index 5d70d65..d89e796 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/cutmanage/CutManageService.java"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/cutmanage/CutManageService.java"
@@ -325,13 +325,14 @@
}
List<Integer> countPiece = this.countPiece(taskList);
model.addAttribute("taskhtml", this.getTasks(line));
- model.addAttribute("patterns", taskList);
+ model.addAttribute("patterns", this.gettas(line));
model.addAttribute("sumPiece", countPiece.get(0));
model.addAttribute("comPiece", countPiece.get(1));
- model.addAttribute("line", line);
Map<String, Object> param1 = manageService.showMachineState();
- model.addAttribute("info", param1.get("info"));
- return "redirect:/cutmanage/gettask/"+line;
+ model.addAttribute("allstatu", param1.get("allstatu"));
+ model.addAttribute("info", param1.get("info"));
+ model.addAttribute("line", line);
+ return "cutmanage/gottask";
}
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java"
index f8a5009..aed4e9c 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/device/DeviceService.java"
@@ -196,7 +196,7 @@
public void connect() {
// shelfService.connect();
// measureMachineService.connect();
- loadMachineService.connect();
+ /*loadMachineService.connect();
cutMachineService.connect();
identifyMachineService.connect();
arrangeMachineService.connect();
@@ -204,7 +204,7 @@
gaoliweiMachineService.connect();
edgeMachineService.connect();
washMachineService.connect();
- countMachineService.connect();
+ countMachineService.connect();*/
}
public List<Device> deviceManage() {
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/optpattern/OptPatternService.java" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/optpattern/OptPatternService.java"
index e21c370..1b154ed 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/optpattern/OptPatternService.java"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/java/com/northglass/service/optpattern/OptPatternService.java"
@@ -313,6 +313,11 @@
}
if (line.length() > 8 && line.startsWith("PzNOTE11")) {
String PzNOTE11 = line.substring(9);// 绮剧（
+ if(!PzNOTE11.trim().equals("")){
+ gla.setPolish(PzNOTE11);
+ }else{
+ gla.setPolish("0");
+ }
}
if (line.length() > 8 && line.startsWith("PzNOTE12")) {
String PzNOTE12 = line.substring(9);// 妤煎眰鍙�
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/resources/application.properties" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/resources/application.properties"
index 5ff30f7..d599fdf 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/resources/application.properties"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/resources/application.properties"
@@ -16,7 +16,7 @@
#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
-jdbc.url=jdbc:mariadb://localhost/gmms_nglass?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.url=jdbc:mariadb://localhost:3307/gmms_nglass?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/webapp/static/optFile1/CUTMACHINE1_300\347\211\207\344\274\230\345\214\226 _2021-01-07-15-43-43.opt" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/webapp/static/optFile1/CUTMACHINE1_300\347\211\207\344\274\230\345\214\226 _2021-01-07-15-43-43.opt"
deleted file mode 100644
index 9d755db..0000000
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/src/main/webapp/static/optFile1/CUTMACHINE1_300\347\211\207\344\274\230\345\214\226 _2021-01-07-15-43-43.opt"
+++ /dev/null
@@ -1,1783 +0,0 @@
-[OPT_Header]
-OPTCutVersion=1.0
-Dimension=mm
-Date=2021/01/07
-
-[OPT_Signature]
-派尔www.glassoo.com
-
-[OPT_Pattern]
-GlassID=10C
-GlassThickness=10.00
-GlassCoated=0
-Pieces=1
-Width=3660.00
-Height=2134.00
-TrimLeft=30.00
-TrimBottom=0.00
-LoaderRack=1
-X=2000.00
- Y=680.00 Info=1
- Y=460.00 Info=2
- Y=460.00 Info=2
- Y=460.00 Info=2
-X=1630.00
- Y=2000.00
- Z=680.00 Info=1
- Z=460.00 Info=2
- Z=460.00 Info=2
-
-[Cuttings]
-x=2029.00 y=680.00 X=31.00 Y=680.00
-x=31.00 y=1140.00 X=2029.00 Y=1140.00
-x=2029.00 y=1600.00 X=31.00 Y=1600.00
-x=3657.00 y=2000.00 X=2031.00 Y=2000.00
-x=31.00 y=2060.00 X=2029.00 Y=2060.00
-x=30.00 y=3.00 X=30.00 Y=2131.00
-x=2030.00 y=2131.00 X=2030.00 Y=3.00
-x=2710.00 y=3.00 X=2710.00 Y=1999.00
-x=3170.00 y=1999.00 X=3170.00 Y=3.00
-x=3630.00 y=3.00 X=3630.00 Y=1999.00
-
-[Info]
-Id=1
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=680.00
-SheetHeight=2000.00
-Customer=
-PosNo=3
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=680.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=2
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=460.00
-SheetHeight=2000.00
-Customer=
-PosNo=6
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=460.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[OPT_Pattern]
-GlassID=10C
-GlassThickness=10.00
-GlassCoated=0
-Pieces=1
-Width=3660.00
-Height=2134.00
-TrimLeft=30.00
-TrimBottom=0.00
-LoaderRack=1
-X=2000.00
- Y=350.00 Info=2
- Y=300.00 Info=1
- Y=240.00 Info=3
- Y=240.00 Info=3
- Y=240.00 Info=3
- Y=240.00 Info=3
- Y=240.00 Info=3
- Y=240.00 Info=3
-X=1630.00
- Y=2000.00
- Z=350.00 Info=2
- Z=350.00 Info=2
- Z=350.00 Info=2
- Z=240.00 Info=3
- Z=240.00 Info=3
-
-[Cuttings]
-x=2029.00 y=350.00 X=31.00 Y=350.00
-x=31.00 y=650.00 X=2029.00 Y=650.00
-x=2029.00 y=890.00 X=31.00 Y=890.00
-x=31.00 y=1130.00 X=2029.00 Y=1130.00
-x=2029.00 y=1370.00 X=31.00 Y=1370.00
-x=31.00 y=1610.00 X=2029.00 Y=1610.00
-x=2029.00 y=1850.00 X=31.00 Y=1850.00
-x=3657.00 y=2000.00 X=2031.00 Y=2000.00
-x=31.00 y=2090.00 X=2029.00 Y=2090.00
-x=30.00 y=3.00 X=30.00 Y=2131.00
-x=2030.00 y=2131.00 X=2030.00 Y=3.00
-x=2380.00 y=3.00 X=2380.00 Y=1999.00
-x=2730.00 y=1999.00 X=2730.00 Y=3.00
-x=3080.00 y=3.00 X=3080.00 Y=1999.00
-x=3320.00 y=1999.00 X=3320.00 Y=3.00
-x=3560.00 y=3.00 X=3560.00 Y=1999.00
-
-[Info]
-Id=1
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=300.00
-SheetHeight=2000.00
-Customer=
-PosNo=1
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=300.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=2
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=350.00
-SheetHeight=2000.00
-Customer=
-PosNo=2
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=350.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=3
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=240.00
-SheetHeight=2000.00
-Customer=
-PosNo=5
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=240.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[OPT_Pattern]
-GlassID=10C
-GlassThickness=10.00
-GlassCoated=0
-Pieces=6
-Width=3660.00
-Height=2134.00
-TrimLeft=30.00
-TrimBottom=0.00
-LoaderRack=1
-X=2000.00
- Y=680.00 Info=1
- Y=680.00 Info=1
- Y=680.00 Info=1
-X=1630.00
- Y=2000.00
- Z=680.00 Info=1
- Z=680.00 Info=1
- Z=240.00 Info=2
-
-[Cuttings]
-x=31.00 y=680.00 X=2029.00 Y=680.00
-x=2029.00 y=1360.00 X=31.00 Y=1360.00
-x=3657.00 y=2000.00 X=2031.00 Y=2000.00
-x=31.00 y=2040.00 X=2029.00 Y=2040.00
-x=30.00 y=3.00 X=30.00 Y=2131.00
-x=2030.00 y=2131.00 X=2030.00 Y=3.00
-x=2710.00 y=3.00 X=2710.00 Y=1999.00
-x=3390.00 y=1999.00 X=3390.00 Y=3.00
-x=3630.00 y=3.00 X=3630.00 Y=1999.00
-
-[Info]
-Id=1
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=680.00
-SheetHeight=2000.00
-Customer=
-PosNo=3
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=680.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=2
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=240.00
-SheetHeight=2000.00
-Customer=
-PosNo=5
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=240.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[OPT_Pattern]
-GlassID=10C
-GlassThickness=10.00
-GlassCoated=0
-Pieces=1
-Width=3660.00
-Height=2134.00
-TrimLeft=30.00
-TrimBottom=0.00
-LoaderRack=1
-X=300.00
- Y=2000.00 Info=1
-
-[Cuttings]
-x=31.00 y=2000.00 X=329.00 Y=2000.00
-x=30.00 y=3.00 X=30.00 Y=2131.00
-x=330.00 y=2131.00 X=330.00 Y=3.00
-
-[Info]
-Id=1
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=300.00
-SheetHeight=2000.00
-Customer=
-PosNo=1
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=300.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-[OPT_Pattern]
-GlassID=10C
-GlassThickness=10.00
-GlassCoated=0
-Pieces=16
-Width=3660.00
-Height=2134.00
-TrimLeft=30.00
-TrimBottom=0.00
-LoaderRack=1
-X=3630.00
- Y=2000.00
- Z=750.00 Info=2
- Z=750.00 Info=2
- Z=750.00 Info=2
- Z=680.00 Info=1
- Z=460.00 Info=4
- Z=240.00 Info=3
-
-[Cuttings]
-x=31.00 y=2000.00 X=3657.00 Y=2000.00
-x=30.00 y=3.00 X=30.00 Y=2131.00
-x=780.00 y=1999.00 X=780.00 Y=3.00
-x=1530.00 y=3.00 X=1530.00 Y=1999.00
-x=2280.00 y=1999.00 X=2280.00 Y=3.00
-x=2960.00 y=3.00 X=2960.00 Y=1999.00
-x=3420.00 y=1999.00 X=3420.00 Y=3.00
-
-[Info]
-Id=1
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=680.00
-SheetHeight=2000.00
-Customer=
-PosNo=3
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=680.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=2
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=750.00
-SheetHeight=2000.00
-Customer=
-PosNo=4
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=750.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=3
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=240.00
-SheetHeight=2000.00
-Customer=
-PosNo=5
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=240.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=4
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=460.00
-SheetHeight=2000.00
-Customer=
-PosNo=6
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=460.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[OPT_Pattern]
-GlassID=10C
-GlassThickness=10.00
-GlassCoated=0
-Pieces=6
-Width=3660.00
-Height=2134.00
-TrimLeft=30.00
-TrimBottom=0.00
-LoaderRack=1
-X=2000.00
- Y=350.00 Info=2
- Y=350.00 Info=2
- Y=350.00 Info=2
- Y=350.00 Info=2
- Y=350.00 Info=2
- Y=350.00 Info=2
-X=1630.00
- Y=2000.00
- Z=460.00 Info=3
- Z=460.00 Info=3
- Z=350.00 Info=2
- Z=300.00 Info=1
-
-[Cuttings]
-x=2029.00 y=350.00 X=31.00 Y=350.00
-x=31.00 y=700.00 X=2029.00 Y=700.00
-x=2029.00 y=1050.00 X=31.00 Y=1050.00
-x=31.00 y=1400.00 X=2029.00 Y=1400.00
-x=2029.00 y=1750.00 X=31.00 Y=1750.00
-x=3657.00 y=2000.00 X=2031.00 Y=2000.00
-x=31.00 y=2100.00 X=2029.00 Y=2100.00
-x=30.00 y=3.00 X=30.00 Y=2131.00
-x=2030.00 y=2131.00 X=2030.00 Y=3.00
-x=2490.00 y=1999.00 X=2490.00 Y=3.00
-x=2950.00 y=3.00 X=2950.00 Y=1999.00
-x=3300.00 y=1999.00 X=3300.00 Y=3.00
-x=3600.00 y=3.00 X=3600.00 Y=1999.00
-
-[Info]
-Id=1
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=300.00
-SheetHeight=2000.00
-Customer=
-PosNo=1
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=300.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=2
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=350.00
-SheetHeight=2000.00
-Customer=
-PosNo=2
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=350.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=3
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=460.00
-SheetHeight=2000.00
-Customer=
-PosNo=6
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=460.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[OPT_Pattern]
-GlassID=10C
-GlassThickness=10.00
-GlassCoated=0
-Pieces=1
-Width=3660.00
-Height=2134.00
-TrimLeft=30.00
-TrimBottom=0.00
-LoaderRack=1
-X=2000.00
- Y=750.00 Info=3
- Y=750.00 Info=3
- Y=300.00 Info=1
- Y=300.00 Info=1
-X=1630.00
- Y=2000.00
- Z=680.00 Info=2
- Z=460.00 Info=4
- Z=460.00 Info=4
-
-[Cuttings]
-x=2029.00 y=750.00 X=31.00 Y=750.00
-x=31.00 y=1500.00 X=2029.00 Y=1500.00
-x=2029.00 y=1800.00 X=31.00 Y=1800.00
-x=3657.00 y=2000.00 X=2031.00 Y=2000.00
-x=31.00 y=2100.00 X=2029.00 Y=2100.00
-x=30.00 y=3.00 X=30.00 Y=2131.00
-x=2030.00 y=2131.00 X=2030.00 Y=3.00
-x=2710.00 y=3.00 X=2710.00 Y=1999.00
-x=3170.00 y=1999.00 X=3170.00 Y=3.00
-x=3630.00 y=3.00 X=3630.00 Y=1999.00
-
-[Info]
-Id=1
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=300.00
-SheetHeight=2000.00
-Customer=
-PosNo=1
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=300.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=2
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=680.00
-SheetHeight=2000.00
-Customer=
-PosNo=3
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=680.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=3
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=750.00
-SheetHeight=2000.00
-Customer=
-PosNo=4
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=750.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=4
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=460.00
-SheetHeight=2000.00
-Customer=
-PosNo=6
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=460.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[OPT_Pattern]
-GlassID=10C
-GlassThickness=10.00
-GlassCoated=0
-Pieces=2
-Width=3660.00
-Height=2134.00
-TrimLeft=30.00
-TrimBottom=0.00
-LoaderRack=1
-X=2000.00
- Y=460.00 Info=3
- Y=460.00 Info=3
- Y=460.00 Info=3
- Y=240.00 Info=2
- Y=240.00 Info=2
- Y=240.00 Info=2
-X=1630.00
- Y=2000.00
- Z=240.00 Info=2
- Z=240.00 Info=2
- Z=240.00 Info=2
- Z=240.00 Info=2
- Z=240.00 Info=2
- Z=350.00 Info=1
-
-[Cuttings]
-x=2029.00 y=460.00 X=31.00 Y=460.00
-x=31.00 y=920.00 X=2029.00 Y=920.00
-x=2029.00 y=1380.00 X=31.00 Y=1380.00
-x=31.00 y=1620.00 X=2029.00 Y=1620.00
-x=2029.00 y=1860.00 X=31.00 Y=1860.00
-x=3657.00 y=2000.00 X=2031.00 Y=2000.00
-x=31.00 y=2100.00 X=2029.00 Y=2100.00
-x=30.00 y=3.00 X=30.00 Y=2131.00
-x=2030.00 y=2131.00 X=2030.00 Y=3.00
-x=2270.00 y=1999.00 X=2270.00 Y=3.00
-x=2510.00 y=3.00 X=2510.00 Y=1999.00
-x=2750.00 y=1999.00 X=2750.00 Y=3.00
-x=2990.00 y=3.00 X=2990.00 Y=1999.00
-x=3230.00 y=1999.00 X=3230.00 Y=3.00
-x=3580.00 y=3.00 X=3580.00 Y=1999.00
-
-[Info]
-Id=1
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=350.00
-SheetHeight=2000.00
-Customer=
-PosNo=2
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=350.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=2
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=240.00
-SheetHeight=2000.00
-Customer=
-PosNo=5
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=240.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=3
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=460.00
-SheetHeight=2000.00
-Customer=
-PosNo=6
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=460.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[OPT_Pattern]
-GlassID=10C
-GlassThickness=10.00
-GlassCoated=0
-Pieces=1
-Width=3660.00
-Height=2134.00
-TrimLeft=30.00
-TrimBottom=0.00
-LoaderRack=1
-X=2000.00
- Y=460.00 Info=3
- Y=460.00 Info=3
- Y=460.00 Info=3
- Y=350.00 Info=1
- Y=350.00 Info=1
-X=1630.00
- Y=2000.00
- Z=680.00 Info=2
- Z=460.00 Info=3
- Z=460.00 Info=3
-
-[Cuttings]
-x=2029.00 y=460.00 X=31.00 Y=460.00
-x=2029.00 y=920.00 X=31.00 Y=920.00
-x=31.00 y=1380.00 X=2029.00 Y=1380.00
-x=2029.00 y=1730.00 X=31.00 Y=1730.00
-x=3657.00 y=2000.00 X=2031.00 Y=2000.00
-x=31.00 y=2080.00 X=2029.00 Y=2080.00
-x=30.00 y=3.00 X=30.00 Y=2131.00
-x=2030.00 y=2131.00 X=2030.00 Y=3.00
-x=2710.00 y=3.00 X=2710.00 Y=1999.00
-x=3170.00 y=1999.00 X=3170.00 Y=3.00
-x=3630.00 y=3.00 X=3630.00 Y=1999.00
-
-[Info]
-Id=1
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=350.00
-SheetHeight=2000.00
-Customer=
-PosNo=2
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=350.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=2
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=680.00
-SheetHeight=2000.00
-Customer=
-PosNo=3
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=680.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=3
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=460.00
-SheetHeight=2000.00
-Customer=
-PosNo=6
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=460.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[OPT_Pattern]
-GlassID=10C
-GlassThickness=10.00
-GlassCoated=0
-Pieces=4
-Width=3660.00
-Height=2134.00
-TrimLeft=30.00
-TrimBottom=0.00
-LoaderRack=1
-X=2000.00
- Y=300.00 Info=1
- Y=300.00 Info=1
- Y=300.00 Info=1
- Y=300.00 Info=1
- Y=300.00 Info=1
- Y=300.00 Info=1
- Y=300.00 Info=1
-X=1630.00
- Y=2000.00
- Z=300.00 Info=1
- Z=300.00 Info=1
- Z=300.00 Info=1
- Z=460.00 Info=3
- Z=240.00 Info=2
-
-[Cuttings]
-x=2029.00 y=300.00 X=31.00 Y=300.00
-x=31.00 y=600.00 X=2029.00 Y=600.00
-x=2029.00 y=900.00 X=31.00 Y=900.00
-x=31.00 y=1200.00 X=2029.00 Y=1200.00
-x=2029.00 y=1500.00 X=31.00 Y=1500.00
-x=2029.00 y=1800.00 X=31.00 Y=1800.00
-x=3657.00 y=2000.00 X=2031.00 Y=2000.00
-x=31.00 y=2100.00 X=2029.00 Y=2100.00
-x=30.00 y=3.00 X=30.00 Y=2131.00
-x=2030.00 y=2131.00 X=2030.00 Y=3.00
-x=2330.00 y=3.00 X=2330.00 Y=1999.00
-x=2630.00 y=1999.00 X=2630.00 Y=3.00
-x=2930.00 y=3.00 X=2930.00 Y=1999.00
-x=3390.00 y=1999.00 X=3390.00 Y=3.00
-x=3630.00 y=3.00 X=3630.00 Y=1999.00
-
-[Info]
-Id=1
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=300.00
-SheetHeight=2000.00
-Customer=
-PosNo=1
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=300.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=2
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=240.00
-SheetHeight=2000.00
-Customer=
-PosNo=5
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=240.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
-[Info]
-Id=3
-SecondGlassReference=10C
-RackNo=0
-SheetWidth=460.00
-SheetHeight=2000.00
-Customer=
-PosNo=6
-OrderNo=
-RackCode=
-PieceStandardPz=0
-UMPz=mm
-IDPz=
-RealDimXPz=460.00
-RealDimYPz=2000.00
-GrindingPz=0.00
-GrindingPzX1=0.00
-GrindingPzY1=0.00
-GrindingPzX2=0.00
-GrindingPzY2=0.00
-BendingPz=0.00
-QuantityPz=50
-PriorityPz=0
-LabelsPz=50
-LabelsPzCounter=0
-RotationAllowed=1
-PreferencePz=0
-DescMatCompPz=FL10
-DeliveryDatePz=31-12-2020
-PzNOTE=M7078
-PzNOTE1=11.0
-PzNOTE2=dfgf332
-PzNOTE3=6mm鐧界幓閽㈠寲
-PzNOTE4=1.55
-PzNOTE5=椤圭洰鍚嶇О
-PzNOTE6=鏄庣粏澶囨敞
-PzNOTE7=M7078-29A
-PzNOTE8=M7078-4A-11
-PzNOTE9=
-PzNOTE10=0.0
-PzNOTE11=0.0
-PzNOTE12=
-PzNOTE13=
-PzNOTE14=
-PzNOTE15=
-PzNOTE16=
-PzNOTE17=
-PzNOTE18=
-PzNOTE19=
-PzNOTE20=
-
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/classes/application.properties" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/classes/application.properties"
index 5ff30f7..d599fdf 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/classes/application.properties"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/classes/application.properties"
@@ -16,7 +16,7 @@
#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
-jdbc.url=jdbc:mariadb://localhost/gmms_nglass?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.url=jdbc:mariadb://localhost:3307/gmms_nglass?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF"
index 949d653..5befc17 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF"
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Built-By: northglass
-Build-Jdk: 1.8.0_31
+Built-By: aaa
+Build-Jdk: 1.8.0_121
Created-By: Maven Integration for Eclipse
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties"
index 8aa10a0..14b0a9c 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties"
@@ -1,7 +1,7 @@
#Generated by Maven Integration for Eclipse
-#Fri Feb 05 08:53:05 CST 2021
+#Mon May 26 16:09:18 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
-m2e.projectName=gmms_nglass
-m2e.projectLocation=D\:\\workeclipse\\gmms_nglass
+m2e.projectName=gmms2
+m2e.projectLocation=D\:\\Documents\\MES_Projects\\\u73BB\u7483\u516C\u53F8\u9879\u76EE\\gmms_nglass
artifactId=gmms2
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst"
index e69de29..842eb82 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst"
@@ -0,0 +1,354 @@
+com\northglass\web\account\UserAdminController.class
+com\northglass\repository\ShelfHoistDao.class
+com\northglass\listener\ShelfConnection.class
+com\northglass\constants\StateConstants$GlassArrangeState.class
+com\northglass\listener\ClientListener.class
+com\northglass\service\countmachine\CountMachineService.class
+com\northglass\service\filmremovemachine\FilmRemoveMachineService.class
+com\northglass\entity\ArrangeMachine.class
+com\northglass\repository\GlassNumberColorDao.class
+com\northglass\entity\DummyFixRack.class
+com\northglass\web\countmachine\CountMachineController.class
+com\northglass\constants\FunctionNumber$CountMachineFunctionNumber.class
+com\northglass\constants\StateConstants$IdentifyMachineState.class
+com\northglass\entity\MeasureMachine.class
+com\northglass\repository\ShelfMessageDao.class
+com\northglass\service\ServiceException.class
+com\northglass\web\common\UploadController.class
+com\northglass\repository\ArrangeMachineDao.class
+com\northglass\web\account\RegisterController.class
+com\northglass\entity\CardNumber.class
+com\northglass\repository\ArrangeMachineStatuDao.class
+com\northglass\log\GLoggerFactory.class
+com\northglass\entity\Shelf.class
+com\northglass\repository\DummyFixRackDao.class
+com\northglass\listener\GMMSPrinter.class
+com\northglass\constants\StateConstants$ManufactureBatchState.class
+com\northglass\constants\StateConstants$ArrangeMachineTaskState.class
+com\northglass\constants\StateConstants$LoadMachineState.class
+com\northglass\service\message\ShelfMessageProcessor.class
+com\northglass\constants\StateConstants$CountMachineState.class
+com\northglass\service\message\TidyMachineMessageProcessor.class
+com\northglass\entity\SingalGlass.class
+com\northglass\repository\ShelfTaskDao.class
+com\northglass\entity\EdgeMachine.class
+com\northglass\constants\StateConstants$GrindFaceMachineState.class
+com\northglass\listener\CutMachineClientListener.class
+com\northglass\repository\ManufactureBatchDao.class
+com\northglass\service\device\Device.class
+com\northglass\constants\StateConstants$GaoliweiFunctionNumber.class
+com\northglass\service\message\ChamferMessageProcessor.class
+com\northglass\repository\GaoliweiMachineDao.class
+com\northglass\constants\StateConstants$RackState.class
+com\northglass\repository\RawPackageDao.class
+com\northglass\service\common\ServiceInterface.class
+com\northglass\web\task\TaskController.class
+com\northglass\constants\StateConstants$ArrangeMachineState.class
+com\northglass\service\shelf\ShelfService.class
+com\northglass\entity\Rack.class
+com\northglass\repository\ChamferMachineDao.class
+com\northglass\repository\WashMachineTaskDao.class
+com\northglass\entity\Machine.class
+com\northglass\entity\GlassNumberColor.class
+com\northglass\service\rawpackage\RawPackageService$1.class
+com\northglass\constants\StateConstants$ArrangePieceStatu.class
+com\northglass\constants\FunctionNumber.class
+com\northglass\repository\LoadMachineFixRackDao.class
+com\northglass\constants\StateConstants$WashMachineState.class
+com\northglass\constants\StateConstants$ShelfState.class
+com\northglass\entity\Cutting.class
+com\northglass\service\task\TaskService.class
+com\northglass\entity\ArrangeMachineRank.class
+com\northglass\service\glass\GlassService.class
+com\northglass\constants\ShelfTaskType.class
+com\northglass\web\systemmgmt\SystemMgmtController.class
+com\northglass\entity\GlassCommer.class
+com\northglass\entity\GaoliweiMachineTask.class
+com\northglass\repository\GaoliweiMachineTaskDao.class
+com\northglass\constants\StateConstants$LightTaskState.class
+com\northglass\entity\OPattern.class
+com\northglass\entity\CountMachineStatu.class
+com\northglass\service\countmachinetask\CountMachineTaskService.class
+com\northglass\repository\ReportTaskDao.class
+com\northglass\listener\EdgeMachineClientListener.class
+com\northglass\service\message\AbstractMessageProcessor.class
+com\northglass\repository\LoadMessageDao.class
+com\northglass\entity\GaoliweiMachine.class
+com\northglass\entity\IdEntity.class
+com\northglass\service\shelfmanager\ShelfManagerService$1.class
+com\northglass\entity\PrintName.class
+com\northglass\service\rawpackage\RawPackageService.class
+com\northglass\web\device\DeviceController.class
+com\northglass\entity\CountMachineTask.class
+com\northglass\constants\StateConstants$GrindEdgeMachineState.class
+com\northglass\constants\StateConstants$MeasureMachineState.class
+com\northglass\entity\AbstractMachine.class
+com\northglass\entity\IdentifyPattern.class
+com\northglass\repository\ShelfStatuDao.class
+com\northglass\listener\ShelfServerListener.class
+com\northglass\repository\IdentifyWarnDao.class
+com\northglass\repository\ReportTaskLoadDao.class
+com\northglass\constants\ShelfTaskFlag.class
+com\northglass\entity\User.class
+com\northglass\rest\RestException.class
+com\northglass\constants\StateConstants$GrindEdgeMachineTaskState.class
+com\northglass\service\reportmanage\ReportManageService.class
+com\northglass\repository\CuttingOptPatternDao.class
+com\northglass\service\cutmachinemanage\GetTaskService.class
+com\northglass\repository\BreakReportDao.class
+com\northglass\listener\TidyMachineClientListener.class
+com\northglass\service\machine\MachineService.class
+com\northglass\entity\AbstractMachineClient.class
+com\northglass\service\common\AbstractMachineService.class
+com\northglass\repository\LoadMachineTaskDao.class
+com\northglass\repository\ArrangeMachineTaskDao.class
+com\northglass\repository\IdentifyMachineDao.class
+com\northglass\service\optpattern\OptPatternService.class
+com\northglass\service\missingpiece\MisssingManageService.class
+com\northglass\service\cutmachinetask\CutMachineTaskService.class
+com\northglass\web\cutmanage\CutManageController.class
+com\northglass\web\manage\ManageController.class
+com\northglass\entity\AbstractMessage.class
+com\northglass\entity\Glass.class
+com\northglass\service\identifymachine\IdentifyMachineService.class
+com\northglass\listener\ServerListener.class
+com\northglass\service\message\CountMachineMessageProcessor.class
+com\northglass\constants\FunctionNumber$LoadMachineFunctionNumber.class
+com\northglass\constants\StateConstants$IdentifyPatternState.class
+com\northglass\entity\TougheningGroup.class
+com\northglass\constants\FunctionNumber$MeasureMachineFunctionNumber.class
+com\northglass\service\cutmachine\CutMachineService.class
+com\northglass\service\message\WashMachineMessageProcessor.class
+com\northglass\entity\RankFit.class
+com\northglass\constants\MessageType.class
+com\northglass\repository\ManufactureBatchMachineDao.class
+com\northglass\repository\TougheningGroupDao.class
+com\northglass\entity\ReportTaskLoad.class
+com\northglass\repository\RawPackageTxtDao.class
+com\northglass\entity\MachineError.class
+com\northglass\service\shelf\ShelfMessageService.class
+com\northglass\constants\FunctionNumber$ShelfFunctionNumber.class
+com\northglass\service\loadmachinerack\LoadMachineRackService.class
+com\northglass\constants\StateConstants$PreprocessingGlassState.class
+com\northglass\service\common\AbstractMessageService.class
+com\northglass\constants\WebColor.class
+com\northglass\entity\IdentifyFloor.class
+com\northglass\entity\LoadMachine.class
+com\northglass\service\gaoliwei\GaoliweiMachineService.class
+com\northglass\repository\CountMachineTaskDao.class
+com\northglass\web\shelf\ShelfController.class
+com\northglass\repository\RankFitDao.class
+com\northglass\web\shelfmanager\ShelfManagerController.class
+com\northglass\repository\GlassCommerDao.class
+com\northglass\repository\LoadMachineRackDao.class
+com\northglass\listener\ArrangeMachineClientListener.class
+com\northglass\constants\StateConstants$ShelfHoistState.class
+com\northglass\constants\StateConstants$CutMachineState.class
+com\northglass\repository\ArrangeMachineRankDao.class
+com\northglass\constants\StateConstants$TougheningGlassState.class
+com\northglass\constants\StateConstants$CountMachineTaskState.class
+com\northglass\repository\TougheningGlassDao.class
+com\northglass\constants\ArrangeMachineTaskType.class
+com\northglass\constants\StateConstants$EdgeMachineState.class
+com\northglass\service\edgemachine\EdgeMachineService.class
+com\northglass\repository\GlassDao.class
+com\northglass\entity\LoadMachineStatu.class
+com\northglass\service\shelfmanager\ShelfManagerService.class
+com\northglass\web\identifymachine\IdentifyMachineController.class
+com\northglass\constants\StateConstants$RawPackageTxtState.class
+com\northglass\entity\ReportTask.class
+com\northglass\constants\FunctionNumber$GrindFaceMachineFunctionNumber.class
+com\northglass\entity\CountMachine.class
+com\northglass\util\CRCUtil.class
+com\northglass\constants\StateConstants$printStatu.class
+com\northglass\constants\StateConstants$ShelfTaskState.class
+com\northglass\constants\GlassColor.class
+com\northglass\repository\IdentifyFloorDao.class
+com\northglass\service\message\LoadMachineMessageProcessor.class
+com\northglass\entity\FileMeta.class
+com\northglass\entity\WashMachineStatu.class
+com\northglass\repository\WashMachineDao.class
+com\northglass\constants\StateConstants$PrintMachineState.class
+com\northglass\entity\PreprocessingGlass.class
+com\northglass\entity\GaoliweiStatu.class
+com\northglass\service\account\ShiroDbRealm$ShiroUser.class
+com\northglass\constants\StateConstants$GaoliweiMachineState.class
+com\northglass\entity\ShelfMessage.class
+com\northglass\service\tidy\TidyMachineService.class
+com\northglass\constants\MachineType.class
+com\northglass\entity\MachineStatu.class
+com\northglass\listener\IdentifyMachineClientListener.class
+com\northglass\web\standalone\StandAloneController.class
+com\northglass\repository\LoadMachineDao.class
+com\northglass\entity\MachineTask.class
+com\northglass\repository\TaskDao.class
+com\northglass\entity\ManufactureBatch.class
+com\northglass\web\machine\MachineState.class
+com\northglass\constants\StateConstants$GlassState.class
+com\northglass\entity\Rank.class
+com\northglass\service\common\AbstractMessageProcessor.class
+com\northglass\entity\ShelfTask.class
+com\northglass\entity\OptPattern.class
+com\northglass\web\rawpackage\RawPackageController.class
+com\northglass\constants\MachineState.class
+com\northglass\entity\BreakReport.class
+com\northglass\listener\ShelfClientListener.class
+com\northglass\entity\ArrangePiecesStatu.class
+com\northglass\web\missingmanage\MissingManageController.class
+com\northglass\service\shelfrank\ShelfRankService.class
+com\northglass\entity\ArrangeMachineStatu.class
+com\northglass\entity\GrindEdgeMachineTwo.class
+com\northglass\entity\WashMachine.class
+com\northglass\entity\LoadMessage.class
+com\northglass\repository\PrintSizeDao.class
+com\northglass\repository\TidyMachineDao.class
+com\northglass\repository\MeasureMachineDao.class
+com\northglass\repository\UserDao.class
+com\northglass\constants\StateConstants.class
+com\northglass\listener\LoadMachineServerListener.class
+com\northglass\entity\ShelfStatu.class
+com\northglass\entity\Step.class
+com\northglass\entity\TougheningGlass.class
+com\northglass\repository\CardNumberDao.class
+com\northglass\constants\StateConstants$sendGlassState.class
+com\northglass\entity\GlassOrder.class
+com\northglass\listener\ChamferMachineClientListener.class
+com\northglass\web\account\LoginController.class
+com\northglass\web\shelfrank\ShelfRankController.class
+com\northglass\entity\Shape.class
+com\northglass\entity\TestOut.class
+com\northglass\repository\TestOutDao.class
+com\northglass\service\arrangemachine\ArrangeMachineService.class
+com\northglass\listener\GaoliweiMachineClientListener.class
+com\northglass\constants\StateConstants$LoadMachineRackState.class
+com\northglass\repository\PreprocessingGlassDao.class
+com\northglass\entity\RawPackageTxt.class
+com\northglass\web\arrangemachine\ArrangeMachineController.class
+com\northglass\web\breakmanage\BreakController.class
+com\northglass\entity\DummyGlass.class
+com\northglass\entity\GlassTest.class
+com\northglass\entity\TidyMachine.class
+com\northglass\constants\FunctionNumber$IdentifyMachineFunctionNumber.class
+com\northglass\entity\LoadMachineRack.class
+com\northglass\service\orderglassinfo\OrderGlassInfoService.class
+com\northglass\util\ExcelUtil.class
+com\northglass\web\api\ApiListController.class
+com\northglass\rest\RestExceptionHandler.class
+com\northglass\repository\ShelfRankDao.class
+com\northglass\service\machinetask\MachineTaskService.class
+com\northglass\entity\IdentifyMachineStatu.class
+com\northglass\service\message\ArrangeMachineMessageProcessor.class
+com\northglass\entity\LoadMachineTask.class
+com\northglass\log\GLoggerConstants.class
+com\northglass\service\message\MeasureMachineMessageProcessor.class
+com\northglass\repository\IdentifyPatternDao.class
+com\northglass\service\test\updatesql.class
+com\northglass\service\message\GaoliweiMessageProcessor.class
+com\northglass\listener\CountMachineServerListener.class
+com\northglass\repository\ProdLineStateDao.class
+com\northglass\service\manage\ManageService.class
+com\northglass\web\home\HomeController.class
+com\northglass\repository\SingalGlassDao.class
+com\northglass\entity\DummyTime.class
+com\northglass\web\reportmanage\ReportManageController.class
+com\northglass\constants\StateConstants$MachineState.class
+com\northglass\constants\StateConstants$RawPackageState.class
+com\northglass\service\message\EdgeMessageProcessor.class
+com\northglass\applicationListener\InitializeSystemApplicationListener.class
+com\northglass\constants\StateConstants$LightState.class
+com\northglass\service\message\IdentifyMachineMessageProcessor.class
+com\northglass\repository\GrindEdgeMachineTwoDao.class
+com\northglass\constants\FunctionNumber$CallMachineFunctionNumber.class
+com\northglass\entity\PrintMachine.class
+com\northglass\service\measuremachine\MeasureMachineService.class
+com\northglass\util\JbarcodeUtil.class
+com\northglass\listener\WashMachineClientListener.class
+com\northglass\entity\PrintSize.class
+com\northglass\constants\StateConstants$CallMachineState.class
+com\northglass\repository\FilmRemoveMachineDao.class
+com\northglass\repository\GlassTestDao.class
+com\northglass\repository\GrindEdgeMachineDao.class
+com\northglass\constants\StateConstants$CountTaskState.class
+com\northglass\service\cutmanage\CutManageService.class
+com\northglass\constants\StateConstants$ArrangeMachineRankState.class
+com\northglass\repository\OrderGlassInfoDao.class
+com\northglass\web\loadmachine\LoadMachineController.class
+com\northglass\util\HexUtil.class
+com\northglass\repository\PrintNameDao.class
+com\northglass\service\loadmachine\LoadMachineService.class
+com\northglass\entity\OrderInfo.class
+com\northglass\repository\EdgeMachineDao.class
+com\northglass\repository\OptPatternDao.class
+com\northglass\web\gaoliwei\GaoliweiController.class
+com\northglass\repository\CountRankDao.class
+com\northglass\entity\CutMachine.class
+com\northglass\entity\CountRank.class
+com\northglass\json\JsonTimeValueProcessor.class
+com\northglass\listener\LoadMachineClientListener.class
+com\northglass\web\account\ProfileController.class
+com\northglass\constants\StateConstants$OptPatternState.class
+com\northglass\constants\StateConstants$TaskState.class
+com\northglass\service\washmachine\WashMachineService.class
+com\northglass\service\arrangemachinerank\ArrangeMachineRankService.class
+com\northglass\service\message\CutMachineMessageProcessor.class
+com\northglass\util\SetupUtil.class
+com\northglass\web\orderglassinfo\OrderGlassInfoController.class
+com\northglass\repository\CutMachineTaskDao.class
+com\northglass\listener\CutMachineServerListener.class
+com\northglass\entity\Task.class
+com\northglass\entity\ManufactureBatchMachine.class
+com\northglass\listener\ServerConnection.class
+com\northglass\entity\CutMachineMessage.class
+com\northglass\entity\ShelfRank.class
+com\northglass\service\account\ShiroDbRealm.class
+com\northglass\entity\WashMachineTask.class
+com\northglass\repository\GlassOrderDao.class
+com\northglass\entity\ArrangeMachineTask.class
+com\northglass\entity\IdentifyMachine.class
+com\northglass\listener\GaoliweiMachineServerListener.class
+com\northglass\repository\PrintMachineDao.class
+com\northglass\constants\FunctionNumber$GrindEdgeMachineFunctionNumber.class
+com\northglass\entity\CountMachineSort.class
+com\northglass\constants\FunctionNumber$ArrangeMachineFunctionNumber.class
+com\northglass\service\shelftask\ShelfTaskService.class
+com\northglass\constants\StateConstants$ConnectState.class
+com\northglass\entity\ShelfHoist.class
+com\northglass\entity\CutMachineStatu.class
+com\northglass\entity\FilmRemoveMachine.class
+com\northglass\constants\StateConstants$ArrangeMachineTaskStatu.class
+com\northglass\listener\MeasureMachineClientListener.class
+com\northglass\constants\StateConstants$ShelfRankState.class
+com\northglass\service\account\AccountService.class
+com\northglass\constants\StateConstants$CutMachineTaskState.class
+com\northglass\service\system\SystemService.class
+com\northglass\entity\Info.class
+com\northglass\listener\AbstractServerListener.class
+com\northglass\repository\CountMachineDao.class
+com\northglass\entity\ChamferMachine.class
+com\northglass\repository\MachineStatuDao.class
+com\northglass\entity\GrindEdgeMachine.class
+com\northglass\entity\IdentifyWarn.class
+com\northglass\service\chamfermachine\ChamferMachineService.class
+com\northglass\entity\EdgeMachineStatu.class
+com\northglass\constants\StateConstants$LoadMachineTaskState.class
+com\northglass\entity\DummyRack.class
+com\northglass\repository\CutMachineDao.class
+com\northglass\entity\TidyMachineStatu.class
+com\northglass\web\arrangemachinerank\ArrangeMachineRankController.class
+com\northglass\service\breakmanage\BreakService.class
+com\northglass\entity\CutMachineTask.class
+com\northglass\entity\LoadMachineFixRack.class
+com\northglass\rest\TaskRestController.class
+com\northglass\service\standalone\StandAloneService.class
+com\northglass\constants\StateConstants$FilmRemoveMachineState.class
+com\northglass\entity\CuttingOptPattern.class
+com\northglass\repository\ShelfDao.class
+com\northglass\util\FolderUtil.class
+com\northglass\listener\CountMachineClientListener.class
+com\northglass\repository\RankDao.class
+com\northglass\constants\ConnectState.class
+com\northglass\entity\ProdLineState.class
+com\northglass\entity\DummyCut.class
+com\northglass\repository\CountMachineSortDao.class
+com\northglass\service\device\DeviceService.class
+com\northglass\entity\RawPackage.class
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst"
index 882350e..7c61443 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst"
@@ -1,16 +1,16 @@
-com\northglass\service\account\AccountServiceTest.class
-com\northglass\functional\gui\UserAdminFT.class
-com\northglass\functional\gui\TaskGuiFT.class
-com\northglass\repository\TaskDaoTest.class
-com\northglass\functional\BaseFunctionalTestCase.class
com\northglass\data\TaskData.class
-com\northglass\functional\rest\TaskRestFT.class
-com\northglass\QuickStartServer.class
-com\northglass\functional\BaseSeleniumTestCase.class
-com\northglass\repository\JpaMappingTest.class
-com\northglass\data\JsonTest.class
+com\northglass\functional\gui\UserAdminFT.class
+com\northglass\service\account\AccountServiceTest.class
+com\northglass\functional\gui\SecurityFT.class
com\northglass\functional\gui\RegisterFT.class
com\northglass\functional\rest\TaskRestFT$TaskList.class
+com\northglass\functional\rest\TaskRestFT.class
+com\northglass\functional\gui\TaskGuiFT.class
+com\northglass\repository\JpaMappingTest.class
+com\northglass\repository\TaskDaoTest.class
+com\northglass\QuickStartServer.class
+com\northglass\functional\BaseFunctionalTestCase.class
com\northglass\data\UserData.class
-com\northglass\functional\gui\SecurityFT.class
+com\northglass\functional\BaseSeleniumTestCase.class
com\northglass\functional\gui\ProfileFT.class
+com\northglass\data\JsonTest.class
diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java"
index 80fe82f..8ef3e15 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java"
@@ -53,183 +53,183 @@
_jspx_out = out;
_jspx_resourceInjector = (org.glassfish.jsp.api.ResourceInjector) application.getAttribute("com.sun.appserv.jsp.resource.injector");
- out.write("\n");
- out.write("\n");
- out.write("\n");
- out.write("\n");
+ out.write("\r\n");
+ out.write("\r\n");
+ out.write("\r\n");
+ out.write("\r\n");
if (_jspx_meth_c_set_0(_jspx_page_context))
return;
- out.write("\n");
- out.write("\n");
- out.write("<!DOCTYPE html>\n");
- out.write("<html>\n");
- out.write("<head>\n");
- out.write(" <meta charset=\"utf-8\">\n");
- out.write(" <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n");
- out.write(" <title>MES | 鐧诲綍</title>\n");
- out.write(" <!-- Tell the browser to be responsive to screen width -->\n");
- out.write(" <meta content=\"width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no\" name=\"viewport\">\n");
- out.write(" <!-- Bootstrap 3.3.7 -->\n");
+ out.write("\r\n");
+ out.write("\r\n");
+ out.write("<!DOCTYPE html>\r\n");
+ out.write("<html>\r\n");
+ out.write("<head>\r\n");
+ out.write(" <meta charset=\"utf-8\">\r\n");
+ out.write(" <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\r\n");
+ out.write(" <title>MES | 鐧诲綍</title>\r\n");
+ out.write(" <!-- Tell the browser to be responsive to screen width -->\r\n");
+ out.write(" <meta content=\"width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no\" name=\"viewport\">\r\n");
+ out.write(" <!-- Bootstrap 3.3.7 -->\r\n");
out.write(" <link rel=\"stylesheet\" href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css\">\n");
- out.write(" <!-- Font Awesome -->\n");
+ out.write("/static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css\">\r\n");
+ out.write(" <!-- Font Awesome -->\r\n");
out.write(" <link rel=\"stylesheet\" href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css\">\n");
- out.write(" <!-- Ionicons -->\n");
+ out.write("/static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css\">\r\n");
+ out.write(" <!-- Ionicons -->\r\n");
out.write(" <link rel=\"stylesheet\" href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/static/AdminLTE/bower_components/Ionicons/css/ionicons.min.css\">\n");
- out.write(" <!-- Theme style -->\n");
+ out.write("/static/AdminLTE/bower_components/Ionicons/css/ionicons.min.css\">\r\n");
+ out.write(" <!-- Theme style -->\r\n");
out.write(" <link rel=\"stylesheet\" href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/static/AdminLTE/dist/css/AdminLTE.min.css\">\n");
- out.write(" <!-- iCheck -->\n");
+ out.write("/static/AdminLTE/dist/css/AdminLTE.min.css\">\r\n");
+ out.write(" <!-- iCheck -->\r\n");
out.write(" <link rel=\"stylesheet\" href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/static/AdminLTE/plugins/iCheck/square/blue.css\">\n");
- out.write("\n");
- out.write(" <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->\n");
- out.write(" <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->\n");
- out.write(" <!--[if lt IE 9]>\n");
- out.write(" <script src=\"https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js\"></script>\n");
- out.write(" <script src=\"https://oss.maxcdn.com/respond/1.4.2/respond.min.js\"></script>\n");
- out.write(" <![endif]-->\n");
- out.write("\n");
- out.write(" <!-- Google Font -->\n");
- out.write(" <link rel=\"stylesheet\" href=\"https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic\">\n");
- out.write("\n");
- out.write("<!-- jQuery 3 -->\n");
+ out.write("/static/AdminLTE/plugins/iCheck/square/blue.css\">\r\n");
+ out.write("\r\n");
+ out.write(" <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->\r\n");
+ out.write(" <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->\r\n");
+ out.write(" <!--[if lt IE 9]>\r\n");
+ out.write(" <script src=\"https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js\"></script>\r\n");
+ out.write(" <script src=\"https://oss.maxcdn.com/respond/1.4.2/respond.min.js\"></script>\r\n");
+ out.write(" <![endif]-->\r\n");
+ out.write("\r\n");
+ out.write(" <!-- Google Font -->\r\n");
+ out.write(" <link rel=\"stylesheet\" href=\"https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic\">\r\n");
+ out.write("\r\n");
+ out.write("<!-- jQuery 3 -->\r\n");
out.write("<script src=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/static/AdminLTE/bower_components/jquery/dist/jquery.min.js\"></script>\n");
- out.write("<!-- Bootstrap 3.3.7 -->\n");
+ out.write("/static/AdminLTE/bower_components/jquery/dist/jquery.min.js\"></script>\r\n");
+ out.write("<!-- Bootstrap 3.3.7 -->\r\n");
out.write("<script src=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js\"></script>\n");
- out.write("<!-- iCheck -->\n");
+ out.write("/static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js\"></script>\r\n");
+ out.write("<!-- iCheck -->\r\n");
out.write("<script src=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/static/AdminLTE/plugins/iCheck/icheck.min.js\"></script>\n");
- out.write("<script>\n");
- out.write(" $(function () {\n");
- out.write(" $('input').iCheck({\n");
- out.write(" checkboxClass: 'icheckbox_square-blue',\n");
- out.write(" radioClass: 'iradio_square-blue',\n");
- out.write(" increaseArea: '20%' /* optional */\n");
- out.write(" });\n");
- out.write(" });\n");
- out.write("</script>\n");
- out.write("\n");
- out.write(" <style>\n");
- out.write(" div.background\n");
- out.write(" {\n");
- out.write(" width:400px;\n");
- out.write(" height:270px;\n");
- out.write(" margin-left:-5%;\n");
- out.write(" border:1px solid black;\n");
- out.write(" background:rgba(0,0,0,0.05);/*鍏抽敭浠ｇ爜*/\n");
- out.write(" z-index:100;\n");
- out.write(" }\n");
- out.write(" \n");
- out.write(" div.transbox\n");
- out.write(" {\n");
- out.write(" width:300px;\n");
- out.write(" height:35px;\n");
- out.write(" margin-left:15%;\n");
- out.write(" margin-top:50px;\n");
- out.write(" border:0px solid rgba(255,0,0,0.3);\n");
- out.write(" z-index:101;\n");
- out.write(" }\n");
- out.write(" \n");
- out.write(" .thumbnaildiv {\n");
- out.write(" height: 150px;\n");
- out.write(" text-align: center;\n");
- out.write(" padding: 15px;\n");
- out.write(" }\n");
- out.write(" </style>\n");
- out.write("</head>\n");
- out.write("\n");
- out.write("\n");
- out.write("<body style=\"background-image: url('/gmms2/static/images/glass.jpg'); background-size: cover;\">\n");
+ out.write("/static/AdminLTE/plugins/iCheck/icheck.min.js\"></script>\r\n");
+ out.write("<script>\r\n");
+ out.write(" $(function () {\r\n");
+ out.write(" $('input').iCheck({\r\n");
+ out.write(" checkboxClass: 'icheckbox_square-blue',\r\n");
+ out.write(" radioClass: 'iradio_square-blue',\r\n");
+ out.write(" increaseArea: '20%' /* optional */\r\n");
+ out.write(" });\r\n");
+ out.write(" });\r\n");
+ out.write("</script>\r\n");
+ out.write("\r\n");
+ out.write(" <style>\r\n");
+ out.write(" div.background\r\n");
+ out.write(" {\r\n");
+ out.write(" width:400px;\r\n");
+ out.write(" height:270px;\r\n");
+ out.write(" margin-left:-5%;\r\n");
+ out.write(" border:1px solid black;\r\n");
+ out.write(" background:rgba(0,0,0,0.05);/*鍏抽敭浠ｇ爜*/\r\n");
+ out.write(" z-index:100;\r\n");
+ out.write(" }\r\n");
+ out.write(" \r\n");
+ out.write(" div.transbox\r\n");
+ out.write(" {\r\n");
+ out.write(" width:300px;\r\n");
+ out.write(" height:35px;\r\n");
+ out.write(" margin-left:15%;\r\n");
+ out.write(" margin-top:50px;\r\n");
+ out.write(" border:0px solid rgba(255,0,0,0.3);\r\n");
+ out.write(" z-index:101;\r\n");
+ out.write(" }\r\n");
+ out.write(" \r\n");
+ out.write(" .thumbnaildiv {\r\n");
+ out.write(" height: 150px;\r\n");
+ out.write(" text-align: center;\r\n");
+ out.write(" padding: 15px;\r\n");
+ out.write(" }\r\n");
+ out.write(" </style>\r\n");
+ out.write("</head>\r\n");
+ out.write("\r\n");
+ out.write("\r\n");
+ out.write("<body style=\"background-image: url('/gmms2/static/images/glass.jpg'); background-size: cover;\">\r\n");
if (SetupUtil.databaseExists()) {
- out.write("\n");
- out.write("<div style=\"margin-top: 150px;\"> \n");
+ out.write("\r\n");
+ out.write("<div style=\"margin-top: 150px;\"> \r\n");
out.write("<div align=\"center\"><img alt=\"logo\" src=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/static/images/blacklogo.png\" style=\"width: 450px;height: 100px; \"></div>\n");
- out.write("<div class=\"login-box\" style=\"margin-top: 10px;\">\n");
- out.write(" <!-- <div class=\"login-logo\">\n");
- out.write(" <img alt=\"logo\" src=\"/gmms2/static/images/logo.jpg\">\n");
- out.write(" </div> -->\n");
- out.write(" \n");
- out.write(" \n");
- out.write(" <!-- /.login-logo -->\n");
- out.write(" <div class=\"background\" style=\"border-radius:3px;\" id=\"mydiv\">\n");
+ out.write("/static/images/blacklogo.png\" style=\"width: 450px;height: 100px; \"></div>\r\n");
+ out.write("<div class=\"login-box\" style=\"margin-top: 10px;\">\r\n");
+ out.write(" <!-- <div class=\"login-logo\">\r\n");
+ out.write(" <img alt=\"logo\" src=\"/gmms2/static/images/logo.jpg\">\r\n");
+ out.write(" </div> -->\r\n");
+ out.write(" \r\n");
+ out.write(" \r\n");
+ out.write(" <!-- /.login-logo -->\r\n");
+ out.write(" <div class=\"background\" style=\"border-radius:3px;\" id=\"mydiv\">\r\n");
out.write(" <form action=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/login\" method=\"post\">\n");
+ out.write("/login\" method=\"post\">\r\n");
out.write(" ");
String error = (String) request.getAttribute(FormAuthenticationFilter.DEFAULT_ERROR_KEY_ATTRIBUTE_NAME);
if(error != null){
- out.write("\n");
- out.write("\t\t<div class=\"alert alert-error input-medium controls\">\n");
- out.write("\t\t\t<button class=\"close\" data-dismiss=\"alert\">脳</button>鐧诲綍澶辫触锛岃閲嶈瘯.\n");
- out.write("\t\t</div>\n");
+ out.write("\r\n");
+ out.write("\t\t<div class=\"alert alert-error input-medium controls\">\r\n");
+ out.write("\t\t\t<button class=\"close\" data-dismiss=\"alert\">脳</button>鐧诲綍澶辫触锛岃閲嶈瘯.\r\n");
+ out.write("\t\t</div>\r\n");
out.write("\t");
}
- out.write("\n");
- out.write(" <!-- <div style =\"font-size:25px;text-align:center \">鐜荤拑鐢熶骇绠＄悊绯荤粺</div><br><br> -->\n");
- out.write(" <div class=\"transbox\">\n");
- out.write(" <font size=\"4\">鐢ㄦ埛鍚�:</font><input type=\"text\" name=\"username\" class=\"form-control\" placeholder=\"璇疯緭鍏ヨ处鎴穃">\n");
- out.write(" <span class=\"glyphicon glyphicon-user form-control-feedback\"></span>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"transbox\">\n");
- out.write(" <font size=\"4\">瀵嗙爜:</font><input type=\"password\" name=\"password\" class=\"form-control\" placeholder=\"璇疯緭鍏ュ瘑鐮乗">\n");
- out.write(" <span class=\"glyphicon glyphicon-lock form-control-feedback\"></span>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"transbox\">\n");
- out.write(" <div class=\"col-xs-8\">\n");
- out.write(" <div class=\"checkbox icheck\">\n");
- out.write(" \t<label style=\"color: red;\">\n");
- out.write(" \t璁颁綇<input type=\"checkbox\">\n");
- out.write(" </label>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <!-- /.col -->\n");
- out.write(" <div class=\"col-xs-4\">\n");
- out.write(" <button type=\"submit\" class=\"btn btn-primary btn-block btn-flat\">鐧� 褰�</button>\n");
- out.write(" </div>\n");
- out.write(" <!-- /.col -->\n");
- out.write(" </div>\n");
- out.write(" </form>\n");
- out.write(" </div>\n");
- out.write(" <!-- /.login-box-body -->\n");
- out.write("</div>\n");
- out.write("<!-- /.login-box -->\n");
- out.write("\n");
- out.write("</div>\n");
- out.write("<div style=\"margin-left: 2%; margin-top: 19%;\"><strong>Copyright © 2014-2018 <a href=\"#\">涓婃捣鍖楃幓鑷姩鍖栨妧鏈湁闄愬叕鍙�</a>.</strong> All rights reserved.</div>\n");
+ out.write("\r\n");
+ out.write(" <!-- <div style =\"font-size:25px;text-align:center \">鐜荤拑鐢熶骇绠＄悊绯荤粺</div><br><br> -->\r\n");
+ out.write(" <div class=\"transbox\">\r\n");
+ out.write(" <font size=\"4\">鐢ㄦ埛鍚�:</font><input type=\"text\" name=\"username\" class=\"form-control\" placeholder=\"璇疯緭鍏ヨ处鎴穃">\r\n");
+ out.write(" <span class=\"glyphicon glyphicon-user form-control-feedback\"></span>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"transbox\">\r\n");
+ out.write(" <font size=\"4\">瀵嗙爜:</font><input type=\"password\" name=\"password\" class=\"form-control\" placeholder=\"璇疯緭鍏ュ瘑鐮乗">\r\n");
+ out.write(" <span class=\"glyphicon glyphicon-lock form-control-feedback\"></span>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"transbox\">\r\n");
+ out.write(" <div class=\"col-xs-8\">\r\n");
+ out.write(" <div class=\"checkbox icheck\">\r\n");
+ out.write(" \t<label style=\"color: red;\">\r\n");
+ out.write(" \t璁颁綇<input type=\"checkbox\">\r\n");
+ out.write(" </label>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <!-- /.col -->\r\n");
+ out.write(" <div class=\"col-xs-4\">\r\n");
+ out.write(" <button type=\"submit\" class=\"btn btn-primary btn-block btn-flat\">鐧� 褰�</button>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <!-- /.col -->\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </form>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <!-- /.login-box-body -->\r\n");
+ out.write("</div>\r\n");
+ out.write("<!-- /.login-box -->\r\n");
+ out.write("\r\n");
+ out.write("</div>\r\n");
+ out.write("<div style=\"margin-left: 2%; margin-top: 19%;\"><strong>Copyright © 2014-2018 <a href=\"#\">涓婃捣鍖楃幓鑷姩鍖栨妧鏈湁闄愬叕鍙�</a>.</strong> All rights reserved.</div>\r\n");
out.write(" ");
} else {
- out.write("\n");
+ out.write("\r\n");
out.write(" \t\t\t\t\t<a href=\"");
out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.evaluateExpression("${ctx}", java.lang.String.class, (PageContext)_jspx_page_context, null));
- out.write("/systemmgmt/initializeDatabase\" class=\"btn btn-large btn-success\">鍒涘缓鏁版嵁搴撹〃</a>\n");
- out.write(" \t\t\t\t\t<br><br>\n");
- out.write(" \t\t\t\t\t<p align=\"left\">棣栨閮ㄧ讲绯荤粺鏃讹紝鐐瑰嚮姝ゆ寜閽皢鍒涘缓鏁版嵁搴撹〃锛屽苟瀵煎叆璐ф灦銆佸悐瑁呬綅銆佸垏鍓叉満銆佷笂鐗囦綅淇℃伅</p>\n");
- out.write(" \t\t\n");
+ out.write("/systemmgmt/initializeDatabase\" class=\"btn btn-large btn-success\">鍒涘缓鏁版嵁搴撹〃</a>\r\n");
+ out.write(" \t\t\t\t\t<br><br>\r\n");
+ out.write(" \t\t\t\t\t<p align=\"left\">棣栨閮ㄧ讲绯荤粺鏃讹紝鐐瑰嚮姝ゆ寜閽皢鍒涘缓鏁版嵁搴撹〃锛屽苟瀵煎叆璐ф灦銆佸悐瑁呬綅銆佸垏鍓叉満銆佷笂鐗囦綅淇℃伅</p>\r\n");
+ out.write(" \t\t\r\n");
out.write(" ");
}
- out.write("\n");
- out.write(" \n");
- out.write("</body>\n");
- out.write("</html>\n");
+ out.write("\r\n");
+ out.write(" \r\n");
+ out.write("</body>\r\n");
+ out.write("</html>\r\n");
} catch (Throwable t) {
if (!(t instanceof SkipPageException)){
out = _jspx_out;
--
Gitblit v1.8.0