From 06dce8797cca4884b82ce4e20cd274e151df5e31 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期二, 12 十二月 2023 09:13:28 +0800 Subject: [PATCH] 调整语言 --- springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 400 ++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 269 insertions(+), 131 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java index 09c3df4..1c6f951 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java +++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java @@ -1,153 +1,291 @@ package com.example.springboot.service; - +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.GetMapping; - -import com.example.springboot.common.Result; import com.example.springboot.component.S7control; import com.example.springboot.entity.StorageCage; +import com.example.springboot.entity.north_glass_buffer1; import com.example.springboot.mapper.SpianMapper; +import com.google.common.primitives.Bytes; @Service public class SpianService { @Autowired private SpianMapper spianMapper; - @GetMapping("/all2") - public Result selectadd(String orderid){ - //瀹氫箟PRC鏁版嵁浼犻�佹暟缁� - List<String> adddresslist=new ArrayList<>(); - adddresslist.add("DB105.6");//鍑虹墖杞﹁捣濮嬩綅缃� - adddresslist.add("DB105.8");//鍑虹墖杞︾洰鏍囦綅缃� - adddresslist.add("DB105.10");//鍑虹墖绗肩幓鐠冩暟 - adddresslist.add("DB105.14");//鍑虹墖杞﹀惎鍔� 1涓哄惎鍔� - List<Short> datas=new ArrayList<>(); - //鑾峰彇浼樺厛鍑虹墖鐨勪綅缃� - StorageCage cageout=spianMapper.selectOut(orderid); - int cage =cageout.getCage(); //鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠� - int cell =cageout.getCell(); - int tier =cageout.getTier(); - int id=cageout.getId(); - int ids; - double glasswidth=cageout.getGlassWidth(); - //鍒ゆ柇鐜荤拑鍐呭鐗� - if(tier==2){ - //鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂 - //淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖) - spianMapper.UpdataGlassCage("","",glasswidth, cage, cell, tier, 0); - datas.add((short)id); - datas.add((short)1000); - datas.add((short)1); - datas.add((short)1); - S7control.getinstance().WriteWord(adddresslist, datas); - return Result.success(datas); - } - else{ - //鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲� - int state= spianMapper.selectGlassState(cage,cell); - //鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷� - if(state==0){ - return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖"); - }else{ - //鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙 - if(cage<6){ - StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,0,6); - //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧 - ids=cagecell.getId();//璋冩嫧鐩爣浣岻D - //濉叆璋冩嫧鏁版嵁 - datas.add((short)id); - datas.add((short)ids); - datas.add((short)2); - datas.add((short)1); - //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹� - S7control.getinstance().WriteWord(adddresslist, datas); - //鏇存崲鐜荤拑鐨勭瀛� - datas.clear(); // 娓呯┖鏁翠釜鍒楄〃 - //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁 - datas.add((short)id); - datas.add((short)1000); - datas.add((short)1); - datas.add((short)1); - S7control.getinstance().WriteWord(adddresslist, datas); - //淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖) - spianMapper.UpdataGlassCage("","",glasswidth, cage, cell, tier, 0); - return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹� - - }else{ - StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,5,11); - //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧 - ids=cagecell.getId();//璋冩嫧鐩爣浣岻D - //濉叆璋冩嫧鏁版嵁 - datas.add((short)id); - datas.add((short)ids); - datas.add((short)2); - datas.add((short)1); - //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹� - S7control.getinstance().WriteWord(adddresslist, datas); - datas.clear(); // 娓呯┖鏁翠釜鍒楄〃 - //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗� - //濉叆鍑虹墖鏁版嵁 - datas.add((short)id); - datas.add((short)1000); - datas.add((short)1); - datas.add((short)1); - S7control.getinstance().WriteWord(adddresslist, datas); - return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹� - - } - - } - } - -} - @GetMapping("/all") - //杩涚墖浠诲姟,浼犺鍗昳d - //鎸夎鍗曚紭鍏堣繘鐗� - public Result selectAll(Short glassid){ - //return spianMapper.selectAll(); + // @GetMapping("/all") + public Short selectAll(String glassid) { + int cage1; + int cells; int ids; - int tier; - double widths=1500; - List<String> adddresslist=new ArrayList<>(); - adddresslist.add("DB105.0");//杩涚墖杞﹁捣濮嬩綅缃� - adddresslist.add("DB105.2");//杩涚墖杞︾洰鏍囦綅缃� - adddresslist.add("DB105.4");//杩涚墖绗肩幓鐠冩暟 - adddresslist.add("DB105.12");//杩涚墖杞﹀惎鍔� 1涓哄惎鍔� - List<Short> datas=new ArrayList<>(); - //String orderid="A001"; - //鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭 - List<StorageCage> storageCage=spianMapper.selectAll(glassid); + int prcid; + int tiers; + int prctier; + double width; + double minwidth = 0; + + north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟 + if (glasslist == null) { + return (300); + } + double widths = glasslist.getglasslengthmm(); + String orderids = glasslist.getordernumber(); + + List<String> adddresslist = new ArrayList<>(); + adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃� + adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃� + adddresslist.add("DB105.4");// 杩涚墖鐜荤拑瀹� + adddresslist.add("DB105.8");//杩涚墖绗煎唴宸叉湁鐜荤拑鏁� + adddresslist.add("DB105.16");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔� + + List<Short> datas = new ArrayList<>(); + + // String orderid="A001"; + // 鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭 + List<StorageCage> storageCage = spianMapper.selectAll(orderids.toString()); + if (storageCage == null) { + return (400); + } for (StorageCage storageCage2 : storageCage) { - //淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙� - cage1=storageCage2.getCage(); - //鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁� - int cages=spianMapper.selectCage(cage1); - //鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍� - StorageCage cages1=spianMapper.selectCage1(cage1,widths); - ids=cages1.getId(); - tier=cages1.getTier(); - //鏈夊悎閫傜┖鏍兼椂杩涚墖 - if(cages>1 &&cages1.getTier()!=null){ - //鎵ц杩涚墖 - datas.add((short)1000); - datas.add((short)ids); - datas.add((short)tier); - datas.add((short)1); + // 淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙� + cage1 = storageCage2.getCage(); + // 鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁� + int cages = spianMapper.selectCage(cage1); + StorageCage cages1; + // 鍒ゆ柇鏄惁鏄浜岀墖闇�瑕佸姞闂撮殧鐗� + prctier = spianMapper.selectsum(cage1, storageCage2.getCell());// 浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁� + if (prctier > 0) { + cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths + 400); + } else { + cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths); + } + // 鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍� + // 鏈夊悎閫傜┖鏍兼椂杩涚墖 + if (cages1 != null && cages >= 1&&storageCage2.getDisabled()==0) { + ids = cages1.getId();// 鏁版嵁搴揑D + tiers = cages1.getTier();// 鍐呭鐗� + cells = cages1.getCell();// 鏍煎瓙鍙� + prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id + width = cages1.getWidth();// 鏍煎瓙鍓╀綑瀹藉害 + widths = glasslist.getglasslengthmm(); + + // 鎵ц杩涚墖 + datas.add((short) 1000);//璧峰浣嶇疆 + datas.add((short) prcid);//鐩爣浣嶇疆 + datas.add((short) widths);//杩涚墖鐜荤拑瀹� + datas.add((short) prctier); //鐜荤拑鏁� + datas.add((short) 1);//浠诲姟鍚姩 + //鑾峰彇璇ユ牸瀛愬唴鏄惁鏈夌幓鐠� + int cellint=spianMapper.selectcell(cage1,cells); + if(cellint==1){ + //灏嗗鐗囩幓鐠冪殑鏁版嵁鏇存柊鍒板唴鐗� + spianMapper.UpdateDBCage(ids, cage1, cells,1); + //灏嗘柊鍏ョ殑鐜荤拑瀛樺叆澶栫墖 + //spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids-1, 2); + spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1,cells, ids-1, 2); + spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害 + spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(),prctier);// 鏂板浠诲姟 + S7control.getinstance().WriteWord(adddresslist, datas); + System.out.println("姹囨姤鏃朵换鍔" + datas); + + }else{ + // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉$幓鐠� + //spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 2); + spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1,cells, ids, 2); + spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害 + spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(),prctier);// 鏂板浠诲姟 S7control.getinstance().WriteWord(adddresslist, datas); - //鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉$幓鐠� - spianMapper.UpdataAddCage("glassid", glassid, widths, cages, ids, tier, 1);//杩樻湭鑾峰彇鐜荤拑id - return Result.success(cages1); + System.out.println("姹囨姤鏃朵换鍔" + datas); + + + // S7control.getinstance().WriteByte("DB105.16",glassid); + } + outmesid(glassid,"DB105.20"); + return (200); + + } + + } + return (400); + + } + + + public Short selectout2(String glassid) { + // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁� + List<String> adddresslist = new ArrayList<>(); + char[] a=glassid.toCharArray(); + + adddresslist.add("DB105.10");// 鍑虹墖杞﹁捣濮嬩綅缃� + adddresslist.add("DB105.12");// 鍑虹墖杞︾洰鏍囦綅缃� + adddresslist.add("DB105.14");// 鍑虹墖绗肩幓鐠冩暟 + adddresslist.add("DB105.18");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔� + List<Short> datas = new ArrayList<>(); + // 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃� + StorageCage cageout = spianMapper.selectOut2(glassid); + if (cageout == null) { + return (300); + } + + int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠� + int cell = cageout.getCell();// 鍑虹墖鏍煎彿 + int tier = cageout.getTier();// 鍑虹墖鍐呭鐗� + int prcid = cageout.getPrcId();// prcid + int prcid2; + int ids; + int cages; + int cells; + double glasswidth = cageout.getGlassWidth(); + // 鍒ゆ柇鐜荤拑鍐呭鐗� + if (tier == 2) { + int state = spianMapper.selectGlassState(cage, cell);// 鑾峰彇鏍煎瓙鏁伴噺 + // 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂 + // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖) + datas.add((short) prcid); + datas.add((short) 1000); + datas.add((short) state); + datas.add((short) 1); + spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓� + spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴� + spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵�� + + spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid,state);// 鏂板浠诲姟 + // int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺 + if (state == 2) { + spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲� + spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁 } - - } - return Result.success("涓嶅彲杩涚墖"); - + S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔� + outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID + + return (200);// 缁撴潫 + } else { + // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲� + int state = spianMapper.selectGlassState(cage, cell); + // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷� + if (state == 1) { + // spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3); + datas.add((short) prcid); + datas.add((short) 1000); + datas.add((short) 1); + datas.add((short) 1); + spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓� + spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid,1);// 鏂板浠诲姟 + spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴� + spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵�� + spianMapper.OverOutSlice(glassid,2);//瀹屾垚鍑虹墖闃熷垪浠诲姟 + outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID + S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔� + + return (200);// 缁撴潫 + + } else { + // 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙 + if (cage < 6) { + StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6); + if (cagecell == null) { + return (300); + } + // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧 + prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID + ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D + cages = cagecell.getCage();// 璋冩嫧鐩爣浣嶇瀛� + cells = cagecell.getCell();// 璋冩嫧鐩爣浣嶆牸瀛� + + // 濉叆璋冩嫧鏁版嵁 + datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆 + datas.add((short) prcid2); + datas.add((short) 2); + datas.add((short) 1); + // 鏇存崲鐜荤拑鐨勭瀛� + String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id + spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲� + spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴� + spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴� + spianMapper.UpdataGlassCageState(glassids,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵�� + spianMapper.Inserttask(2, 0, cageout.getId(), ids, glassid,2);// 鏂板璋冨害浠诲姟 + //spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟 + // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹� + S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔� + + outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID + return (200); // 缁撴潫 + + } else {// 绗煎瓙鍙峰ぇ浜�5鏃� + StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11); + if (cagecell == null) { + return (300); + } + // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧 + prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID + ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D + cages = cagecell.getCage();// 璋冩嫧鐩爣浣嶇瀛� + cells = cagecell.getCell();// 璋冩嫧鐩爣浣嶆牸瀛� + // 濉叆璋冩嫧鏁版嵁 + datas.add((short) prcid); + datas.add((short) prcid2); + datas.add((short) 2); + datas.add((short) 1); + String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id + spianMapper.Inserttask(2, 0, cageout.getId() + 1, ids, glassid,2);// 鏂板璋冨害浠诲姟 + //spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟 + spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲� + spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴� + spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴� + spianMapper.UpdataGlassCageState(glassids,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵�� + // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹� + S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔� + + outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID + return (200);// 缁撴潫 + + } + } + } + } - + //娲惧彂浠诲姟鐜荤拑id + public void outmesid(String glassid,String address) { + //System.out.println("outmesid:" + glassid); + List<Byte> glassidlist = new ArrayList(); + char ds[]=glassid.toCharArray(); + for (char iditem : ds) { + glassidlist.add((byte)iditem); + } + byte[] bytes = Bytes.toArray(glassidlist); + System.out.println("outmesidbytes:" + bytes.length); + S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id + } + //鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆 + public StringBuilder queGlassid(String address,int count) { + StringBuilder writedstrIdOut = new StringBuilder(); + byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, count); + if (writedglassidbytesOut != null) { + // 鑾峰彇鐜荤拑id + for (byte iditem : writedglassidbytesOut) { + writedstrIdOut.append((char) iditem); + } + } + return writedstrIdOut; + } + //char鏁扮粍杞寲鎴恇it鏁扮粍 + public static byte[] toBytes(char[] chars) { + String s = new String(chars); + return s.getBytes(StandardCharsets.UTF_8); + } + //bit鏁扮粍杞寲鎴恈har鏁扮粍 + public static char[] toChars(byte[] bytes) { + String s = new String(bytes, StandardCharsets.UTF_8); + return s.toCharArray(); + } + //鍒ゆ柇闆嗗悎閲屾槸鍚︿负1 + public boolean listbool(String address) { + List<Short> list = S7control.getinstance().ReadWord(address, 1);//杩斿洖涓簍ure鏃朵负1 + boolean listbool = list.contains((short) 1); + return listbool; + } } -- Gitblit v1.8.0