diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9c7b508..c8adf55 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,16 +5,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -184,20 +174,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -239,7 +219,7 @@
"RequestMappingsPanelWidth1": "75",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
- "last_opened_file_path": "E:/runpeng/gjerp_ui",
+ "last_opened_file_path": "E:/runpeng/gj_erp_new",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -285,6 +265,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -333,6 +326,7 @@
+
@@ -387,7 +381,16 @@
-
+
+
+
+
+
+
+
+
+
+
1695345779307
@@ -459,7 +462,21 @@
1695353309158
-
+
+ 1697167182055
+
+
+
+ 1697167182055
+
+
+ 1697547818761
+
+
+
+ 1697547818761
+
+
@@ -480,12 +497,13 @@
-
-
+
+
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
index 4d87322..3341a68 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
@@ -70,17 +70,5 @@ public class DmSygdMxController {
return service.tqSygd();
}
- public static void main(String[] agrs){
-// String[] a={"序号","产品","批量","分段","板数","上料","型材抛丸","抛丸","一垮龙门板数","一垮数控板数","坡口切割结束","二垮数控板数","数控切割开始","坡口切割结束","三垮数控板数","数控切割开始","坡口切割结束","三垮平铁板数","平铁切割开始","平铁切割结束","曲平铁转结束","曲平铁结束","曲外板结束","组立","数控 板数","数控切割开始","坡口切割结束","面板挤边","七垮型 材米数","型材 面板","小组配送结束","光电 结束","备注"};
-// String[] a={"船名","批量","图名","科室","套料图下发","套料图生产需求期","套料图接收","板材领取表下发","板材领取表生产需求期","板材领取表接收","零件配套表下发","零件配套表生产需求期","零件配套表接收"};
-// String[] a={"船号","订货清单号","期次","需求日期","实际到货日期","物料号","材质MATERIAL","厚度THICK.mm","宽度WIDTHmm","长度LENGTHmm","重量吨/张WEIGHTTON/PIECE","设计数量张DESIGNPIECE","裕量张MARGINPIECE","总数量张TOTALPIECE","总重量吨TOTALTON ","利库数量张STOREPIECE","利库重量吨STORETON","实订数量张ORDERPIECE","实订重量吨ORDERTON","备注NOTE"};
-// for (int i = 0; i < a.length; i++) {
-// System.out.println("{ field: '', title: '"+a[i]+"', width: 120, editRender: { name: 'input' },\n" +
-// " filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],\n" +
-// " filterRender: { name: 'FilterCombination', },\n" +
-// " },");
-// }
-
- }
}