#
yxFwq
2024-08-17 28b207e3da756dae0a987a392c09d8866f8ef4f9
#
2个文件已修改
9 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/ScaleThread.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -60,7 +60,7 @@
    private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
    private static final Integer jarMaxLoc = 7;
    private static final Float jarTemperature = 80F;
    private static final Float jarTemperature = 50F;
    @Autowired
    private CommonService commonService;
    @Autowired
src/main/java/com/zy/core/thread/ScaleThread.java
@@ -51,7 +51,12 @@
                    if (!Cools.isEmpty(s) && s.startsWith("=")) {
                        String substring = s.substring(1);
                        String s1 = new StringBuilder(substring).reverse().toString();
                        scale = Double.parseDouble(s1);
                        scale = Double.parseDouble(s1);//50.8    67.6
                        if (slave.getId()>3){
                            scale = scale - 50.8;
                        } else {
                            scale = scale - 67.6;
                        }
                        //将称重重量写入设备基础数据中的gross_wt字段
                        if(scale > 20) {