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

ZY

2024-09-11 6ac08a9ddcb56382fa85ee612bea61188aed0bcf

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

# Conflicts:
#	src/main/java/com/zy/core/thread/SiemensCrnThread.java

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

@@ -56,7 +56,7 @@
                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile(1); // 组托
//                    mainService.generateStoreWrkFile0(2); // WMS入库
                    Thread.sleep(500);
                    Thread.sleep(400);


                    // 拣料、并板、盘点再入库