Merge remote-tracking branch 'origin/master'

wangfei

2024-09-18 2d0358932cd63ed46778be72d126fc8d766a27a8

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java

@@ -151,7 +151,6 @@
        QueryWrapper<Damage> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("process_id", flowCardId);
        queryWrapper.eq("technology_number", layer);

        int otherNumber = damageservice.count(queryWrapper);
        UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("total_quantity", glassInfoCount)
@@ -160,7 +159,6 @@
                .set("other_number", otherNumber)
                .eq("workstation_id", workstationId);
//        .eq("id", workstationId);

        this.update(updateWrapper);

    }