Merge remote-tracking branch 'origin/xgmFlWcs' into xgmFlWcs

zhangchao

2024-07-23 83132c4d63af1b45330f12788e848c15498de9fa

Merge remote-tracking branch 'origin/xgmFlWcs' into xgmFlWcs

 src/main/java/com/zy/core/MainProcess.java

@@ -78,14 +78,14 @@

                    mainService.outOfDevp(11);

                    if (i>10){
                        //空托盘自动出库
                        mainService.autoEmptyOut();
                        //空托盘自动入库
                        mainService.autoEmptyIn();
                        i=0;
                    }
                    i++;
//                    if (i>10){
//                        //空托盘自动出库
//                        mainService.autoEmptyOut();
//                        //空托盘自动入库
//                        mainService.autoEmptyIn();
//                        i=0;
//                    }
//                    i++;


                } catch (Exception e) {

 src/main/webapp/static/images/zy-logo.png