xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gai

Browse Source
master
xiaoning 2 years ago
parent 1da25624bd
commit ba261c8e32
2 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File

70
.idea/workspace.xml
Unescape View File

@ -5,16 +5,6 @@
</component>
<component name="ChangeListManager">
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="wanghaodong">
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmQfxq.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/QfExcel.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/listeners/ExcelQFListener.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/listeners/ExcelSYListener.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmQfxqMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmQfxqService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmQfxqMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
@ -184,20 +174,10 @@
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gj_erp.iml" beforeDir="false" afterPath="$PROJECT_DIR$/gj_erp.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappers/sy/SyuserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/sy/SyuserMapper.xml" afterDir="false" />
</list>
<list id="1843e6b0-3c18-45b6-89c7-e9efbe3d4674" name="Revert &quot;finish&quot;" comment="Revert &quot;finish&quot;" />
<list id="4d943a56-b745-4db0-8fd5-bbd1f49b8f76" name="Revert &quot;finish&quot;-2" comment="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
@ -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 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="DmSygdMxController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.controller.jhgk.DmSygdMxController" />
<module name="gj_erp" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsic.gj_erp.controller.jhgk.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="DmSygdServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsigj_erp.service.jhgk.impl.DmSygdServiceImpl" />
<module name="gj_erp" />
@ -333,6 +326,7 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.DmSygdMxController" />
<item itemvalue="Application.com.dsic.gj_erp.service.jhgk.impl.DmSygdServiceImpl" />
<item itemvalue="Application.DmSygdServiceImpl" />
<item itemvalue="Application.DmSygdController" />
@ -387,7 +381,16 @@
<workItem from="1697024673176" duration="3734000" />
<workItem from="1697073780884" duration="20100000" />
<workItem from="1697112185533" duration="1226000" />
<workItem from="1697163262383" duration="2146000" />
<workItem from="1697163262383" duration="4402000" />
<workItem from="1697376356587" duration="1239000" />
<workItem from="1697433453323" duration="7767000" />
<workItem from="1697456575522" duration="10388000" />
<workItem from="1697471692173" duration="4346000" />
<workItem from="1697502148306" duration="16226000" />
<workItem from="1697536555329" duration="3265000" />
<workItem from="1697592676337" duration="7156000" />
<workItem from="1697622610359" duration="2293000" />
<workItem from="1697676714084" duration="1774000" />
</task>
<task id="LOCAL-00001" summary="finish">
<created>1695345779307</created>
@ -459,7 +462,21 @@
<option name="project" value="LOCAL" />
<updated>1695353309158</updated>
</task>
<option name="localTasksCounter" value="11" />
<task id="LOCAL-00011" summary="wanghaodong">
<created>1697167182055</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1697167182055</updated>
</task>
<task id="LOCAL-00012" summary="排产">
<created>1697547818761</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1697547818761</updated>
</task>
<option name="localTasksCounter" value="13" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -480,12 +497,13 @@
<MESSAGE value="finish" />
<MESSAGE value="Revert &quot;finish&quot;" />
<MESSAGE value="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
<MESSAGE value="wanghaodong" />
<MESSAGE value="TEST" />
<MESSAGE value="Revert &quot;TEST&quot;1" />
<MESSAGE value="Revert &quot;finish&quot;&#10;&#10;test" />
<MESSAGE value="111&#10;&#10;This reverts commit f64a4dcb" />
<option name="LAST_COMMIT_MESSAGE" value="111&#10;&#10;This reverts commit f64a4dcb" />
<MESSAGE value="wanghaodong" />
<MESSAGE value="排产" />
<option name="LAST_COMMIT_MESSAGE" value="排产" />
</component>
<component name="XDebuggerManager">
<watches-manager>

12
src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
Unescape View File

@ -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" +
// " },");
// }
}
}

Write Preview
Loading…
Cancel
Save