.vscode/settings.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vscode/settings.json
@@ -1,4 +1,5 @@ { "java.configuration.updateBuildConfiguration": "interactive", "java.debug.settings.onBuildFailureProceed": true "java.debug.settings.onBuildFailureProceed": true, "java.compile.nullAnalysis.mode": "automatic" } springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -32,13 +32,16 @@ @Select("select COUNT(tier)as tier from storage_cage where cage=#{cage} and cell=#{cell} and state!=0 and state!=3;") int selectsum(int cage, int cell); // 完成进片中的玻璃状态 // 完成出片中的玻璃状态 @Update("update storage_cage set state=#{state} where glass_id=#{glassid} and state=3;") void UpdateCageOver(String glassid, int state); // 完成进片中的玻璃状态 @Update("update storage_cage set state=#{state} where glass_id=#{glassid} and state=2;") void UpdateCageadd(String glassid, int state); //查询是否有该类型的任务还未完成 // 判断出片为1时,是否可直接出片 @Select("select COUNT(state) from storage_cage where state=#{state}") int SelectCageState(int state); // 获取玻璃信息 @Select("select *,ordernumber ,glasslength_mm as glasslengthmm,glassheight_mm as glassheightmm,barcode,listnumber,boxnumber,glasslength,glassheight,FrameBarcode from north_glass_buffer1 where barcode=#{glassid}") north_glass_buffer1 selectGlass(String glassid); @@ -191,7 +194,7 @@ int Selectqueuestate(); // 判断铝框出片表是否有玻璃需要出 @Select("SELECT glassid FROM `out_slice` where state=0 and framestate!=1 order by sequence,id limit 1;") @Select("SELECT glassid FROM `out_slice` where state=0 order by sequence,id limit 1;") String SelectOutSlice(); // 判断铝框出片表是否有玻璃正在出片中 springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -29,9 +29,16 @@ double minwidth = 0; north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 获取玻璃参数 //如果没有此id时 if (glasslist == null) { return (300); } //判断是否还有进片任务未完成的 int cagestate=spianMapper.SelectCageState(2); //有进片任务未完成时返回不进片 if(cagestate>0){ return (300); } double widths = glasslist.getglasslengthmm(); String orderids = glasslist.getordernumber(); String FrameBarcode = glasslist.getFrameBarcode();