#

zjj

2024-11-02 1871ef0af4c9cef169dce42e77358ad94d90cd36

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -2082,7 +2082,7 @@
                                && basDevp.getWrkNo() == 0 && basDevp.getCanining().equals("Y")){
//                             更新站点信息 且 下发plc命令
                            staProtocol.setWorkNo((short) 9997);
                            staProtocol.setStaNo(basDevp.getDevNo().shortValue());
                            staProtocol.setStaNo((short) (basDevp.getDevNo()==1004?1003:1013));
//                            staProtocol.setStaNo((short) 1013);
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol));
@@ -2588,12 +2588,13 @@
                            type = 1;
                        }
                        if(inStn.getSourceStaNo() == 2102){
                            weight = staProtocol.getWeight().doubleValue();
                            weight = staProtocol.getWeight().doubleValue()/10;
                        }

                        work1 = true;
                        if (inStn.getSourcePlcId() == 4 || inStn.getSourcePlcId() ==5){ //灌装站需要获取输送线物料代码
                            matnr = staProtocol.getMatnr();
                            batch = staProtocol.getBatch();
                        }

                        devpThread.setPakMk(inStn.getSourceStaNo(),false);
@@ -2652,12 +2653,13 @@
                            }

                            if(inStn.getSourceStaNo() == 2102){
                                weight2 = staProtocol.getWeight().doubleValue();
                                weight2 = staProtocol.getWeight().doubleValue()/10;
                            }

                            work2 = true;
                            if (inStn.getSourcePlcId() == 4){
                                matnr2 = staProtocol.getMatnr();
                                batch2 = staProtocol.getBatch();
                            }
                            devpThread.setPakMk(inStn.getSourceStaNo(),false);
                            break;